diff options
| author | Remi Collet <remi@remirepo.net> | 2026-04-03 08:39:33 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-04-03 08:39:33 +0200 |
| commit | ad20f851c9eea03e94f6d62a1214770616131b7f (patch) | |
| tree | f4b9a9ce4f91ac848c345131c64baac84a05148e | |
| parent | e1363f41a7750ad5f7418c062da59382a63cb35c (diff) | |
raise dependency on phpunit/php-code-coverage 14
drop runtime dependency on phpunit13
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | phpcov.spec | 34 |
2 files changed, 26 insertions, 16 deletions
diff --git a/composer.json b/composer.json index 825a7e4..8eba144 100644 --- a/composer.json +++ b/composer.json @@ -23,13 +23,15 @@ "prefer-stable": true, "require": { "php": ">=8.4", - "phpunit/phpunit": "^13.0.0", - "phpunit/php-code-coverage": "^13.0.1", + "phpunit/php-code-coverage": "^14.0", "phpunit/php-file-iterator": "^7.0.0", "sebastian/cli-parser": "^5.0.0", "sebastian/diff": "^8.0.0", "sebastian/version": "^7.0.0" }, + "require-dev": { + "phpunit/phpunit": "^13.1" + }, "autoload": { "classmap": [ "src/" @@ -40,7 +42,7 @@ ], "extra": { "branch-alias": { - "dev-main": "12.0-dev" + "dev-main": "13.0-dev" } } } diff --git a/phpcov.spec b/phpcov.spec index e1101b1..78277d2 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -13,7 +13,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 74b950835e1b012ec422f112492929b2c832ffe5 +%global gh_commit c87f0c3f19fb0d7518d357631713ee59af3d753d %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: 12.0.0 +Version: 13.0.0 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -43,26 +43,25 @@ BuildArch: noarch BuildRequires: php(language) >= 8.4.1 BuildRequires: php-fedora-autoloader-devel %if %{with tests} -BuildRequires: phpunit13 -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 13.0.1 with php-composer(phpunit/php-code-coverage) < 14) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 14.0.0 with php-composer(phpunit/php-code-coverage) < 15) BuildRequires: (php-composer(phpunit/php-file-iterator) >= 7.0.0 with php-composer(phpunit/php-file-iterator) < 8) BuildRequires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6) BuildRequires: (php-composer(sebastian/diff) >= 8.0.0 with php-composer(sebastian/diff) < 9) BuildRequires: (php-composer(sebastian/version) >= 7.0.0 with php-composer(sebastian/version) < 8) BuildRequires: php-pecl(Xdebug) >= 3 +# from composer.json, require-dev +BuildRequires: phpunit13 >= 13.1 %endif # from composer.json # "php": ">=8.4", -# "phpunit/phpunit": "^13.0.0", -# "phpunit/php-code-coverage": "^13.0.1", +# "phpunit/php-code-coverage": "^14.0.0", # "phpunit/php-file-iterator": "^7.0.0", # "sebastian/cli-parser": "^5.0.0", # "sebastian/diff": "^8.0.0", # "sebastian/version": "^7.0.0" Requires: php(language) >= 8.4 -Requires: phpunit13 -Requires: (php-composer(phpunit/php-code-coverage) >= 13.0.1 with php-composer(phpunit/php-code-coverage) < 14) +Requires: (php-composer(phpunit/php-code-coverage) >= 14.0.0 with php-composer(phpunit/php-code-coverage) < 15) Requires: (php-composer(phpunit/php-file-iterator) >= 7.0.0 with php-composer(phpunit/php-file-iterator) < 8) Requires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6) Requires: (php-composer(sebastian/diff) >= 8.0.0 with php-composer(sebastian/diff) < 9) @@ -95,7 +94,7 @@ cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ '%{php_home}/PHPUnit13/autoload.php', - '%{php_home}/%{ns_vendor}/CodeCoverage13/autoload.php', + '%{php_home}/%{ns_vendor}/CodeCoverage14/autoload.php', '%{php_home}/%{ns_vendor}/FileIterator7/autoload.php', '%{php_home}/%{ns_vendor}/CliParser5/autoload.php', '%{php_home}/%{ns_vendor}/Diff8/autoload.php', @@ -121,10 +120,14 @@ then EXT="-d zend_extension=xdebug.so" fi # test with hardcoded path in data -rm tests/end-to-end/execute/valid-script-argument-with-cli-include-with-text-report.phpt -rm tests/end-to-end/merge/valid-directory-with-text-report.phpt -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 +rm tests/end-to-end/composer/merge/mismatching-code-coverage-driver-do-not-require.phpt +rm tests/end-to-end/composer/merge/mismatching-git-information-do-not-require.phpt +rm tests/end-to-end/composer/merge/valid-directory-with-text-report.phpt +rm tests/end-to-end/composer/patch-coverage/no-errors-with-only-not-covered-changed-lines.phpt +rm tests/end-to-end/composer/merge/mismatching-php-version-do-not-require.phpt +rm tests/end-to-end/composer/merge/valid-directory-with-text-report-stdout.phpt +rm tests/end-to-end/composer/patch-coverage/valid-arguments-with-valid-path-prefix.phpt +rm tests/end-to-end/composer/patch-coverage/valid-arguments-all-covered.phpt ret=0 for cmd in php php84 php85; do @@ -147,6 +150,11 @@ exit $ret; %changelog +* Fri Apr 3 2026 Remi Collet <remi@remirepo.net> - 13.0.0-1 +- update to 13.0.0 +- raise dependency on phpunit/php-code-coverage 14 +- drop runtime dependency on phpunit13 + * Fri Feb 6 2026 Remi Collet <remi@remirepo.net> - 12.0.0-1 - update to 12.0.0 - raise dependency on PHP 8.4 |
