From 31ab3925ffd11d52a59240057436a9268ebd23a0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 16:13:35 +0100 Subject: update to 10.0.0 raise depdendency on PHP 8.1 raise dependency on phpunit/php-file-iterator 4.0 raise dependency on phpunit/php-text-template 3.0 raise dependency on sebastian/code-unit-reverse-lookup 3.0 raise dependency on sebastian/complexity 3.0 raise dependency on sebastian/environment 6.0 raise dependency on sebastian/lines-of-code 2.0 raise dependency on sebastian/version 4.0 rename to php-phpunit-php-code-coverage10 move to /usr/share/php/SebastianBergmann/CodeCoverage10 --- composer.json | 22 +++--- php-phpunit-php-code-coverage10.spec | 130 ++++++++++++++++++++--------------- 2 files changed, 86 insertions(+), 66 deletions(-) diff --git a/composer.json b/composer.json index b09bd64..18d9289 100644 --- a/composer.json +++ b/composer.json @@ -21,29 +21,29 @@ }, "config": { "platform": { - "php": "7.3.0" + "php": "8.1.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": ">=7.3", + "php": ">=8.1", "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", "nikic/php-parser": "^4.14", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-text-template": "^3.0", + "sebastian/code-unit-reverse-lookup": "^3.0", + "sebastian/complexity": "^3.0", + "sebastian/environment": "^6.0", + "sebastian/lines-of-code": "^2.0", + "sebastian/version": "^4.0", "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "suggest": { "ext-pcov": "*", @@ -62,7 +62,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "10.0-dev" } } } diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index 76779a4..f59e33b 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for php-phpunit-php-code-coverage9 +# remirepo/fedora spec file for php-phpunit-php-code-coverage10 # # Copyright (c) 2013-2023 Remi Collet # License: CC-BY-SA-4.0 @@ -7,10 +7,11 @@ # Please, preserve the changelog entries # -%bcond_without tests +# disabled until phpunit10 available +%bcond_with tests # Github -%global gh_commit 2cf940ebc6355a9d430462811b5aaa308b174bed +%global gh_commit bf4fbc9c13af7da12b3ea807574fb460f255daba #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -22,10 +23,10 @@ %global ns_vendor SebastianBergmann %global ns_project CodeCoverage %global php_home %{_datadir}/php -%global ver_major 9 +%global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 9.2.24 +Version: 10.0.0 Release: 1%{?dist} Summary: PHP code coverage information @@ -45,29 +46,29 @@ BuildRequires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(nikic/php-parser) >= 4.14 with php-composer(nikic/php-parser) < 5) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4) -BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) -BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.2 with php-composer(sebastian/code-unit-reverse-lookup) < 3) -BuildRequires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3) -BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/lines-of-code) >= 1.0.3 with php-composer(sebastian/lines-of-code) < 2) -BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 3.0 with php-composer(sebastian/code-unit-reverse-lookup) < 4) +BuildRequires: (php-composer(sebastian/complexity) >= 3.0 with php-composer(sebastian/complexity) < 4) +BuildRequires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) +BuildRequires: (php-composer(sebastian/lines-of-code) >= 2.0 with php-composer(sebastian/lines-of-code) < 3) +BuildRequires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) BuildRequires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) # remirepo:11 %else BuildRequires: php-nikic-php-parser4 >= 4.14 -BuildRequires: php-phpunit-php-file-iterator3 >= 3.0.3 -BuildRequires: php-phpunit-php-text-template2 >= 2.0.2 -BuildRequires: php-sebastian-code-unit-reverse-lookup2 >= 2.0.2 -BuildRequires: php-sebastian-complexity >= 2.0.0 -BuildRequires: php-sebastian-environment5 >= 5.1.2 -BuildRequires: php-sebastian-lines-of-code >= 1.0.3 -BuildRequires: php-sebastian-version3 >= 3.0.1 +BuildRequires: php-phpunit-php-file-iterator4 +BuildRequires: php-phpunit-php-text-template3 +BuildRequires: php-sebastian-code-unit-reverse-lookup3 +BuildRequires: php-sebastian-complexity3 +BuildRequires: php-sebastian-environment6 +BuildRequires: php-sebastian-lines-of-code2 +BuildRequires: php-sebastian-version4 BuildRequires: php-theseer-tokenizer >= 1.2.0 %endif # From composer.json, "require-dev": { -# "phpunit/phpunit": "^9.3" -BuildRequires: phpunit9 >= 9.3 +# "phpunit/phpunit": "^10.0" +BuildRequires: phpunit10 BuildRequires: php-xdebug %endif @@ -77,28 +78,34 @@ BuildRequires: php-xdebug # "ext-libxml": "*", # "ext-xmlwriter": "*", # "nikic/php-parser": "^4.14", -# "phpunit/php-file-iterator": "^3.0.3", -# "phpunit/php-text-template": "^2.0.2", -# "sebastian/code-unit-reverse-lookup": "^2.0.2", -# "sebastian/complexity": "^2.0", -# "sebastian/environment": "^5.1.2", -# "sebastian/lines-of-code": "^1.0.3", -# "sebastian/version": "^3.0.1", +# "phpunit/php-file-iterator": "^4.0", +# "phpunit/php-text-template": "^3.0", +# "sebastian/code-unit-reverse-lookup": "^3.0", +# "sebastian/complexity": "^3.0", +# "sebastian/environment": "^6.0", +# "sebastian/lines-of-code": "^2.0", +# "sebastian/version": "^4.0", # "theseer/tokenizer": "^1.2.0" -Requires: php(language) >= 7.3 +Requires: php(language) >= 8.1 +Requires: php-date Requires: php-dom +Requires: php-json Requires: php-libxml +Requires: php-pcre +Requires: php-reflection +Requires: php-spl +Requires: php-tokenizer Requires: php-xmlwriter # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(nikic/php-parser) >= 4.14 with php-composer(nikic/php-parser) < 5) -Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4) -Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) -Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.2 with php-composer(sebastian/code-unit-reverse-lookup) < 3) -Requires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3) -Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/lines-of-code) >= 1.0.3 with php-composer(sebastian/lines-of-code) < 2) -Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) +Requires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +Requires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 3.0 with php-composer(sebastian/code-unit-reverse-lookup) < 4) +Requires: (php-composer(sebastian/complexity) >= 3.0 with php-composer(sebastian/complexity) < 4) +Requires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) +Requires: (php-composer(sebastian/lines-of-code) >= 2.0 with php-composer(sebastian/lines-of-code) < 3) +Requires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) Requires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) # From composer.json, suggest # "ext-pcov": "*", @@ -108,20 +115,20 @@ Recommends: php-pcov # remirepo:11 %else Requires: php-nikic-php-parser4 >= 4.14 -Requires: php-phpunit-php-file-iterator3 >= 3.0.3 -Requires: php-phpunit-php-text-template2 >= 2.0.2 -Requires: php-sebastian-code-unit-reverse-lookup2 >= 2.0.2 -Requires: php-sebastian-complexity >= 2.0.0 -Requires: php-sebastian-environment5 >= 5.1.2 -Requires: php-sebastian-lines-of-code >= 1.0.3 -Requires: php-sebastian-version3 >= 3.0.1 +Requires: php-phpunit-php-file-iterator4 +Requires: php-phpunit-php-text-template3 +Requires: php-sebastian-code-unit-reverse-lookup3 +Requires: php-sebastian-complexity3 +Requires: php-sebastian-environment6 +Requires: php-sebastian-lines-of-code2 +Requires: php-sebastian-version4 Requires: php-theseer-tokenizer >= 1.2.0 %endif -# From phpcompatinfo report for version 9.0.0 -Requires: php-reflection +# From phpcompatinfo report for version 10.0.0 Requires: php-date -Requires: php-hash Requires: php-json +Requires: php-pcre +Requires: php-reflection Requires: php-spl Requires: php-tokenizer # Autoloader @@ -157,13 +164,13 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/PhpParser4/autoload.php', - '%{php_home}/%{ns_vendor}/FileIterator3/autoload.php', - '%{php_home}/%{ns_vendor}/Template2/autoload.php', - '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup2/autoload.php', - '%{php_home}/%{ns_vendor}/Complexity/autoload.php', - '%{php_home}/%{ns_vendor}/Environment5/autoload.php', - '%{php_home}/%{ns_vendor}/LinesOfCode/autoload.php', - '%{php_home}/%{ns_vendor}/Version3/autoload.php', + '%{php_home}/%{ns_vendor}/FileIterator4/autoload.php', + '%{php_home}/%{ns_vendor}/Template3/autoload.php', + '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup3/autoload.php', + '%{php_home}/%{ns_vendor}/Complexity3/autoload.php', + '%{php_home}/%{ns_vendor}/Environment6/autoload.php', + '%{php_home}/%{ns_vendor}/LinesOfCode2/autoload.php', + '%{php_home}/%{ns_vendor}/Version4/autoload.php', '%{php_home}/TheSeer/Tokenizer/autoload.php', ]); EOF @@ -190,11 +197,11 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF ret=0 -for cmd in php php80 php81 php82; do +for cmd in php php81 php82; do if which $cmd; then $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ - %{_bindir}/phpunit9 \ + %{_bindir}/phpunit10 \ --verbose || ret=1 fi done @@ -213,6 +220,19 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 10.0.0-1 +- update to 10.0.0 +- raise depdendency on PHP 8.1 +- raise dependency on phpunit/php-file-iterator 4.0 +- raise dependency on phpunit/php-text-template 3.0 +- raise dependency on sebastian/code-unit-reverse-lookup 3.0 +- raise dependency on sebastian/complexity 3.0 +- raise dependency on sebastian/environment 6.0 +- raise dependency on sebastian/lines-of-code 2.0 +- raise dependency on sebastian/version 4.0 +- rename to php-phpunit-php-code-coverage10 +- move to /usr/share/php/SebastianBergmann/CodeCoverage10 + * Thu Jan 26 2023 Remi Collet - 9.2.24-1 - update to 9.2.24 -- cgit