From b59bb0a78fc6189257cb4accde98c534caa7692a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Feb 2024 12:43:07 +0100 Subject: update to 10.0.0 raise dependency on PHP 8.2 raise dependency on phpunit/phpunit 11 raise dependency on phpunit/php-code-coverage 11 raise dependency on phpunit/php-file-iterator 5 raise dependency on sebastian/cli-parser 3 raise dependency on sebastian/diff 6 raise dependency on sebastian/version 5 --- composer.json | 18 +++++------ phpcov.spec | 99 ++++++++++++++++++++++++++++++++++------------------------- 2 files changed, 66 insertions(+), 51 deletions(-) diff --git a/composer.json b/composer.json index 2ab9812..7c66663 100644 --- a/composer.json +++ b/composer.json @@ -15,20 +15,20 @@ }, "config": { "platform": { - "php": "8.1.0" + "php": "8.2.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": ">=8.1", - "phpunit/phpunit": "^10.0", - "phpunit/php-code-coverage": "^10.0", - "phpunit/php-file-iterator": "^4.0", - "sebastian/cli-parser": "^2.0", - "sebastian/diff": "^5.0", - "sebastian/version": "^4.0" + "php": ">=8.2", + "phpunit/phpunit": "^11.0", + "phpunit/php-code-coverage": "^11.0", + "phpunit/php-file-iterator": "^5.0", + "sebastian/cli-parser": "^3.0", + "sebastian/diff": "^6.0", + "sebastian/version": "^5.0" }, "autoload": { "classmap": [ @@ -40,7 +40,7 @@ ], "extra": { "branch-alias": { - "dev-main": "9.0-dev" + "dev-main": "10.0-dev" } } } diff --git a/phpcov.spec b/phpcov.spec index e5731b8..6ceb08a 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -1,6 +1,6 @@ # fedora/remirepo spec file for phpcov # -# Copyright (c) 2013-2023 Remi Collet +# Copyright (c) 2013-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,10 +9,11 @@ %bcond_without tests +# remirepo:2 # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fd8ac3e2623203a439e7843035550950fbff77ec +%global gh_commit 31489ab0ca527e873806a095891e848a27ce98d2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpcov @@ -26,7 +27,7 @@ Name: %{pk_project} -Version: 9.0.1 +Version: 10.0.0 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -39,52 +40,52 @@ Source1: makesrc.sh Patch0: %{gh_project}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 8.1 +BuildRequires: php(language) >= 8.2 BuildRequires: php-fedora-autoloader-devel %if %{with tests} -BuildRequires: phpunit10 +BuildRequires: phpunit11 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 10.0 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(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) -BuildRequires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -BuildRequires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) +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(sebastian/cli-parser) >= 3.0 with php-composer(sebastian/cli-parser) < 4) +BuildRequires: (php-composer(sebastian/diff) >= 6.0 with php-composer(sebastian/diff) < 7) +BuildRequires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6) # remirepo:7 %else -BuildRequires: php-phpunit-php-code-coverage10 -BuildRequires: php-phpunit-php-file-iterator4 -BuildRequires: php-sebastian-cli-parser2 -BuildRequires: php-sebastian-diff5 -BuildRequires: php-sebastian-version4 +BuildRequires: php-phpunit-php-code-coverage11 +BuildRequires: php-phpunit-php-file-iterator5 +BuildRequires: php-sebastian-cli-parser3 +BuildRequires: php-sebastian-diff6 +BuildRequires: php-sebastian-version5 %endif BuildRequires: php-pecl(Xdebug) >= 3 %endif # from composer.json -# "php": ">=8.1", -# "phpunit/phpunit": "^10.0", -# "phpunit/php-code-coverage": "^10.0", -# "phpunit/php-file-iterator": "^4.0", -# "sebastian/cli-parser": "^2.0", -# "sebastian/diff": "^5.0", -# "sebastian/version": "^4.0" -Requires: php(language) >= 8.1 -Requires: phpunit10 +# "php": ">=8.2", +# "phpunit/phpunit": "^11.0", +# "phpunit/php-code-coverage": "^11.0", +# "phpunit/php-file-iterator": "^5.0", +# "sebastian/cli-parser": "^3.0", +# "sebastian/diff": "^6.0", +# "sebastian/version": "^5.0" +Requires: php(language) >= 8.2 +Requires: phpunit11 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phpunit/php-code-coverage) >= 10.0 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(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) -Requires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -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(sebastian/cli-parser) >= 3.0 with php-composer(sebastian/cli-parser) < 4) +Requires: (php-composer(sebastian/diff) >= 6.0 with php-composer(sebastian/diff) < 7) +Requires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6) # remirepo:7 %else -Requires: php-phpunit-php-code-coverage10 -Requires: php-phpunit-php-file-iterator4 -Requires: php-sebastian-cli-parser2 -Requires: php-sebastian-diff5 -Requires: php-sebastian-version4 +Requires: php-phpunit-php-code-coverage11 +Requires: php-phpunit-php-file-iterator5 +Requires: php-sebastian-cli-parser3 +Requires: php-sebastian-diff6 +Requires: php-sebastian-version5 %endif # from phpcompatinfo report for version 4.0.0 # none @@ -119,12 +120,12 @@ phpab \ cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/PHPUnit10/autoload.php', - '%{php_home}/%{ns_vendor}/CodeCoverage10/autoload.php', - '%{php_home}/%{ns_vendor}/FileIterator4/autoload.php', - '%{php_home}/%{ns_vendor}/CliParser2/autoload.php', - '%{php_home}/%{ns_vendor}/Diff5/autoload.php', - '%{php_home}/%{ns_vendor}/Version4/autoload.php', + '%{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', ]); EOF @@ -152,9 +153,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 php81 php82 php83; do +for cmd in php php82 php83; do if which $cmd; then - $cmd $EXT -d xdebug.mode=coverage %{_bindir}/phpunit10 --testsuite end-to-end || ret=1 + $cmd $EXT -d xdebug.mode=coverage %{_bindir}/phpunit11 --testsuite end-to-end || ret=1 fi done exit $ret; @@ -174,6 +175,20 @@ exit $ret; %changelog +* Mon Feb 5 2024 Remi Collet - 10.0.0-1 +- update to 10.0.0 +- raise dependency on PHP 8.2 +- raise dependency on phpunit/phpunit 11 +- raise dependency on phpunit/php-code-coverage 11 +- raise dependency on phpunit/php-file-iterator 5 +- raise dependency on sebastian/cli-parser 3 +- raise dependency on sebastian/diff 6 +- raise dependency on sebastian/version 5 + +* Wed Sep 13 2023 Remi Collet - 9.0.2-1 +- update to 9.0.2 +- raise dependency on phpunit/php-code-coverage 10.1.5 + * Mon Sep 11 2023 Remi Collet - 9.0.1-1 - update to 9.0.1 -- cgit