diff options
| author | Remi Collet <remi@remirepo.net> | 2026-07-07 05:49:19 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-07-07 05:49:19 +0200 |
| commit | 3701bd7840f3b1825a0b89b83bb32b26792983e0 (patch) | |
| tree | a9a16e24c8ddb52a94066c80550cf2a9f5fad8c1 | |
| parent | 436df026ba09ff9ea2deca5dbc658856d40b5182 (diff) | |
| -rw-r--r-- | composer.json | 19 | ||||
| -rwxr-xr-x | makesrc.sh | 30 | ||||
| -rw-r--r-- | phpunit9.spec | 26 |
3 files changed, 41 insertions, 34 deletions
diff --git a/composer.json b/composer.json index 0334982..54c09eb 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,12 @@ "role": "lead" } ], + "funding": [ + { + "type": "other", + "url": "https://phpunit.de/sponsoring.html" + } + ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy" @@ -24,10 +30,10 @@ "require": { "php": ">=7.3", "ext-dom": "*", + "ext-filter": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", - "ext-xml": "*", "ext-xmlwriter": "*", "doctrine/instantiator": "^1.5.0 || ^2", "myclabs/deep-copy": "^1.13.4", @@ -54,6 +60,17 @@ "platform": { "php": "7.3.0" }, + "policy": { + "malware": { + "audit": "fail" + }, + "security-advisory": { + "audit": "fail" + }, + "abandoned": { + "audit": "fail" + } + }, "classmap-authoritative": true, "optimize-autoloader": true, "sort-packages": true @@ -1,37 +1,27 @@ #!/bin/bash NAME=$(basename $PWD) -DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) -MAJOR=$(sed -n '/^%global ver_major/{s/.* //;p}' $NAME.spec) -MINOR=$(sed -n '/^%global ver_minor/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -DATE=$(date -d "$DATE -1 week" +%Y-%m-%d) - -if [ -f $NAME-$VERSION-$SHORT.tgz ]; then - echo "$NAME-$VERSION-$SHORT.tgz already there" +if [ -f $NAME-$VERSION.tgz ]; then + echo "$NAME-$VERSION.tgz already there" else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n" + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION \n" echo "Cloning..." - rm -rf $PROJECT-$COMMIT - git clone --branch $MAJOR.$MINOR --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 + rm -rf $PROJECT-$VERSION + git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $VERSION $PROJECT-$VERSION || exit 1 - echo "Getting commit..." - pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit 1 - cp composer.json ../composer.json - popd + echo "Getting composer..." + cp $PROJECT-$VERSION/composer.json composer.json echo "Archiving..." - tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + tar czf $NAME-$VERSION.tgz --exclude-vcs --exclude tools $PROJECT-$VERSION echo "Cleaning..." - rm -rf $PROJECT-$COMMIT + rm -rf $PROJECT-$VERSION echo "Done." fi diff --git a/phpunit9.spec b/phpunit9.spec index e745b3a..bee53e8 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,9 +11,6 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b36f02317466907a230d3aa1d34467041271ef4a -%global gh_date 2026-01-27 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit # Packagist @@ -25,17 +22,14 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.34 -#global upstream_prever dev - Name: %{pk_project}%{ver_major} -Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Version: 9.6.35 Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{upstream_version}-%{gh_short}.tgz +Source0: %{name}-%{version}.tgz Source1: makesrc.sh # Fix command for autoload @@ -86,10 +80,10 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { # "php": ">=7.3", # "ext-dom": "*", +# "ext-filter": "*", # "ext-json": "*", # "ext-libxml": "*", # "ext-mbstring": "*", -# "ext-xml": "*", # "ext-xmlwriter": "*", # "doctrine/instantiator": "^1.5.0 || ^2", # "myclabs/deep-copy": "^1.13.4", @@ -117,7 +111,6 @@ Requires: php-dom Requires: php-json Requires: php-libxml Requires: php-mbstring -Requires: php-xml Requires: php-xmlwriter # remirepo:1 %if 0 @@ -163,6 +156,11 @@ Recommends: phpunit11 # Fedora 40+ only for 8.3 %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 Recommends: phpunit12 +# remirepo:3 +%endif +# Fedora 42+ only for 8.4 +%if 0%{?fedora} >= 42 +Recommends: phpunit13 # remirepo:1 %endif # Autoloader @@ -174,7 +172,6 @@ Requires: php-phar %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 Provides: php-composer(phpunit/phpunit) = %{version} -Provides: phpunit = %{version}-%{release} %endif @@ -189,7 +186,7 @@ Documentation: https://phpunit.de/documentation.html %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{version} %patch -P0 -p0 -b .rpm find . -name \*.rpm -delete -print @@ -269,7 +266,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit ret=0 -for cmd in php php82 php83 php84 php85; do +for cmd in php php82 php83 php84 php85 php86; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -286,6 +283,9 @@ exit $ret %changelog +* Tue Jul 7 2026 Remi Collet <remi@remirepo.net> - 9.6.35-1 +- update to 9.6.35 + * Tue Jan 27 2026 Remi Collet <remi@remirepo.net> - 9.6.34-1 - update to 9.6.34 |