diff options
| -rw-r--r-- | composer.json | 22 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage9.spec | 98 |
2 files changed, 47 insertions, 73 deletions
diff --git a/composer.json b/composer.json index 3646210..f9fd361 100644 --- a/composer.json +++ b/composer.json @@ -33,18 +33,18 @@ "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", - "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", - "theseer/tokenizer": "^1.2.0" + "nikic/php-parser": "^4.19.1 || ^5.1.0", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -63,7 +63,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } } } diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index b1ec7c6..ffadacb 100644 --- a/php-phpunit-php-code-coverage9.spec +++ b/php-phpunit-php-code-coverage9.spec @@ -10,12 +10,12 @@ %bcond_without tests # Github -%global gh_commit 48c34b5d8d983006bd2adc2d0de92963b9155965 +%global gh_commit 85402a822d1ecf1db1096959413d35e1c37cf1a5 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2024-03-02 +%global gh_date 2024-08-22 # Packagist %global pk_vendor phpunit %global pk_project php-code-coverage @@ -26,7 +26,7 @@ %global ver_major 9 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 9.2.31 +Version: 9.2.32 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -43,32 +43,18 @@ BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} BuildRequires: php(language) >= 7.3 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(nikic/php-parser) >= 4.18 with php-composer(nikic/php-parser) < 6) -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(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) -# remirepo:11 -%else -BuildRequires: php-nikic-php-parser4 >= 4.18 -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-theseer-tokenizer >= 1.2.0 -%endif +BuildRequires: (php-composer(nikic/php-parser) >= 4.19.1 with php-composer(nikic/php-parser) < 6) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.6 with php-composer(phpunit/php-file-iterator) < 4) +BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-composer(phpunit/php-text-template) < 3) +BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.3 with php-composer(sebastian/code-unit-reverse-lookup) < 3) +BuildRequires: (php-composer(sebastian/complexity) >= 2.0.3 with php-composer(sebastian/complexity) < 3) +BuildRequires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) +BuildRequires: (php-composer(sebastian/lines-of-code) >= 1.0.4 with php-composer(sebastian/lines-of-code) < 2) +BuildRequires: (php-composer(sebastian/version) >= 3.0.2 with php-composer(sebastian/version) < 4) +BuildRequires: (php-composer(theseer/tokenizer) >= 1.2.3 with php-composer(theseer/tokenizer) < 2) # From composer.json, "require-dev": { -# "phpunit/phpunit": "^9.3" -BuildRequires: phpunit9 >= 9.3 +# "phpunit/phpunit": "^9.6" +BuildRequires: phpunit9 >= 9.6 BuildRequires: php-xdebug %endif @@ -77,47 +63,33 @@ BuildRequires: php-xdebug # "ext-dom": "*", # "ext-libxml": "*", # "ext-xmlwriter": "*", -# "nikic/php-parser": "^4.18 || ^5.0" -# "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", -# "theseer/tokenizer": "^1.2.0" +# "nikic/php-parser": "^4.19.1 || ^5.1.0" +# "phpunit/php-file-iterator": "^3.0.6", +# "phpunit/php-text-template": "^2.0.4", +# "sebastian/code-unit-reverse-lookup": "^2.0.3", +# "sebastian/complexity": "^2.0.3", +# "sebastian/environment": "^5.1.5", +# "sebastian/lines-of-code": "^1.0.4", +# "sebastian/version": "^3.0.2", +# "theseer/tokenizer": "^1.2.3" Requires: php(language) >= 7.3 Requires: php-dom Requires: php-libxml Requires: php-xmlwriter -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(nikic/php-parser) >= 4.18 with php-composer(nikic/php-parser) < 6) -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(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) +Requires: (php-composer(nikic/php-parser) >= 4.19.1 with php-composer(nikic/php-parser) < 6) +Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.6 with php-composer(phpunit/php-file-iterator) < 4) +Requires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-composer(phpunit/php-text-template) < 3) +Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.3 with php-composer(sebastian/code-unit-reverse-lookup) < 3) +Requires: (php-composer(sebastian/complexity) >= 2.0.3 with php-composer(sebastian/complexity) < 3) +Requires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) +Requires: (php-composer(sebastian/lines-of-code) >= 1.0.4 with php-composer(sebastian/lines-of-code) < 2) +Requires: (php-composer(sebastian/version) >= 3.0.2 with php-composer(sebastian/version) < 4) +Requires: (php-composer(theseer/tokenizer) >= 1.2.3 with php-composer(theseer/tokenizer) < 2) # From composer.json, suggest # "ext-pcov": "*", # "ext-xdebug": "*" Suggests: php-xdebug Recommends: php-pcov -# remirepo:11 -%else -Requires: php-nikic-php-parser4 >= 4.18 -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-theseer-tokenizer >= 1.2.0 -%endif # From phpcompatinfo report for version 9.0.0 Requires: php-reflection Requires: php-date @@ -209,8 +181,6 @@ exit $ret %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md %doc ChangeLog-9.2.md @@ -219,6 +189,10 @@ exit $ret %changelog +* Thu Aug 22 2024 Remi Collet <remi@remirepo.net> - 9.2.32-1 +- update to 9.2.32 (no change) +- raise dependencies + * Tue Mar 5 2024 Remi Collet <remi@remirepo.net> - 9.2.31-1 - update to 9.2.31 |