diff --git a/.gitignore b/.gitignore index f04853f..a823462 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,8 @@ /phpunit9-9.5.17-5c5abcf.tgz /phpunit9-9.5.18-1b58560.tgz /phpunit9-9.5.21-0e32b76.tgz +/phpunit9-9.5.24-d0aa609.tgz +/phpunit9-9.5.25-3e6f90c.tgz +/phpunit9-9.5.26-851867e.tgz +/phpunit9-9.5.27-a2bc7ff.tgz +/phpunit9-9.5.28-954ca31.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 825bea3..1e984e3 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 0e32b76be457de00e83213528f6bb37e2a38fcb1 +%global gh_commit 954ca3113a03bf780d22f07bf055d883ee04b65e #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 5 -%global upstream_version 9.5.21 +%global upstream_version 9.5.28 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -33,7 +33,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{upstream_version}-%{gh_short}.tgz Source1: makesrc.sh @@ -43,7 +43,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 -BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) +BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 3) BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) @@ -55,14 +55,14 @@ BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-c BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) -BuildRequires: (php-composer(sebastian/comparator) >= 4.0.5 with php-composer(sebastian/comparator) < 5) +BuildRequires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) BuildRequires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5) +BuildRequires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) BuildRequires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) -BuildRequires: (php-composer(sebastian/type) >= 3.0 with php-composer(sebastian/type) < 4) +BuildRequires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) BuildRequires: php-dom BuildRequires: php-json @@ -81,11 +81,10 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.3.1", +# "doctrine/instantiator": "^1.3.1 || ^2", # "myclabs/deep-copy": "^1.10.1", # "phar-io/manifest": "^2.0.3", # "phar-io/version": "^3.0.2", -# "phpspec/prophecy": "^1.12.1", # "phpunit/php-code-coverage": "^9.2.13", # "phpunit/php-file-iterator": "^3.0.5", # "phpunit/php-invoker": "^3.1.1", @@ -93,14 +92,14 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-timer": "^5.0.2", # "sebastian/cli-parser": "^1.0.1", # "sebastian/code-unit": "^1.0.6", -# "sebastian/comparator": "^4.0.5", +# "sebastian/comparator": "^4.0.8", # "sebastian/diff": "^4.0.3", # "sebastian/environment": "^5.1.3", -# "sebastian/exporter": "^4.0.3", +# "sebastian/exporter": "^4.0.5", # "sebastian/global-state": "^5.0.1", # "sebastian/object-enumerator": "^4.0.3", # "sebastian/resource-operations": "^3.0.3", -# "sebastian/type": "^3.0", +# "sebastian/type": "^3.2", # "sebastian/version": "^3.0.2" Requires: php(language) >= 7.3 Requires: php-cli @@ -110,7 +109,7 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) +Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 3) Requires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) @@ -122,14 +121,14 @@ Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-c Requires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) -Requires: (php-composer(sebastian/comparator) >= 4.0.5 with php-composer(sebastian/comparator) < 5) +Requires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) Requires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5) +Requires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) Requires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) Requires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) Requires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) -Requires: (php-composer(sebastian/type) >= 3.0 with php-composer(sebastian/type) < 4) +Requires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) # From composer.json, "suggest": { # "ext-soap": "*", @@ -172,6 +171,14 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies +if (PHP_VERSION_ID > 80100) { + $inst = [ + '%{php_home}/Doctrine/Instantiator2/autoload.php', + '%{php_home}/Doctrine/Instantiator/autoload.php', + ]; +} else { + $inst = '%{php_home}/Doctrine/Instantiator/autoload.php'; +} \Fedora\Autoloader\Dependencies::required([ '%{php_home}/SebastianBergmann/CodeCoverage9/autoload.php', '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', @@ -190,7 +197,7 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', '%{php_home}/SebastianBergmann/Type3/autoload.php', '%{php_home}/SebastianBergmann/Version3/autoload.php', - '%{php_home}/Doctrine/Instantiator/autoload.php', + $inst, '%{php_home}/DeepCopy/autoload.php', '%{php_home}/PharIo/Manifest2/autoload.php', '%{php_home}/PharIo/Version3/autoload.php', @@ -228,7 +235,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 php74 php80 php81 php82; do +for cmd in php php80 php81 php82; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -245,6 +252,26 @@ exit $ret %changelog +* Mon Jan 16 2023 Remi Collet - 9.5.28-1 +- update to 9.5.28 +- allow doctrine/instantiator v2 + +* Fri Dec 9 2022 Remi Collet - 9.5.27-1 +- update to 9.5.27 + +* Fri Oct 28 2022 Remi Collet - 9.5.26-1 +- update to 9.5.26 + +* Sun Sep 25 2022 Remi Collet - 9.5.25-1 +- update to 9.5.25 +- raise dependency on sebastian/comparator 4.0.8 +- raise dependency on sebastian/exporter 4.0.5 +- raise dependency on sebastian/type 3.2 + +* Thu Sep 1 2022 Remi Collet - 9.5.24-1 +- update to 9.5.24 +- raise dependency on sebastian/type 3.1 + * Mon Jun 20 2022 Remi Collet - 9.5.21-1 - update to 9.5.21 - raise dependency on sebastian/type 3.0 diff --git a/sources b/sources index 4512542..2db9052 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.5.21-0e32b76.tgz) = 9533b7953e248cd085779619f5cb3d72c0cfd4eaae8e5cd235889be0f52adcf83d04e87cd567a958c094bf220c7510fd3f73cc6c47e85ded2145ce1000384fa8 +SHA512 (phpunit9-9.5.28-954ca31.tgz) = 5c12e28e2b0add0e4a3683b7a7e27c6bbfe9a195d1c2f3c9ff1630b325a19894b237ed8f29c62e32b8c3ba20213cb0a940089336d689e8cfa5f704be58be06c7