diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage12.spec | 11 | ||||
| -rw-r--r-- | upstream.patch | 36 |
3 files changed, 7 insertions, 42 deletions
diff --git a/composer.json b/composer.json index 607a2d5..550171f 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/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 557a85b..e64d0ec 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 c467c59a4f6e04b942be422844e7a6352fa01b57 +%global gh_commit 4a9739b51cbcb355f6e95659612f92e282a7077b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-12-08 +%global gh_date 2025-12-24 # 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.5.1 +Version: 12.5.2 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -39,7 +39,6 @@ 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 @@ -118,7 +117,6 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p1 %build @@ -189,6 +187,9 @@ exit $ret %changelog +* Thu Dec 25 2025 Remi Collet <remi@remirepo.net> - 12.5.2-1 +- update to 12.5.2 + * 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 diff --git a/upstream.patch b/upstream.patch deleted file mode 100644 index 06f320e..0000000 --- a/upstream.patch +++ /dev/null @@ -1,36 +0,0 @@ -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> |