diff options
author | Remi Collet <remi@remirepo.net> | 2025-02-07 10:06:06 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2025-02-07 10:06:06 +0100 |
commit | 261b214bd58c74d9ff591f7b5ef01a3312a8412e (patch) | |
tree | 6e9c1b73b93d2b320b71edfc32a823b535866973 | |
parent | 09e1b3ee11960104a9639705d19b7dcae78079f2 (diff) |
raise dependency on phpunit/phpunit 12.0
raise dependency on phpunit/php-code-coverage 12
raise dependency on phpunit/php-file-iterator 6
raise dependency on sebastian/cli-parser 4
raise dependency on sebastian/diff 7
raise dependency on sebastian/version 6
-rw-r--r-- | composer.json | 18 | ||||
-rw-r--r-- | phpcov.spec | 73 |
2 files changed, 50 insertions, 41 deletions
diff --git a/composer.json b/composer.json index e9d91d6..e345f7c 100644 --- a/composer.json +++ b/composer.json @@ -15,20 +15,20 @@ }, "config": { "platform": { - "php": "8.2.0" + "php": "8.3.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": ">=8.2", - "phpunit/phpunit": "^11.5.1", - "phpunit/php-code-coverage": "^11.0.8", - "phpunit/php-file-iterator": "^5.1", - "sebastian/cli-parser": "^3.0.2", - "sebastian/diff": "^6.0.2", - "sebastian/version": "^5.0.2" + "php": ">=8.3", + "phpunit/phpunit": "^12.0", + "phpunit/php-code-coverage": "^12.0", + "phpunit/php-file-iterator": "^6.0", + "sebastian/cli-parser": "^4.0", + "sebastian/diff": "^7.0", + "sebastian/version": "^6.0" }, "autoload": { "classmap": [ @@ -40,7 +40,7 @@ ], "extra": { "branch-alias": { - "dev-main": "10.0-dev" + "dev-main": "11.0-dev" } } } diff --git a/phpcov.spec b/phpcov.spec index 981a130..bcb7414 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -1,6 +1,6 @@ # fedora/remirepo spec file for phpcov # -# SPDX-FileCopyrightText: Copyright 2013-2024 Remi Collet +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -13,7 +13,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a6029f35b6aa4934f3acfe520e60aa7a0285e845 +%global gh_commit 491eef985e63f351eb997ba02cf76cdf749f2043 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpcov @@ -27,7 +27,7 @@ Name: %{pk_project} -Version: 10.0.1 +Version: 11.0.0 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -40,33 +40,33 @@ Source1: makesrc.sh Patch0: %{gh_project}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 8.2 +BuildRequires: php(language) >= 8.3 BuildRequires: php-fedora-autoloader-devel %if %{with tests} -BuildRequires: phpunit11 >= 11.5.1 -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 11.0.8 with php-composer(phpunit/php-code-coverage) < 12) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 5.1 with php-composer(phpunit/php-file-iterator) < 6) -BuildRequires: (php-composer(sebastian/cli-parser) >= 3.0.2 with php-composer(sebastian/cli-parser) < 4) -BuildRequires: (php-composer(sebastian/diff) >= 6.0.2 with php-composer(sebastian/diff) < 7) -BuildRequires: (php-composer(sebastian/version) >= 5.0.2 with php-composer(sebastian/version) < 6) +BuildRequires: phpunit12 +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 12.0 with php-composer(phpunit/php-code-coverage) < 13) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 6.0 with php-composer(phpunit/php-file-iterator) < 7) +BuildRequires: (php-composer(sebastian/cli-parser) >= 4.0 with php-composer(sebastian/cli-parser) < 5) +BuildRequires: (php-composer(sebastian/diff) >= 7.0 with php-composer(sebastian/diff) < 8) +BuildRequires: (php-composer(sebastian/version) >= 6.0 with php-composer(sebastian/version) < 7) BuildRequires: php-pecl(Xdebug) >= 3 %endif # from composer.json -# "php": ">=8.2", -# "phpunit/phpunit": "^11.5.1", -# "phpunit/php-code-coverage": "^11.0.8", -# "phpunit/php-file-iterator": "^5.1", -# "sebastian/cli-parser": "^3.0.2", -# "sebastian/diff": "^6.0.2", -# "sebastian/version": "^5.0.2" -Requires: php(language) >= 8.2 -Requires: phpunit11 >= 11.5.1 -Requires: (php-composer(phpunit/php-code-coverage) >= 11.0.8 with php-composer(phpunit/php-code-coverage) < 12) -Requires: (php-composer(phpunit/php-file-iterator) >= 5.1 with php-composer(phpunit/php-file-iterator) < 6) -Requires: (php-composer(sebastian/cli-parser) >= 3.0.2 with php-composer(sebastian/cli-parser) < 4) -Requires: (php-composer(sebastian/diff) >= 6.0.2 with php-composer(sebastian/diff) < 7) -Requires: (php-composer(sebastian/version) >= 5.0.2 with php-composer(sebastian/version) < 6) +# "php": ">=8.3", +# "phpunit/phpunit": "^12.0", +# "phpunit/php-code-coverage": "^12.0", +# "phpunit/php-file-iterator": "^6.0", +# "sebastian/cli-parser": "^4.0", +# "sebastian/diff": "^7.0", +# "sebastian/version": "^6.0" +Requires: php(language) >= 8.3 +Requires: phpunit12 +Requires: (php-composer(phpunit/php-code-coverage) >= 12.0 with php-composer(phpunit/php-code-coverage) < 13) +Requires: (php-composer(phpunit/php-file-iterator) >= 6.0 with php-composer(phpunit/php-file-iterator) < 7) +Requires: (php-composer(sebastian/cli-parser) >= 4.0 with php-composer(sebastian/cli-parser) < 5) +Requires: (php-composer(sebastian/diff) >= 7.0 with php-composer(sebastian/diff) < 8) +Requires: (php-composer(sebastian/version) >= 6.0 with php-composer(sebastian/version) < 7) # from phpcompatinfo report for version 4.0.0 # none @@ -94,12 +94,12 @@ phpab \ cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/PHPUnit11/autoload.php', - '%{php_home}/%{ns_vendor}/CodeCoverage11/autoload.php', - '%{php_home}/%{ns_vendor}/FileIterator5/autoload.php', - '%{php_home}/%{ns_vendor}/CliParser3/autoload.php', - '%{php_home}/%{ns_vendor}/Diff6/autoload.php', - '%{php_home}/%{ns_vendor}/Version5/autoload.php', + '%{php_home}/PHPUnit12/autoload.php', + '%{php_home}/%{ns_vendor}/CodeCoverage12/autoload.php', + '%{php_home}/%{ns_vendor}/FileIterator6/autoload.php', + '%{php_home}/%{ns_vendor}/CliParser4/autoload.php', + '%{php_home}/%{ns_vendor}/Diff7/autoload.php', + '%{php_home}/%{ns_vendor}/Version6/autoload.php', ]); EOF @@ -127,9 +127,9 @@ rm tests/end-to-end/merge/valid-directory-with-text-report-stdout.phpt rm tests/end-to-end/patch-coverage/valid-arguments-with-valid-path-prefix.phpt ret=0 -for cmd in php php82 php83 php84; do +for cmd in php php83 php84; do if which $cmd; then - $cmd $EXT -d xdebug.mode=coverage %{_bindir}/phpunit11 --testsuite end-to-end || ret=1 + $cmd $EXT -d xdebug.mode=coverage %{_bindir}/phpunit12 --testsuite end-to-end || ret=1 fi done exit $ret; @@ -147,6 +147,15 @@ exit $ret; %changelog +* Fri Feb 7 2025 Remi Collet <remi@remirepo.net> - 11.0.0-1 +- update to 11.0.0 +- raise dependency on phpunit/phpunit 12.0 +- raise dependency on phpunit/php-code-coverage 12 +- raise dependency on phpunit/php-file-iterator 6 +- raise dependency on sebastian/cli-parser 4 +- raise dependency on sebastian/diff 7 +- raise dependency on sebastian/version 6 + * Fri Dec 20 2024 Remi Collet <remi@remirepo.net> - 10.0.1-1 - update to 10.0.1 - raise dependency on phpunit/phpunit 11.5.1 |