diff options
| -rw-r--r-- | composer.json | 10 | ||||
| -rwxr-xr-x | makesrc.sh | 2 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage12.spec | 96 | ||||
| -rw-r--r-- | upstream.patch | 36 |
4 files changed, 114 insertions, 30 deletions
diff --git a/composer.json b/composer.json index 424f328..607a2d5 100644 --- a/composer.json +++ b/composer.json @@ -33,17 +33,17 @@ "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.4.0", + "nikic/php-parser": "^5.7.0", "phpunit/php-file-iterator": "^6.0", "phpunit/php-text-template": "^5.0", "sebastian/complexity": "^5.0", - "sebastian/environment": "^8.0", + "sebastian/environment": "^8.0.3", "sebastian/lines-of-code": "^4.0", "sebastian/version": "^6.0", - "theseer/tokenizer": "^1.2.3" + "theseer/tokenizer": "^2.0" }, "require-dev": { - "phpunit/phpunit": "^12.0" + "phpunit/phpunit": "^12.5.1" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-main": "12.1.x-dev" + "dev-main": "12.5.x-dev" } } } @@ -22,7 +22,7 @@ else echo "Getting commit..." pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit1 + git checkout $COMMIT || exit 1 cp composer.json ../composer.json popd diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index f5abd6f..557a85b 100644 --- a/php-phpunit-php-code-coverage12.spec +++ b/php-phpunit-php-code-coverage12.spec @@ -10,11 +10,11 @@ %bcond_without tests # Github -%global gh_commit 0ce76cf0940abbc31525420b7b8d174656c6675d +%global gh_commit c467c59a4f6e04b942be422844e7a6352fa01b57 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-04-03 +%global gh_date 2025-12-08 # Packagist %global pk_vendor phpunit %global pk_project php-code-coverage @@ -25,7 +25,7 @@ %global ver_major 12 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 12.1.1 +Version: 12.5.1 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -39,26 +39,27 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +Patch0: upstream.patch BuildArch: noarch BuildRequires: php(language) >= 8.3 BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} -BuildRequires: (php-composer(nikic/php-parser) >= 5.4 with php-composer(nikic/php-parser) < 6) +BuildRequires: (php-composer(nikic/php-parser) >= 5.7.0 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/environment) >= 8.0.3 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-composer(theseer/tokenizer) >= 2.0.1 with php-composer(theseer/tokenizer) < 3) BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-libxml BuildRequires: php-tokenizer BuildRequires: php-xmlwriter # From composer.json, "require-dev": { -# "phpunit/phpunit": "^12.0" -BuildRequires: phpunit12 +# "phpunit/phpunit": "^12.5.1" +BuildRequires: phpunit12 >= 12.5 BuildRequires: php-xdebug %endif @@ -67,26 +68,26 @@ BuildRequires: php-xdebug # "ext-dom": "*", # "ext-libxml": "*", # "ext-xmlwriter": "*", -# "nikic/php-parser": "^5.4.0", +# "nikic/php-parser": "^5.7.0", # "phpunit/php-file-iterator": "^6.0", # "phpunit/php-text-template": "^5.0", # "sebastian/complexity": "^5.0", -# "sebastian/environment": "^8.0", +# "sebastian/environment": "^8.0.3", # "sebastian/lines-of-code": "^4.0", # "sebastian/version": "^6.0", -# "theseer/tokenizer": "^1.2.3" +# "theseer/tokenizer": "^2.0.1" Requires: php(language) >= 8.3 Requires: php-dom Requires: php-libxml Requires: php-xmlwriter -Requires: (php-composer(nikic/php-parser) >= 5.4.0 with php-composer(nikic/php-parser) < 6) +Requires: (php-composer(nikic/php-parser) >= 5.7.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/environment) >= 8.0.3 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) +Requires: (php-composer(theseer/tokenizer) >= 2.0.1 with php-composer(theseer/tokenizer) < 3) # From composer.json, suggest # "ext-pcov": "*", # "ext-xdebug": "*" @@ -101,11 +102,9 @@ Requires: php-composer(fedora/autoloader) # Composer Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} # Bundled assets in HTML template -Provides: bundled(js-bootstrap) = 4.3.1 -Provides: bundled(js-d3) = 3.5.17 -Provides: bundled(js-jquery) = 3.4.1 -Provides: bundled(js-nvd3) = 1.8.1 -Provides: bundled(js-popper) +Provides: bundled(js-bootstrap) = 5.3.6 +Provides: bundled(js-jquery) = 3.7.1 +Provides: bundled(js-billboard) = 3.15.1 %description @@ -119,6 +118,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch -P0 -p1 %build @@ -136,7 +136,7 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/%{ns_vendor}/Environment8/autoload.php', '%{php_home}/%{ns_vendor}/LinesOfCode4/autoload.php', '%{php_home}/%{ns_vendor}/Version6/autoload.php', - '%{php_home}/TheSeer/Tokenizer/autoload.php', + '%{php_home}/TheSeer/Tokenizer2/autoload.php', ]); EOF @@ -167,7 +167,7 @@ EOF ret=0 # testCanBeCreatedFromDefaults rely on git layout -for cmd in php php83 php84; do +for cmd in php php83 php84 php85; do if which $cmd; then $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ @@ -183,12 +183,61 @@ exit $ret %files %license LICENSE %doc README.md -%doc ChangeLog-%{ver_major}.1.md +%doc ChangeLog-%{ver_major}.5.md %doc composer.json %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major} %changelog +* Tue Dec 9 2025 Remi Collet <remi@remirepo.net> - 12.5.1-1 +- update to 12.5.1 +- raise dependency on nikic/php-parser 5.7.0 +- raise dependency on theseer/tokenizer 2.0.1 +- add upstream patch for theseer/tokenizer 2.x + +* Tue Dec 2 2025 Remi Collet <remi@remirepo.net> - 12.5.0-1 +- update to 12.5.0 +- raise dependency on nikic/php-parser 5.6.1 +- raise dependency on theseer/tokenizer 1.3.1 + +* Wed Sep 24 2025 Remi Collet <remi@remirepo.net> - 12.4.0-1 +- update to 12.4.0 + +* Wed Sep 17 2025 Remi Collet <remi@remirepo.net> - 12.3.8-1 +- update to 12.3.8 + +* Wed Sep 10 2025 Remi Collet <remi@remirepo.net> - 12.3.7-1 +- update to 12.3.7 + +* Tue Sep 2 2025 Remi Collet <remi@remirepo.net> - 12.3.6-1 +- update to 12.3.6 + +* Mon Sep 1 2025 Remi Collet <remi@remirepo.net> - 12.3.5-1 +- update to 12.3.5 +- raise dependency on nikic/php-parser 5.6.1 +- raise dependency on sebastian/environment 8.0 + +* Fri Aug 29 2025 Remi Collet <remi@remirepo.net> - 12.3.4-1 +- update to 12.3.4 + +* Thu Aug 28 2025 Remi Collet <remi@remirepo.net> - 12.3.3-1 +- update to 12.3.3 + +* Tue Jul 29 2025 Remi Collet <remi@remirepo.net> - 12.3.2-1 +- update to 12.3.2 + +* Thu Jun 19 2025 Remi Collet <remi@remirepo.net> - 12.3.1-1 +- update to 12.3.1 + +* Mon May 26 2025 Remi Collet <remi@remirepo.net> - 12.3.0-1 +- update to 12.3.0 + +* Mon May 5 2025 Remi Collet <remi@remirepo.net> - 12.2.1-1 +- update to 12.2.1 + +* Thu Apr 3 2025 Remi Collet <remi@remirepo.net> - 12.1.2-1 +- update to 12.1.2 + * Thu Apr 3 2025 Remi Collet <remi@remirepo.net> - 12.1.1-1 - update to 12.1.1 @@ -358,8 +407,7 @@ 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-Requires: (php-composer(theseer/tokenizer) >= 1.2.3 with php-composer(theseer/tokenizer) < 2) - +- update to 9.2.18 * Thu Sep 1 2022 Remi Collet <remi@remirepo.net> - 9.2.17-1 - update to 9.2.17 diff --git a/upstream.patch b/upstream.patch new file mode 100644 index 0000000..06f320e --- /dev/null +++ b/upstream.patch @@ -0,0 +1,36 @@ +From 3cf9ab1cff5a9b8912bd251f7e4fc5f700aea7b7 Mon Sep 17 00:00:00 2001 +From: Markus Staab <markus.staab@redaxo.de> +Date: Mon, 8 Dec 2025 12:32:24 +0100 +Subject: [PATCH] Fix regression from update to theseer/tokenizer 2.x + +--- + composer.json | 2 +- + .../source_with_class_and_anonymous_function.php.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/composer.json b/composer.json +index 607a2d5e1..550171f84 100644 +--- a/composer.json ++++ b/composer.json +@@ -40,7 +40,7 @@ + "sebastian/environment": "^8.0.3", + "sebastian/lines-of-code": "^4.0", + "sebastian/version": "^6.0", +- "theseer/tokenizer": "^2.0" ++ "theseer/tokenizer": "^2.0.1" + }, + "require-dev": { + "phpunit/phpunit": "^12.5.1" +diff --git a/tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml b/tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml +index 9ef89df19..88523d37c 100644 +--- a/tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml ++++ b/tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml +@@ -100,7 +100,7 @@ + <token name="T_FUNCTION">function</token> + <token name="T_WHITESPACE"> </token> + <token name="T_OPEN_BRACKET">(</token> +- <token name="T_AMPERSAND">&</token> ++ <token name="T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG">&</token> + <token name="T_VARIABLE">$val</token> + <token name="T_COMMA">,</token> + <token name="T_WHITESPACE"> </token> |