This commit is contained in:
Remi Collet 2026-01-05 11:54:41 +01:00
commit b014dd071c
4 changed files with 8 additions and 42 deletions

1
.gitignore vendored
View file

@ -17,3 +17,4 @@
/php-phpunit-php-code-coverage12-12.4.0-67e8aed.tgz
/php-phpunit-php-code-coverage12-12.5.0-bca180c.tgz
/php-phpunit-php-code-coverage12-12.5.1-c467c59.tgz
/php-phpunit-php-code-coverage12-12.5.2-4a9739b.tgz

View file

@ -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

View file

@ -1 +1 @@
SHA512 (php-phpunit-php-code-coverage12-12.5.1-c467c59.tgz) = 840ac7744dbbf518c6d88d6a2b4d8c8251693598bc4ba4ed74a77813f4f42aca3eb78f9a35a9f484572521c48b2f74222bfa9b43930e685f563c4eb6b647ebdb
SHA512 (php-phpunit-php-code-coverage12-12.5.2-4a9739b.tgz) = 3bfd29ed466bc681792afffc8470092ba27bde9b293eb239186efca7d8538e3b980d70c35f378810695a3edf02f51e896a9ced2613fec34b41f1552f831bcdfc

View file

@ -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">&amp;</token>
+ <token name="T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG">&amp;</token>
<token name="T_VARIABLE">$val</token>
<token name="T_COMMA">,</token>
<token name="T_WHITESPACE"> </token>