From b0e0bbdeb7e799e3e05f2a2e9b3a23e46050c405 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Feb 2024 11:52:16 +0100 Subject: update to 11.0.0 raise depdendency on PHP 8.2 raise dependency on nikic/php-parser 5.0 raise dependency on phpunit/php-file-iterator 5.0 raise dependency on phpunit/php-text-template 4.0 raise dependency on sebastian/code-unit-reverse-lookup 4.0 raise dependency on sebastian/complexity 4.0 raise dependency on sebastian/environment 7.0 raise dependency on sebastian/lines-of-code 3.0 raise dependency on sebastian/version 5.0 rename to php-phpunit-php-code-coverage11 move to /usr/share/php/SebastianBergmann/CodeCoverage11 --- composer.json | 24 +++--- php-phpunit-php-code-coverage11.spec | 145 +++++++++++++++++++---------------- 2 files changed, 91 insertions(+), 78 deletions(-) diff --git a/composer.json b/composer.json index 6e2ed05..b472542 100644 --- a/composer.json +++ b/composer.json @@ -22,29 +22,29 @@ }, "config": { "platform": { - "php": "8.1.0" + "php": "8.2.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": ">=8.1", + "php": ">=8.2", "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", - "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", + "nikic/php-parser": "^5.0", + "phpunit/php-file-iterator": "^5.0", + "phpunit/php-text-template": "^4.0", + "sebastian/code-unit-reverse-lookup": "^4.0", + "sebastian/complexity": "^4.0", + "sebastian/environment": "^7.0", + "sebastian/lines-of-code": "^3.0", + "sebastian/version": "^5.0", "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^10.1" + "phpunit/phpunit": "^11.0" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -63,7 +63,7 @@ }, "extra": { "branch-alias": { - "dev-main": "10.1-dev" + "dev-main": "11.0-dev" } } } diff --git a/php-phpunit-php-code-coverage11.spec b/php-phpunit-php-code-coverage11.spec index 7e83ede..6c0fca1 100644 --- a/php-phpunit-php-code-coverage11.spec +++ b/php-phpunit-php-code-coverage11.spec @@ -1,19 +1,21 @@ -# remirepo/fedora spec file for php-phpunit-php-code-coverage10 +# remirepo/fedora spec file for php-phpunit-php-code-coverage11 # -# 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/ # # Please, preserve the changelog entries # -%bcond_without tests +# disabled until phpunit11 available +%bcond_with tests # Github -%global gh_commit 78c3b7625965c2513ee96569a4dbb62601784145 +%global gh_commit 5e238e4b982cb272bf9faeee6f33af83d465d0e2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_vendor sebastianbergmann +%global gh_owner sebastianbergmann %global gh_project php-code-coverage +%global gh_date 2024-02-02 # Packagist %global pk_vendor phpunit %global pk_project php-code-coverage @@ -21,10 +23,10 @@ %global ns_vendor SebastianBergmann %global ns_project CodeCoverage %global php_home %{_datadir}/php -%global ver_major 10 +%global ver_major 11 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.11 +Version: 11.0.0 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -38,30 +40,30 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 8.1 +BuildRequires: php(language) >= 8.2 BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} # 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) >= 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(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 5.0 with php-composer(phpunit/php-file-iterator) < 6) +BuildRequires: (php-composer(phpunit/php-text-template) >= 4.0 with php-composer(phpunit/php-text-template) < 5) +BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 4.0 with php-composer(sebastian/code-unit-reverse-lookup) < 5) +BuildRequires: (php-composer(sebastian/complexity) >= 4.0 with php-composer(sebastian/complexity) < 5) +BuildRequires: (php-composer(sebastian/environment) >= 7.0 with php-composer(sebastian/environment) < 8) +BuildRequires: (php-composer(sebastian/lines-of-code) >= 3.0 with php-composer(sebastian/lines-of-code) < 4) +BuildRequires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6) 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-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-nikic-php-parser5 +BuildRequires: php-phpunit-php-file-iterator5 +BuildRequires: php-phpunit-php-text-template4 +BuildRequires: php-sebastian-code-unit-reverse-lookup4 +BuildRequires: php-sebastian-complexity4 +BuildRequires: php-sebastian-environment7 +BuildRequires: php-sebastian-lines-of-code3 +BuildRequires: php-sebastian-version5 BuildRequires: php-theseer-tokenizer >= 1.2.0 %endif BuildRequires: php-date @@ -74,39 +76,39 @@ BuildRequires: php-spl BuildRequires: php-tokenizer BuildRequires: php-xmlwriter # From composer.json, "require-dev": { -# "phpunit/phpunit": "^10.1" -BuildRequires: phpunit10 >= 10.1 +# "phpunit/phpunit": "^11.0" +BuildRequires: phpunit11 BuildRequires: php-xdebug %endif # From composer.json, require -# "php": ">=8.1", +# "php": ">=8.2", # "ext-dom": "*", # "ext-libxml": "*", # "ext-xmlwriter": "*", -# "nikic/php-parser": "^4.18 || ^5.0", -# "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", +# "nikic/php-parser": "^5.0", +# "phpunit/php-file-iterator": "^5.0", +# "phpunit/php-text-template": "^4.0", +# "sebastian/code-unit-reverse-lookup": "^4.0", +# "sebastian/complexity": "^4.0", +# "sebastian/environment": "^7.0", +# "sebastian/lines-of-code": "^3.0", +# "sebastian/version": "^5.0", # "theseer/tokenizer": "^1.2.0" -Requires: php(language) >= 8.1 +Requires: php(language) >= 8.2 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) >= 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(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) +Requires: (php-composer(phpunit/php-file-iterator) >= 5.0 with php-composer(phpunit/php-file-iterator) < 6) +Requires: (php-composer(phpunit/php-text-template) >= 4.0 with php-composer(phpunit/php-text-template) < 5) +Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 4.0 with php-composer(sebastian/code-unit-reverse-lookup) < 5) +Requires: (php-composer(sebastian/complexity) >= 4.0 with php-composer(sebastian/complexity) < 5) +Requires: (php-composer(sebastian/environment) >= 7.0 with php-composer(sebastian/environment) < 8) +Requires: (php-composer(sebastian/lines-of-code) >= 3.0 with php-composer(sebastian/lines-of-code) < 4) +Requires: (php-composer(sebastian/version) >= 5.0 with php-composer(sebastian/version) < 6) Requires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) # From composer.json, suggest # "ext-pcov": "*", @@ -115,14 +117,14 @@ Suggests: php-xdebug Recommends: php-pcov # remirepo:11 %else -Requires: php-nikic-php-parser4 >= 4.18 -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-nikic-php-parser5 +Requires: php-phpunit-php-file-iterator5 +Requires: php-phpunit-php-text-template4 +Requires: php-sebastian-code-unit-reverse-lookup4 +Requires: php-sebastian-complexity4 +Requires: php-sebastian-environment7 +Requires: php-sebastian-lines-of-code3 +Requires: php-sebastian-version5 Requires: php-theseer-tokenizer >= 1.2.0 %endif # From phpcompatinfo report for version 10.0.0 @@ -166,17 +168,14 @@ 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}/PhpParser4/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}/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}/TheSeer/Tokenizer/autoload.php', ]); EOF @@ -205,11 +204,11 @@ EOF ret=0 # testCanBeCreatedFromDefaults rely on git layout -for cmd in php php81 php82 php83; do +for cmd in php php82 php83; do if which $cmd; then $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ - %{_bindir}/phpunit10 \ + %{_bindir}/phpunit11 \ --filter "^((?!(testCanBeCreatedFromDefaults)).)*$" \ || ret=1 fi @@ -223,12 +222,26 @@ exit $ret %{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md -%doc ChangeLog-10.1.md +%doc ChangeLog-11.0.md %doc composer.json %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major} %changelog +* Mon Feb 5 2024 Remi Collet - 11.0.0-1 +- update to 11.0.0 +- raise depdendency on PHP 8.2 +- raise dependency on nikic/php-parser 5.0 +- raise dependency on phpunit/php-file-iterator 5.0 +- raise dependency on phpunit/php-text-template 4.0 +- raise dependency on sebastian/code-unit-reverse-lookup 4.0 +- raise dependency on sebastian/complexity 4.0 +- raise dependency on sebastian/environment 7.0 +- raise dependency on sebastian/lines-of-code 3.0 +- raise dependency on sebastian/version 5.0 +- rename to php-phpunit-php-code-coverage11 +- move to /usr/share/php/SebastianBergmann/CodeCoverage11 + * Thu Dec 21 2023 Remi Collet - 10.1.11-1 - update to 10.1.11 - raise dependency on nikic/php-parser 4.18 and allow 5.0 -- cgit