From ad982d90aa219358e9f4901acb7de4e39fd7f8fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Feb 2020 16:50:14 +0100 Subject: update to 9.0.0 raise dependency on PHP 7.3 raise dependency on phpunit/php-code-coverage 8 raise dependency on phpunit/php-file-iterator 3 raise dependency on phpunit/php-text-template 2 raise dependency on phpunit/php-timer 3 raise dependency on sebastian/comparator 4 raise dependency on sebastian/diff 4 raise dependency on sebastian/environment 5 raise dependency on sebastian/exporter 4 raise dependency on sebastian/global-state 4 raise dependency on sebastian/object-enumerator 4 raise dependency on sebastian/resource-operations 3 raise dependency on sebastian/type 2 raise dependency on sebastian/version 3 add dependency on phpunit/php-invoker 3 rename to phpunit9 move to /usr/share/php/PHPUnit9 --- phpunit9.spec | 184 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 103 insertions(+), 81 deletions(-) (limited to 'phpunit9.spec') diff --git a/phpunit9.spec b/phpunit9.spec index 3b444fb..c18e71e 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for phpunit8 +# remirepo/fedora spec file for phpunit9 # # Copyright (c) 2010-2020 Remi Collet # @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 018b6ac3c8ab20916db85fa91bf6465acb64d1e0 +%global gh_commit a5be9621b19ee19dca5f150a5b159f48b5389547 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -20,11 +20,11 @@ %global pk_vendor phpunit %global pk_project phpunit # Namespace -%global ns_vendor PHPUnit8 +%global ns_vendor PHPUnit9 %global php_home %{_datadir}/php -%global ver_major 8 -%global ver_minor 5 -%global ver_patch 2 +%global ver_major 9 +%global ver_minor 0 +%global ver_patch 0 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -40,7 +40,7 @@ Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commi Patch0: %{name}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2) @@ -48,20 +48,20 @@ BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-c BuildRequires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2) BuildRequires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3) BuildRequires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.7 with php-composer(phpunit/php-code-coverage) < 8) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) -BuildRequires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) -BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) -BuildRequires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 4) -BuildRequires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) -BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) -BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) -BuildRequires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) -BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) +BuildRequires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4) +BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3) +BuildRequires: (php-composer(phpunit/php-timer) >= 3.0 with php-composer(phpunit/php-timer) < 4) +BuildRequires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5) +BuildRequires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5) +BuildRequires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6) +BuildRequires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5) +BuildRequires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5) +BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4) +BuildRequires: (php-composer(sebastian/type) >= 2.0 with php-composer(sebastian/type) < 3) +BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) # remirepo:21 %else BuildRequires: php-doctrine-instantiator11 >= 1.2.0 @@ -69,20 +69,20 @@ BuildRequires: php-myclabs-deep-copy19 >= 1.9.1 BuildRequires: php-phar-io-manifest >= 1.0.3 BuildRequires: php-phar-io-version >= 2.0.1 BuildRequires: php-phpspec-prophecy >= 1.8.1 -BuildRequires: php-phpunit-php-code-coverage7 >= 7.0.7 -BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.2 -BuildRequires: php-phpunit-Text-Template >= 1.2.1 -BuildRequires: php-phpunit-php-timer2 >= 2.1.2 -BuildRequires: php-sebastian-comparator3 >= 3.0.2 -BuildRequires: php-sebastian-diff3 >= 3.0.2 -BuildRequires: php-sebastian-environment4 >= 4.2.2 -BuildRequires: php-sebastian-exporter3 >= 3.1.1 -BuildRequires: php-sebastian-global-state3 -BuildRequires: php-sebastian-object-enumerator3 >= 3.0.3 -BuildRequires: php-sebastian-resource-operations2 >= 2.0.1 -BuildRequires: php-sebastian-type >= 1.1.3 -BuildRequires: php-phpunit-Version >= 2.0.1 -BuildRequires: php-phpunit-php-invoker2 +BuildRequires: php-phpunit-php-code-coverage8 +BuildRequires: php-phpunit-php-file-iterator3 +BuildRequires: php-phpunit-php-invoker3 +BuildRequires: php-phpunit-php-text-template2 +BuildRequires: php-phpunit-php-timer3 +BuildRequires: php-sebastian-comparator4 +BuildRequires: php-sebastian-diff4 +BuildRequires: php-sebastian-environment5 +BuildRequires: php-sebastian-exporter4 +BuildRequires: php-sebastian-global-state4 +BuildRequires: php-sebastian-object-enumerator4 +BuildRequires: php-sebastian-resource-operations3 +BuildRequires: php-sebastian-type2 +BuildRequires: php-sebastian-version3 %endif BuildRequires: php-dom BuildRequires: php-json @@ -94,7 +94,7 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": "^7.2", +# "php": "^7.3", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", @@ -119,7 +119,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "sebastian/resource-operations": "^2.0.1", # "sebastian/type": "^1.1.3", # "sebastian/version": "^2.0.1", -Requires: php(language) >= 7.2 +Requires: php(language) >= 7.3 Requires: php-cli Requires: php-dom Requires: php-json @@ -134,24 +134,23 @@ Requires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-c Requires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2) Requires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3) Requires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.7 with php-composer(phpunit/php-code-coverage) < 8) -Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) -Requires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4) -Requires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) -Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) -Requires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 4) -Requires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) -Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) -Requires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) -Requires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) -Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) +Requires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9) +Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4) +Requires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4) +Requires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3) +Requires: (php-composer(phpunit/php-timer) >= 3.0 with php-composer(phpunit/php-timer) < 4) +Requires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5) +Requires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5) +Requires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6) +Requires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5) +Requires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) +Requires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5) +Requires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4) +Requires: (php-composer(sebastian/type) >= 2.0 with php-composer(sebastian/type) < 3) +Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) # From composer.json, "suggest": { -# "phpunit/php-invoker": "^2.0.0", # "ext-soap": "*", # "ext-xdebug": "*" -Requires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) Suggests: php-soap Suggests: php-xdebug # remirepo:21 @@ -161,20 +160,20 @@ Requires: php-myclabs-deep-copy19 >= 1.9.1 Requires: php-phar-io-manifest >= 1.0.3 Requires: php-phar-io-version >= 2.0.1 Requires: php-phpspec-prophecy >= 1.8.1 -Requires: php-phpunit-php-code-coverage7 >= 7.0.7 -Requires: php-phpunit-php-file-iterator2 >= 2.0.2 -Requires: php-phpunit-Text-Template >= 1.2.1 -Requires: php-phpunit-php-timer2 >= 2.1.2 -Requires: php-sebastian-comparator3 >= 3.0.2 -Requires: php-sebastian-diff3 >= 3.0.2 -Requires: php-sebastian-environment4 >= 4.2.2 -Requires: php-sebastian-exporter3 >= 3.1.1 -Requires: php-sebastian-global-state3 -Requires: php-sebastian-object-enumerator3 >= 3.0.3 -Requires: php-sebastian-resource-operations2 >= 2.0.1 -Requires: php-sebastian-type >= 1.1.3 -Requires: php-phpunit-Version >= 2.0.1 -Requires: php-phpunit-php-invoker2 +Requires: php-phpunit-php-code-coverage8 +Requires: php-phpunit-php-file-iterator3 +Requires: php-phpunit-php-invoker3 +Requires: php-phpunit-php-text-template2 +Requires: php-phpunit-php-timer3 +Requires: php-sebastian-comparator4 +Requires: php-sebastian-diff4 +Requires: php-sebastian-environment5 +Requires: php-sebastian-exporter4 +Requires: php-sebastian-global-state4 +Requires: php-sebastian-object-enumerator4 +Requires: php-sebastian-resource-operations3 +Requires: php-sebastian-type2 +Requires: php-sebastian-version3 %endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -201,6 +200,8 @@ Documentation: https://phpunit.readthedocs.io/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p0 -b .rpm +find . -name \*.rpm -delete -print + %build %{_bindir}/phpab \ @@ -211,20 +212,21 @@ Documentation: https://phpunit.readthedocs.io/ cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/FileIterator2/autoload.php', - '%{php_home}/Text/Template/Autoload.php', - '%{php_home}/SebastianBergmann/CodeCoverage7/autoload.php', - '%{php_home}/SebastianBergmann/Timer/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage8/autoload.php', + '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', + '%{php_home}/SebastianBergmann/Template2/autoload.php', + '%{php_home}/SebastianBergmann/Timer3/autoload.php', '%{php_home}/Prophecy/autoload.php', - '%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2 - '%{php_home}/SebastianBergmann/Comparator3/autoload.php', - '%{php_home}/SebastianBergmann/Environment4/autoload.php', - '%{php_home}/SebastianBergmann/Exporter3/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState3/autoload.php', - '%{php_home}/SebastianBergmann/ObjectEnumerator3/autoload.php', - '%{php_home}/SebastianBergmann/ResourceOperations2/autoload.php', - '%{php_home}/SebastianBergmann/Type/autoload.php', - '%{php_home}/SebastianBergmann/Version/autoload.php', + '%{php_home}/SebastianBergmann/Invoker3/autoload.php', + '%{php_home}/SebastianBergmann/Diff4/autoload.php', + '%{php_home}/SebastianBergmann/Comparator4/autoload.php', + '%{php_home}/SebastianBergmann/Environment5/autoload.php', + '%{php_home}/SebastianBergmann/Exporter4/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState4/autoload.php', + '%{php_home}/SebastianBergmann/ObjectEnumerator4/autoload.php', + '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', + '%{php_home}/SebastianBergmann/Type2/autoload.php', + '%{php_home}/SebastianBergmann/Version3/autoload.php', [ '%{php_home}/Doctrine/Instantiator11/autoload.php', '%{php_home}/Doctrine/Instantiator/autoload.php', @@ -233,9 +235,9 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/DeepCopy19/autoload.php', '%{php_home}/DeepCopy/autoload.php', ], - '%{php_home}/SebastianBergmann/Invoker/autoload.php', '%{php_home}/PharIo/Manifest/autoload.php', '%{php_home}/PharIo/Version/autoload.php', + __DIR__ . '/Framework/Assert/Functions.php', ]); EOF cat src/autoload.php @@ -263,7 +265,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 php72 php73 php74; do +for cmd in php php73 php74; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -282,6 +284,26 @@ exit $ret %changelog +* Fri Feb 7 2020 Remi Collet - 9.0.0-1 +- update to 9.0.0 +- raise dependency on PHP 7.3 +- raise dependency on phpunit/php-code-coverage 8 +- raise dependency on phpunit/php-file-iterator 3 +- raise dependency on phpunit/php-text-template 2 +- raise dependency on phpunit/php-timer 3 +- raise dependency on sebastian/comparator 4 +- raise dependency on sebastian/diff 4 +- raise dependency on sebastian/environment 5 +- raise dependency on sebastian/exporter 4 +- raise dependency on sebastian/global-state 4 +- raise dependency on sebastian/object-enumerator 4 +- raise dependency on sebastian/resource-operations 3 +- raise dependency on sebastian/type 2 +- raise dependency on sebastian/version 3 +- add dependency on phpunit/php-invoker 3 +- rename to phpunit9 +- move to /usr/share/php/PHPUnit9 + * Wed Jan 8 2020 Remi Collet - 8.5.2-1 - update to 8.5.2 -- cgit