diff options
| -rw-r--r-- | composer.json | 40 | ||||
| -rw-r--r-- | phpunit11-rpm.patch | 2 | ||||
| -rw-r--r-- | phpunit11.spec | 235 |
3 files changed, 145 insertions, 132 deletions
diff --git a/composer.json b/composer.json index 4f81fae..f91b4cc 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "prefer-stable": true, "require": { - "php": ">=8.1", + "php": ">=8.2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -32,26 +32,25 @@ "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "phpunit/php-code-coverage": "^11.0", + "phpunit/php-file-iterator": "^5.0", + "phpunit/php-invoker": "^5.0", + "phpunit/php-text-template": "^4.0", + "phpunit/php-timer": "^7.0", + "sebastian/cli-parser": "^3.0", + "sebastian/code-unit": "^3.0", + "sebastian/comparator": "^6.0", + "sebastian/diff": "^6.0", + "sebastian/environment": "^7.0", + "sebastian/exporter": "^6.0", + "sebastian/global-state": "^7.0", + "sebastian/object-enumerator": "^6.0", + "sebastian/type": "^5.0", + "sebastian/version": "^5.0" }, "config": { "platform": { - "php": "8.1.0" + "php": "8.2.0" }, "optimize-autoloader": true, "sort-packages": true @@ -78,13 +77,12 @@ "tests/_files/CoverageNamespacedFunctionTest.php", "tests/_files/CoveredFunction.php", "tests/_files/Generator.php", - "tests/_files/NamespaceCoveredFunction.php", - "tests/end-to-end/code-coverage/ignore-function-using-attribute/src/CoveredFunction.php" + "tests/_files/NamespaceCoveredFunction.php" ] }, "extra": { "branch-alias": { - "dev-main": "10.5-dev" + "dev-main": "11.0-dev" } } } diff --git a/phpunit11-rpm.patch b/phpunit11-rpm.patch index 9ddfc8c..a4e43ed 100644 --- a/phpunit11-rpm.patch +++ b/phpunit11-rpm.patch @@ -30,7 +30,7 @@ diff -up ./phpunit.rpm ./phpunit - die(1); +} else { -+ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit10/autoload.php'); ++ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit11/autoload.php'); } require PHPUNIT_COMPOSER_INSTALL; diff --git a/phpunit11.spec b/phpunit11.spec index 633ef4d..a56e39c 100644 --- a/phpunit11.spec +++ b/phpunit11.spec @@ -1,6 +1,6 @@ -# remirepo/fedora spec file for phpunit10 +# remirepo/fedora spec file for phpunit11 # -# Copyright (c) 2010-2023 Remi Collet +# Copyright (c) 2010-2024 Remi Collet # # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ @@ -14,13 +14,13 @@ %bcond_without tests -%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 %bcond_without defcmd %else %bcond_with defcmd %endif -%global gh_commit 50b8e314b6d0dd06521dc31d1abffa73f25f850c +%global gh_commit 2f281e7e6776aea920cab5fc5a48d0fefbe1f39e %global gh_date 2024-02-04 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -29,12 +29,12 @@ %global pk_vendor phpunit %global pk_project phpunit # Namespace -%global ns_vendor PHPUnit10 +%global ns_vendor PHPUnit11 %global php_home %{_datadir}/php -%global ver_major 10 -%global ver_minor 5 +%global ver_major 11 +%global ver_minor 0 -%global upstream_version 10.5.10 +%global upstream_version 11.0.2 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -51,49 +51,47 @@ Source1: makesrc.sh Patch0: %{name}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 8.1 +BuildRequires: php(language) >= 8.2 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 10.1.5 with php-composer(phpunit/php-code-coverage) < 11) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) -BuildRequires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) -BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) -BuildRequires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) -BuildRequires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) -BuildRequires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) -BuildRequires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -BuildRequires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) -BuildRequires: (php-composer(sebastian/exporter) >= 5.1 with php-composer(sebastian/exporter) < 6) -BuildRequires: (php-composer(sebastian/global-state) >= 6.0.1 with php-composer(sebastian/global-state) < 7) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) -BuildRequires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) -BuildRequires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) -BuildRequires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) -# remirepo:21 +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 11.0 with php-composer(phpunit/php-code-coverage) < 12) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 5.0 with php-composer(phpunit/php-file-iterator) < 6) +BuildRequires: (php-composer(phpunit/php-invoker) >= 5.0 with php-composer(phpunit/php-invoker) < 6) +BuildRequires: (php-composer(phpunit/php-text-template) >= 4.0 with php-composer(phpunit/php-text-template) < 5) +BuildRequires: (php-composer(phpunit/php-timer) >= 7.0 with php-composer(phpunit/php-timer) < 8) +BuildRequires: (php-composer(sebastian/cli-parser) >= 3.0 with php-composer(sebastian/cli-parser) < 4) +BuildRequires: (php-composer(sebastian/code-unit) >= 3.0 with php-composer(sebastian/code-unit) < 4) +BuildRequires: (php-composer(sebastian/comparator) >= 6.0 with php-composer(sebastian/comparator) < 7) +BuildRequires: (php-composer(sebastian/diff) >= 6.0 with php-composer(sebastian/diff) < 7) +BuildRequires: (php-composer(sebastian/environment) >= 7.0 with php-composer(sebastian/environment) < 8) +BuildRequires: (php-composer(sebastian/exporter) >= 6.0 with php-composer(sebastian/exporter) < 7) +BuildRequires: (php-composer(sebastian/global-state) >= 7.0 with php-composer(sebastian/global-state) < 8) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 6.0 with php-composer(sebastian/object-enumerator) < 7) +BuildRequires: (php-composer(sebastian/type) >= 5.0 with php-composer(sebastian/type) < 6) +BuildRequires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6) +# remirepo:20 %else BuildRequires: php-myclabs-deep-copy >= 1.10.1 BuildRequires: php-phar-io-manifest2 >= 2.0.3 BuildRequires: php-phar-io-version3 >= 3.0.2 -BuildRequires: php-phpunit-php-code-coverage10 >= 10.1.5 -BuildRequires: php-phpunit-php-file-iterator4 -BuildRequires: php-phpunit-php-invoker4 -BuildRequires: php-phpunit-php-text-template3 -BuildRequires: php-phpunit-php-timer6 -BuildRequires: php-sebastian-cli-parser2 -BuildRequires: php-sebastian-code-unit2 -BuildRequires: php-sebastian-comparator5 -BuildRequires: php-sebastian-diff5 -BuildRequires: php-sebastian-environment6 -BuildRequires: php-sebastian-exporter5 >= 5.1 -BuildRequires: php-sebastian-global-state6 >= 6.0.1 -BuildRequires: php-sebastian-object-enumerator5 -BuildRequires: php-sebastian-recursion-context5 -BuildRequires: php-sebastian-type4 -BuildRequires: php-sebastian-version4 +BuildRequires: php-phpunit-php-code-coverage11 +BuildRequires: php-phpunit-php-file-iterator5 +BuildRequires: php-phpunit-php-invoker5 +BuildRequires: php-phpunit-php-text-template4 +BuildRequires: php-phpunit-php-timer7 +BuildRequires: php-sebastian-cli-parser3 +BuildRequires: php-sebastian-code-unit3 +BuildRequires: php-sebastian-comparator6 +BuildRequires: php-sebastian-diff6 +BuildRequires: php-sebastian-environment7 +BuildRequires: php-sebastian-exporter6 +BuildRequires: php-sebastian-global-state7 +BuildRequires: php-sebastian-object-enumerator6 +BuildRequires: php-sebastian-type5 +BuildRequires: php-sebastian-version5 %endif BuildRequires: php-dom BuildRequires: php-json @@ -105,7 +103,7 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": ">=8.1", +# "php": ">=8.2", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", @@ -115,22 +113,21 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "myclabs/deep-copy": "^1.10.1", # "phar-io/manifest": "^2.0.3", # "phar-io/version": "^3.0.2", -# "phpunit/php-code-coverage": "^10.1.5", -# "phpunit/php-file-iterator": "^4.0", -# "phpunit/php-invoker": "^4.0", -# "phpunit/php-text-template": "^3.0", -# "phpunit/php-timer": "^6.0", -# "sebastian/cli-parser": "^2.0", -# "sebastian/code-unit": "^2.0", -# "sebastian/comparator": "^5.0", -# "sebastian/diff": "^5.0", -# "sebastian/environment": "^6.0", -# "sebastian/exporter": "^5.1", -# "sebastian/global-state": "^6.0.1", -# "sebastian/object-enumerator": "^5.0", -# "sebastian/recursion-context": "^5.0", -# "sebastian/type": "^4.0", -# "sebastian/version": "^4.0" +# "phpunit/php-code-coverage": "^11.0", +# "phpunit/php-file-iterator": "^5.0", +# "phpunit/php-invoker": "^5.0", +# "phpunit/php-text-template": "^4.0", +# "phpunit/php-timer": "^7.0", +# "sebastian/cli-parser": "^3.0", +# "sebastian/code-unit": "^3.0", +# "sebastian/comparator": "^6.0", +# "sebastian/diff": "^6.0", +# "sebastian/environment": "^7.0", +# "sebastian/exporter": "^6.0", +# "sebastian/global-state": "^7.0", +# "sebastian/object-enumerator": "^6.0", +# "sebastian/type": "^5.0", +# "sebastian/version": "^5.0" Requires: php(language) >= 8.1 Requires: php-cli Requires: php-dom @@ -144,48 +141,46 @@ Requires: php-xmlwriter 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) -Requires: (php-composer(phpunit/php-code-coverage) >= 10.1.5 with php-composer(phpunit/php-code-coverage) < 11) -Requires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) -Requires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) -Requires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) -Requires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) -Requires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) -Requires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -Requires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) -Requires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -Requires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) -Requires: (php-composer(sebastian/exporter) >= 5.1 with php-composer(sebastian/exporter) < 6) -Requires: (php-composer(sebastian/global-state) >= 6.0.1 with php-composer(sebastian/global-state) < 7) -Requires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) -Requires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) -Requires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) -Requires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) +Requires: (php-composer(phpunit/php-code-coverage) >= 11.0 with php-composer(phpunit/php-code-coverage) < 12) +Requires: (php-composer(phpunit/php-file-iterator) >= 5.0 with php-composer(phpunit/php-file-iterator) < 6) +Requires: (php-composer(phpunit/php-invoker) >= 5.0 with php-composer(phpunit/php-invoker) < 6) +Requires: (php-composer(phpunit/php-text-template) >= 4.0 with php-composer(phpunit/php-text-template) < 5) +Requires: (php-composer(phpunit/php-timer) >= 7.0 with php-composer(phpunit/php-timer) < 8) +Requires: (php-composer(sebastian/cli-parser) >= 3.0 with php-composer(sebastian/cli-parser) < 4) +Requires: (php-composer(sebastian/code-unit) >= 3.0 with php-composer(sebastian/code-unit) < 4) +Requires: (php-composer(sebastian/comparator) >= 6.0 with php-composer(sebastian/comparator) < 7) +Requires: (php-composer(sebastian/diff) >= 6.0 with php-composer(sebastian/diff) < 7) +Requires: (php-composer(sebastian/environment) >= 7.0 with php-composer(sebastian/environment) < 8) +Requires: (php-composer(sebastian/exporter) >= 6.0 with php-composer(sebastian/exporter) < 7) +Requires: (php-composer(sebastian/global-state) >= 7.0 with php-composer(sebastian/global-state) < 8) +Requires: (php-composer(sebastian/object-enumerator) >= 6.0 with php-composer(sebastian/object-enumerator) < 7) +Requires: (php-composer(sebastian/type) >= 5.0 with php-composer(sebastian/type) < 6) +Requires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6) # From composer.json, "suggest": { # "ext-soap": "*", Suggests: php-soap # recommends latest versions # none yet -# remirepo:21 +# remirepo:20 %else Requires: php-myclabs-deep-copy >= 1.10.1 Requires: php-phar-io-manifest2 >= 2.0.3 Requires: php-phar-io-version3 >= 3.0.2 -Requires: php-phpunit-php-code-coverage10 >= 10.1.5 -Requires: php-phpunit-php-file-iterator4 -Requires: php-phpunit-php-invoker4 -Requires: php-phpunit-php-text-template3 -Requires: php-phpunit-php-timer6 -Requires: php-sebastian-cli-parser2 -Requires: php-sebastian-code-unit2 -Requires: php-sebastian-comparator5 -Requires: php-sebastian-diff5 -Requires: php-sebastian-environment6 -Requires: php-sebastian-exporter5 >= 5.1 -Requires: php-sebastian-global-state6 >= 6.0.1 -Requires: php-sebastian-object-enumerator5 -Requires: php-sebastian-recursion-context5 -Requires: php-sebastian-type4 -Requires: php-sebastian-version4 +Requires: php-phpunit-php-code-coverage11 +Requires: php-phpunit-php-file-iterator5 +Requires: php-phpunit-php-invoker5 +Requires: php-phpunit-php-text-template4 +Requires: php-phpunit-php-timer7 +Requires: php-sebastian-cli-parser3 +Requires: php-sebastian-code-unit3 +Requires: php-sebastian-comparator6 +Requires: php-sebastian-diff6 +Requires: php-sebastian-environment7 +Requires: php-sebastian-exporter6 +Requires: php-sebastian-global-state7 +Requires: php-sebastian-object-enumerator6 +Requires: php-sebastian-type5 +Requires: php-sebastian-version5 %endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -229,22 +224,21 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/CodeCoverage10/autoload.php', - '%{php_home}/SebastianBergmann/FileIterator4/autoload.php', - '%{php_home}/SebastianBergmann/Template3/autoload.php', - '%{php_home}/SebastianBergmann/Timer6/autoload.php', - '%{php_home}/SebastianBergmann/CliParser2/autoload.php', - '%{php_home}/SebastianBergmann/CodeUnit2/autoload.php', - '%{php_home}/SebastianBergmann/Invoker4/autoload.php', - '%{php_home}/SebastianBergmann/Diff5/autoload.php', - '%{php_home}/SebastianBergmann/Comparator5/autoload.php', - '%{php_home}/SebastianBergmann/Environment6/autoload.php', - '%{php_home}/SebastianBergmann/Exporter5/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState6/autoload.php', - '%{php_home}/SebastianBergmann/ObjectEnumerator5/autoload.php', - '%{php_home}/SebastianBergmann/RecursionContext5/autoload.php', - '%{php_home}/SebastianBergmann/Type4/autoload.php', - '%{php_home}/SebastianBergmann/Version4/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage11/autoload.php', + '%{php_home}/SebastianBergmann/FileIterator5/autoload.php', + '%{php_home}/SebastianBergmann/Template4/autoload.php', + '%{php_home}/SebastianBergmann/Timer7/autoload.php', + '%{php_home}/SebastianBergmann/CliParser3/autoload.php', + '%{php_home}/SebastianBergmann/CodeUnit3/autoload.php', + '%{php_home}/SebastianBergmann/Invoker5/autoload.php', + '%{php_home}/SebastianBergmann/Diff6/autoload.php', + '%{php_home}/SebastianBergmann/Comparator6/autoload.php', + '%{php_home}/SebastianBergmann/Environment7/autoload.php', + '%{php_home}/SebastianBergmann/Exporter6/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState7/autoload.php', + '%{php_home}/SebastianBergmann/ObjectEnumerator6/autoload.php', + '%{php_home}/SebastianBergmann/Type5/autoload.php', + '%{php_home}/SebastianBergmann/Version5/autoload.php', '%{php_home}/DeepCopy/autoload.php', '%{php_home}/PharIo/Manifest2/autoload.php', '%{php_home}/PharIo/Version3/autoload.php', @@ -269,7 +263,6 @@ cat << 'EOF' | tee -a tests/autoload.php __DIR__ . '/_files/CoverageNamespacedFunctionTest.php', __DIR__ . '/_files/CoveredFunction.php', __DIR__ . '/_files/NamespaceCoveredFunction.php', - __DIR__ . '/end-to-end/code-coverage/ignore-function-using-attribute/src/CoveredFunction.php', __DIR__ . '/end-to-end/execution-order/_files/MultiDependencyTest.php', ]); EOF @@ -296,7 +289,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 php81 php82 php83; do +for cmd in php php82 php83; do if which $cmd; then $cmd ./phpunit $OPT || ret=1 fi @@ -319,6 +312,28 @@ exit $ret %changelog +* Mon Feb 5 2024 Remi Collet <remi@remirepo.net> - 11.0.2-1 +- update to 11.0.2 +- raise dependency on PHP 8.2 +- drop dependency on sebastian/recursion-context +- raise dependency on phpunit/php-code-coverage 11 +- raise dependency on phpunit/php-file-iterator 5 +- raise dependency on phpunit/php-invoker 5 +- raise dependency on phpunit/php-text-template 4 +- raise dependency on phpunit/php-timer 7 +- raise dependency on sebastian/cli-parser 3 +- raise dependency on sebastian/code-unit 3 +- raise dependency on sebastian/comparator 6 +- raise dependency on sebastian/diff 6 +- raise dependency on sebastian/environment 7 +- raise dependency on sebastian/exporter 6 +- raise dependency on sebastian/global-state 7 +- raise dependency on sebastian/object-enumerator 6 +- raise dependency on sebastian/type 5 +- raise dependency on sebastian/version 5 +- rename to phpunit11 +- move to /usr/share/php/PHPUnit11 + * Mon Feb 5 2024 Remi Collet <remi@remirepo.net> - 10.5.10-1 - update to 10.5.10 |