diff options
| -rw-r--r-- | composer.json | 23 | ||||
| -rwxr-xr-x | makesrc.sh | 3 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage12.spec | 115 |
3 files changed, 72 insertions, 69 deletions
diff --git a/composer.json b/composer.json index a9d0076..a500358 100644 --- a/composer.json +++ b/composer.json @@ -22,29 +22,28 @@ }, "config": { "platform": { - "php": "8.2.0" + "php": "8.3.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": ">=8.2", + "php": ">=8.3", "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.3.1", - "phpunit/php-file-iterator": "^5.1.0", - "phpunit/php-text-template": "^4.0.1", - "sebastian/code-unit-reverse-lookup": "^4.0.1", - "sebastian/complexity": "^4.0.1", - "sebastian/environment": "^7.2.0", - "sebastian/lines-of-code": "^3.0.1", - "sebastian/version": "^5.0.2", + "nikic/php-parser": "^5.4.0", + "phpunit/php-file-iterator": "^6.0", + "phpunit/php-text-template": "^5.0", + "sebastian/complexity": "^5.0", + "sebastian/environment": "^8.0", + "sebastian/lines-of-code": "^4.0", + "sebastian/version": "^6.0", "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^11.5.0" + "phpunit/phpunit": "^12.0" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -62,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-main": "11.0.x-dev" + "dev-main": "12.0.x-dev" } } } @@ -17,7 +17,8 @@ else echo "Cloning..." rm -rf $PROJECT-$COMMIT - git clone --branch ${VERSION:0:4} --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 + git clone --branch ${VERSION:0:4} --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || \ + git clone --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 echo "Getting commit..." pushd $PROJECT-$COMMIT diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 117c4cc..ef41c95 100644 --- a/php-phpunit-php-code-coverage12.spec +++ b/php-phpunit-php-code-coverage12.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for php-phpunit-php-code-coverage11 +# remirepo/fedora spec file for php-phpunit-php-code-coverage12 # # SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 @@ -7,15 +7,15 @@ # Please, preserve the changelog entries # -# disabled until phpunit11 available -%bcond_without tests +# disabled until phpunit12 available +%bcond_with tests # Github -%global gh_commit 418c59fd080954f8c4aa5631d9502ecda2387118 +%global gh_commit b1fbe7ded00c951a3507b2352bd6c30574fd9672 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2024-12-11 +%global gh_date 2025-02-07 # Packagist %global pk_vendor phpunit %global pk_project php-code-coverage @@ -23,11 +23,11 @@ %global ns_vendor SebastianBergmann %global ns_project CodeCoverage %global php_home %{_datadir}/php -%global ver_major 11 +%global ver_major 12 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 11.0.8 -Release: 2%{?dist} +Version: 12.0.0 +Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} # SPDX: Main license is BSD-3-Clause @@ -41,59 +41,52 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 8.2 +BuildRequires: php(language) >= 8.3 BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} -BuildRequires: (php-composer(nikic/php-parser) >= 5.3.1 with php-composer(nikic/php-parser) < 6) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 5.1.0 with php-composer(phpunit/php-file-iterator) < 6) -BuildRequires: (php-composer(phpunit/php-text-template) >= 4.0.1 with php-composer(phpunit/php-text-template) < 5) -BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 4.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 5) -BuildRequires: (php-composer(sebastian/complexity) >= 4.0.1 with php-composer(sebastian/complexity) < 5) -BuildRequires: (php-composer(sebastian/environment) >= 7.2.0 with php-composer(sebastian/environment) < 8) -BuildRequires: (php-composer(sebastian/lines-of-code) >= 3.0.1 with php-composer(sebastian/lines-of-code) < 4) -BuildRequires: (php-composer(sebastian/version) >= 5.0.2 with php-composer(sebastian/version) < 6) +BuildRequires: (php-composer(nikic/php-parser) >= 5.4 with php-composer(nikic/php-parser) < 6) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 6.0 with php-composer(phpunit/php-file-iterator) < 7) +BuildRequires: (php-composer(phpunit/php-text-template) >= 5.0 with php-composer(phpunit/php-text-template) < 6) +BuildRequires: (php-composer(sebastian/complexity) >= 5.0 with php-composer(sebastian/complexity) < 6) +BuildRequires: (php-composer(sebastian/environment) >= 8.0 with php-composer(sebastian/environment) < 9) +BuildRequires: (php-composer(sebastian/lines-of-code) >= 4.0 with php-composer(sebastian/lines-of-code) < 5) +BuildRequires: (php-composer(sebastian/version) >= 6.0 with php-composer(sebastian/version) < 7) BuildRequires: (php-composer(theseer/tokenizer) >= 1.2.3 with php-composer(theseer/tokenizer) < 2) -BuildRequires: php-date BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-libxml -BuildRequires: php-pcre -BuildRequires: php-reflection -BuildRequires: php-spl BuildRequires: php-tokenizer BuildRequires: php-xmlwriter # From composer.json, "require-dev": { -# "phpunit/phpunit": "^11.5.0" -BuildRequires: phpunit11 >= 11.5.0 +# "phpunit/phpunit": "^12.0" +BuildRequires: phpunit12 BuildRequires: php-xdebug %endif # From composer.json, require -# "php": ">=8.2", +# "php": ">=8.3", # "ext-dom": "*", # "ext-libxml": "*", # "ext-xmlwriter": "*", -# "nikic/php-parser": "^5.3.1", -# "phpunit/php-file-iterator": "^5.1.0", -# "phpunit/php-text-template": "^4.0.1", -# "sebastian/code-unit-reverse-lookup": "^4.0.1", -# "sebastian/complexity": "^4.0.1", -# "sebastian/environment": "^7.2.0", -# "sebastian/lines-of-code": "^3.0.1", -# "sebastian/version": "^5.0.2", +# "nikic/php-parser": "^5.4.0", +# "phpunit/php-file-iterator": "^6.0", +# "phpunit/php-text-template": "^5.0", +# "sebastian/complexity": "^5.0", +# "sebastian/environment": "^8.0", +# "sebastian/lines-of-code": "^4.0", +# "sebastian/version": "^6.0", # "theseer/tokenizer": "^1.2.3" -Requires: php(language) >= 8.2 +Requires: php(language) >= 8.3 Requires: php-dom Requires: php-libxml Requires: php-xmlwriter -Requires: (php-composer(nikic/php-parser) >= 5.3.1 with php-composer(nikic/php-parser) < 6) -Requires: (php-composer(phpunit/php-file-iterator) >= 5.1.0 with php-composer(phpunit/php-file-iterator) < 6) -Requires: (php-composer(phpunit/php-text-template) >= 4.0.1 with php-composer(phpunit/php-text-template) < 5) -Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 4.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 5) -Requires: (php-composer(sebastian/complexity) >= 4.0.1 with php-composer(sebastian/complexity) < 5) -Requires: (php-composer(sebastian/environment) >= 7.2.0 with php-composer(sebastian/environment) < 8) -Requires: (php-composer(sebastian/lines-of-code) >= 3.0.1 with php-composer(sebastian/lines-of-code) < 4) -Requires: (php-composer(sebastian/version) >= 5.0.2 with php-composer(sebastian/version) < 6) +Requires: (php-composer(nikic/php-parser) >= 5.4.0 with php-composer(nikic/php-parser) < 6) +Requires: (php-composer(phpunit/php-file-iterator) >= 6.0 with php-composer(phpunit/php-file-iterator) < 7) +Requires: (php-composer(phpunit/php-text-template) >= 5.0 with php-composer(phpunit/php-text-template) < 6) +Requires: (php-composer(sebastian/complexity) >= 5.0 with php-composer(sebastian/complexity) < 6) +Requires: (php-composer(sebastian/environment) >= 8.0 with php-composer(sebastian/environment) < 9) +Requires: (php-composer(sebastian/lines-of-code) >= 4.0 with php-composer(sebastian/lines-of-code) < 5) +Requires: (php-composer(sebastian/version) >= 6.0 with php-composer(sebastian/version) < 7) Requires: (php-composer(theseer/tokenizer) >= 1.2.3 with php-composer(theseer/tokenizer) < 2) # From composer.json, suggest # "ext-pcov": "*", @@ -101,11 +94,7 @@ Requires: (php-composer(theseer/tokenizer) >= 1.2.3 with Suggests: php-xdebug Recommends: php-pcov # From phpcompatinfo report for version 10.0.0 -Requires: php-date Requires: php-json -Requires: php-pcre -Requires: php-reflection -Requires: php-spl Requires: php-tokenizer # Autoloader Requires: php-composer(fedora/autoloader) @@ -142,13 +131,12 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/PhpParser5/autoload.php', - '%{php_home}/%{ns_vendor}/FileIterator5/autoload.php', - '%{php_home}/%{ns_vendor}/Template4/autoload.php', - '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup4/autoload.php', - '%{php_home}/%{ns_vendor}/Complexity4/autoload.php', - '%{php_home}/%{ns_vendor}/Environment7/autoload.php', - '%{php_home}/%{ns_vendor}/LinesOfCode3/autoload.php', - '%{php_home}/%{ns_vendor}/Version5/autoload.php', + '%{php_home}/%{ns_vendor}/FileIterator6/autoload.php', + '%{php_home}/%{ns_vendor}/Template5/autoload.php', + '%{php_home}/%{ns_vendor}/Complexity5/autoload.php', + '%{php_home}/%{ns_vendor}/Environment8autoload.php', + '%{php_home}/%{ns_vendor}/LinesOfCode4/autoload.php', + '%{php_home}/%{ns_vendor}/Version6/autoload.php', '%{php_home}/TheSeer/Tokenizer/autoload.php', ]); EOF @@ -180,11 +168,11 @@ EOF ret=0 # testCanBeCreatedFromDefaults rely on git layout -for cmd in php php82 php83 php84; do +for cmd in php php83 php84; do if which $cmd; then $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ - %{_bindir}/phpunit11 \ + %{_bindir}/phpunit12 \ --filter "^((?!(testCanBeCreatedFromDefaults)).)*$" \ || ret=1 fi @@ -196,12 +184,26 @@ exit $ret %files %license LICENSE %doc README.md -%doc ChangeLog-11.0.md +%doc ChangeLog-%{ver_major}.0.md %doc composer.json %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major} %changelog +* Fri Feb 7 2025 Remi Collet <remi@remirepo.net> - 12.0.0-1 +- update to 12.0.0 +- raise depdendency on PHP 8.3 +- raise dependency on nikic/php-parser 5.4 +- raise dependency on phpunit/php-file-iterator 6.0 +- raise dependency on phpunit/php-text-template 5.0 +- raise dependency on sebastian/complexity 5.0 +- raise dependency on sebastian/environment 8.0 +- raise dependency on sebastian/lines-of-code 4.0 +- raise dependency on sebastian/version 6.0 +- drop dependency on sebastian/code-unit-reverse-lookup +- rename to php-phpunit-php-code-coverage12 +- move to /usr/share/php/SebastianBergmann/CodeCoverage12 + * Tue Feb 4 2025 Remi Collet <remi@remirepo.net> - 11.0.8-2 - enable test suite @@ -333,7 +335,8 @@ exit $ret - update to 9.2.19 * Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 9.2.18-1 -- update to 9.2.18 +- update to 9.2.18-Requires: (php-composer(theseer/tokenizer) >= 1.2.3 with php-composer(theseer/tokenizer) < 2) + * Thu Sep 1 2022 Remi Collet <remi@remirepo.net> - 9.2.17-1 - update to 9.2.17 |