From d18850ba2e496ca2d6860f16b212e849f4bc69b1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Jul 2025 09:21:00 +0200 Subject: [PATCH 01/11] v12.3.2 (cherry picked from commit 1181ca62392bc8d39892a08d83b21246d1162180) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c25cf14..c7e8c7f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-phpunit-php-code-coverage12-12.2.1-448f2c5.tgz /php-phpunit-php-code-coverage12-12.3.0-9075a8e.tgz /php-phpunit-php-code-coverage12-12.3.1-ddec29d.tgz +/php-phpunit-php-code-coverage12-12.3.2-086553c.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 7706eb6..d3f1204 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 ddec29dfc128eba9c204389960f2063f3b7fa170 +%global gh_commit 086553c5b2e0e1e20293d782d788ab768202b621 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-06-18 +%global gh_date 2025-07-29 # 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.3.1 +Version: 12.3.2 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -187,6 +187,9 @@ exit $ret %changelog +* Tue Jul 29 2025 Remi Collet - 12.3.2-1 +- update to 12.3.2 + * Thu Jun 19 2025 Remi Collet - 12.3.1-1 - update to 12.3.1 diff --git a/sources b/sources index b388b09..6545eab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.1-ddec29d.tgz) = f5e94d5bcfc43500a80825984e81d0937997d58b29d78702b41990d20be1f9d213247a8e2f5bad4707b4a2a6dabfd4fd250a8d04aaa2a820b93e092735f21675 +SHA512 (php-phpunit-php-code-coverage12-12.3.2-086553c.tgz) = 3430f2d10a81255b6a86554b2813a3374830e2ce863747c42d730e4f6aaf8459d6e15ed553b1ec12fddae0ee0fb55e3d847ef1ecce23f303f49fcc438dc8f3e3 From 2dfdc81cb77770edbc9723ec17673dbbe875d575 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 11:32:53 +0200 Subject: [PATCH 02/11] v12.3.3 (cherry picked from commit 4eb552bd95483692eed9133262fc3df029331807) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c7e8c7f..16db8d0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /php-phpunit-php-code-coverage12-12.3.0-9075a8e.tgz /php-phpunit-php-code-coverage12-12.3.1-ddec29d.tgz /php-phpunit-php-code-coverage12-12.3.2-086553c.tgz +/php-phpunit-php-code-coverage12-12.3.3-733025d.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index d3f1204..d8518c9 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 086553c5b2e0e1e20293d782d788ab768202b621 +%global gh_commit 733025d94635a001f67db71a2ed1bab4e7e4a9dc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-07-29 +%global gh_date 2025-08-27 # 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.3.2 +Version: 12.3.3 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -187,6 +187,9 @@ exit $ret %changelog +* Thu Aug 28 2025 Remi Collet - 12.3.3-1 +- update to 12.3.3 + * Tue Jul 29 2025 Remi Collet - 12.3.2-1 - update to 12.3.2 diff --git a/sources b/sources index 6545eab..64a575a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.2-086553c.tgz) = 3430f2d10a81255b6a86554b2813a3374830e2ce863747c42d730e4f6aaf8459d6e15ed553b1ec12fddae0ee0fb55e3d847ef1ecce23f303f49fcc438dc8f3e3 +SHA512 (php-phpunit-php-code-coverage12-12.3.3-733025d.tgz) = 989da50329aab6b3d5d020b2782cefe01f84729321e8d7e6e8d90e361665208a6ea5f620ee09f692069820bbfa0c6fe40760369409cbd08fbebed08c30be3a5c From 0c233485c1cbb509f8939f1deb8bce069b016854 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Aug 2025 15:42:01 +0200 Subject: [PATCH 03/11] v12.3.4 (cherry picked from commit 6f5d74066737685959624df0c27cc59c0765d970) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 16db8d0..c076bd3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /php-phpunit-php-code-coverage12-12.3.1-ddec29d.tgz /php-phpunit-php-code-coverage12-12.3.2-086553c.tgz /php-phpunit-php-code-coverage12-12.3.3-733025d.tgz +/php-phpunit-php-code-coverage12-12.3.4-7ad0e9b.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index d8518c9..cc294ae 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 733025d94635a001f67db71a2ed1bab4e7e4a9dc +%global gh_commit 7ad0e9bdc72b147600badccd694a2e57ffc9297a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-08-27 +%global gh_date 2025-08-29 # 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.3.3 +Version: 12.3.4 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -187,6 +187,9 @@ exit $ret %changelog +* Fri Aug 29 2025 Remi Collet - 12.3.4-1 +- update to 12.3.4 + * Thu Aug 28 2025 Remi Collet - 12.3.3-1 - update to 12.3.3 diff --git a/sources b/sources index 64a575a..a790f80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.3-733025d.tgz) = 989da50329aab6b3d5d020b2782cefe01f84729321e8d7e6e8d90e361665208a6ea5f620ee09f692069820bbfa0c6fe40760369409cbd08fbebed08c30be3a5c +SHA512 (php-phpunit-php-code-coverage12-12.3.4-7ad0e9b.tgz) = 196f2beffc67461755bdff408c7ed7057fde8f910e055dff75a63bd0aeaab5e686d3cf0f321c6974367369b2bf77ff2c5c52dbbee251528c108f338b4f82acb9 From be89300c9d70c627d480c6cc2ff82cc0293f9648 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 1 Sep 2025 15:41:17 +0200 Subject: [PATCH 04/11] update to 12.3.5 raise dependency on nikic/php-parser 5.6.1 raise dependency on sebastian/environment 8.0 (cherry picked from commit 00aa4298f8321d7d06300d791f494a843bd2a962) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 27 ++++++++++++++++----------- sources | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c076bd3..b81d399 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /php-phpunit-php-code-coverage12-12.3.2-086553c.tgz /php-phpunit-php-code-coverage12-12.3.3-733025d.tgz /php-phpunit-php-code-coverage12-12.3.4-7ad0e9b.tgz +/php-phpunit-php-code-coverage12-12.3.5-96dc046.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index cc294ae..8bdceb1 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 7ad0e9bdc72b147600badccd694a2e57ffc9297a +%global gh_commit 96dc0466673e215bf5536301039017f03cd45c6b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-08-29 +%global gh_date 2025-09-01 # 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.3.4 +Version: 12.3.5 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -43,11 +43,11 @@ 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.6.1 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) @@ -57,8 +57,8 @@ BuildRequires: php-libxml BuildRequires: php-tokenizer BuildRequires: php-xmlwriter # From composer.json, "require-dev": { -# "phpunit/phpunit": "^12.0" -BuildRequires: phpunit12 +# "phpunit/phpunit": "^12.3.7" +BuildRequires: phpunit12 >= 12.3.7 BuildRequires: php-xdebug %endif @@ -67,11 +67,11 @@ BuildRequires: php-xdebug # "ext-dom": "*", # "ext-libxml": "*", # "ext-xmlwriter": "*", -# "nikic/php-parser": "^5.4.0", +# "nikic/php-parser": "^5.6.1", # "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" @@ -79,11 +79,11 @@ 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.6.1 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) @@ -187,6 +187,11 @@ exit $ret %changelog +* Mon Sep 1 2025 Remi Collet - 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 - 12.3.4-1 - update to 12.3.4 diff --git a/sources b/sources index a790f80..8d2fc76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.4-7ad0e9b.tgz) = 196f2beffc67461755bdff408c7ed7057fde8f910e055dff75a63bd0aeaab5e686d3cf0f321c6974367369b2bf77ff2c5c52dbbee251528c108f338b4f82acb9 +SHA512 (php-phpunit-php-code-coverage12-12.3.5-96dc046.tgz) = 65f70cf4659dffb0d527e49974f52a5ad5243126fe916d5ba6c4d5bb41b61247cfce8350e3f0dc546e81a0d28c83eeead303decb5c964d849d98672362688176 From bba25def67dd29ce0bd2d6006edeb948ea230e8a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Sep 2025 07:53:51 +0200 Subject: [PATCH 05/11] v12.3.6 (cherry picked from commit caa6c7d36f74053e68733d05984a6edbf62575d8) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b81d399..22e9b10 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /php-phpunit-php-code-coverage12-12.3.3-733025d.tgz /php-phpunit-php-code-coverage12-12.3.4-7ad0e9b.tgz /php-phpunit-php-code-coverage12-12.3.5-96dc046.tgz +/php-phpunit-php-code-coverage12-12.3.6-da2cdaf.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 8bdceb1..60ed2c9 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 96dc0466673e215bf5536301039017f03cd45c6b +%global gh_commit da2cdaff87220fa641e7652364281b736e4347e0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-09-01 +%global gh_date 2025-09-02 # 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.3.5 +Version: 12.3.6 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -187,6 +187,9 @@ exit $ret %changelog +* Tue Sep 2 2025 Remi Collet - 12.3.6-1 +- update to 12.3.6 + * Mon Sep 1 2025 Remi Collet - 12.3.5-1 - update to 12.3.5 - raise dependency on nikic/php-parser 5.6.1 diff --git a/sources b/sources index 8d2fc76..1935a87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.5-96dc046.tgz) = 65f70cf4659dffb0d527e49974f52a5ad5243126fe916d5ba6c4d5bb41b61247cfce8350e3f0dc546e81a0d28c83eeead303decb5c964d849d98672362688176 +SHA512 (php-phpunit-php-code-coverage12-12.3.6-da2cdaf.tgz) = 035fa606c044f9292415d43dc072ad2579d50dae58858b22ce5a6b779fea6a5da13333a46a0faa2b572df45740edf40720beb24986837ab9bd7ede007b72c186 From 0e9bf7d03ed797fe6b715292822a63696bb1da68 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Sep 2025 12:34:05 +0200 Subject: [PATCH 06/11] v12.3.7 (cherry picked from commit 2c4a26a36fed9855444eccfc9684ce06d23c8d88) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 22e9b10..6bf875b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /php-phpunit-php-code-coverage12-12.3.4-7ad0e9b.tgz /php-phpunit-php-code-coverage12-12.3.5-96dc046.tgz /php-phpunit-php-code-coverage12-12.3.6-da2cdaf.tgz +/php-phpunit-php-code-coverage12-12.3.7-bbede0f.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 60ed2c9..9bf3056 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 da2cdaff87220fa641e7652364281b736e4347e0 +%global gh_commit bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-09-02 +%global gh_date 2025-09-10 # 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.3.6 +Version: 12.3.7 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -187,6 +187,9 @@ exit $ret %changelog +* Wed Sep 10 2025 Remi Collet - 12.3.7-1 +- update to 12.3.7 + * Tue Sep 2 2025 Remi Collet - 12.3.6-1 - update to 12.3.6 diff --git a/sources b/sources index 1935a87..a91ee06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.6-da2cdaf.tgz) = 035fa606c044f9292415d43dc072ad2579d50dae58858b22ce5a6b779fea6a5da13333a46a0faa2b572df45740edf40720beb24986837ab9bd7ede007b72c186 +SHA512 (php-phpunit-php-code-coverage12-12.3.7-bbede0f.tgz) = 1cd553a25bc5f39ff21da055e326a46993c858b772750ba7891c3ccfddc1730bbc9cda297acfd1d05bd70788299ec039e100509b029268a642e8d148db4c404e From c83f13d8910f8bb4933de94e853429b5e0c05921 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Sep 2025 07:43:43 +0200 Subject: [PATCH 07/11] v12.3.8 (cherry picked from commit 230100adeb9501d770f2bc0dfe15575e5bffe8c3) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6bf875b..08a2189 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /php-phpunit-php-code-coverage12-12.3.5-96dc046.tgz /php-phpunit-php-code-coverage12-12.3.6-da2cdaf.tgz /php-phpunit-php-code-coverage12-12.3.7-bbede0f.tgz +/php-phpunit-php-code-coverage12-12.3.8-99e692c.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 9bf3056..e0d2155 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 bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9 +%global gh_commit 99e692c6a84708211f7536ba322bbbaef57ac7fc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-09-10 +%global gh_date 2025-09-17 # 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.3.7 +Version: 12.3.8 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -187,6 +187,9 @@ exit $ret %changelog +* Wed Sep 17 2025 Remi Collet - 12.3.8-1 +- update to 12.3.8 + * Wed Sep 10 2025 Remi Collet - 12.3.7-1 - update to 12.3.7 diff --git a/sources b/sources index a91ee06..a9600f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.7-bbede0f.tgz) = 1cd553a25bc5f39ff21da055e326a46993c858b772750ba7891c3ccfddc1730bbc9cda297acfd1d05bd70788299ec039e100509b029268a642e8d148db4c404e +SHA512 (php-phpunit-php-code-coverage12-12.3.8-99e692c.tgz) = f3a60e16d54ab7b57e027c45a8260149baab69b06e735637a2d5a19a8c7a0436ce6ed1486db43daf4466a1c1a60797d44fc162343e104dbcd3313e580d574520 From b1433e01cf2ff9c7410f230c34c4efd31d5be562 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Sep 2025 08:17:55 +0200 Subject: [PATCH 08/11] v12.4.0 --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 08a2189..82ea3ce 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /php-phpunit-php-code-coverage12-12.3.6-da2cdaf.tgz /php-phpunit-php-code-coverage12-12.3.7-bbede0f.tgz /php-phpunit-php-code-coverage12-12.3.8-99e692c.tgz +/php-phpunit-php-code-coverage12-12.4.0-67e8aed.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index e0d2155..5e8c057 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 99e692c6a84708211f7536ba322bbbaef57ac7fc +%global gh_commit 67e8aed88f93d0e6e1cb7effe1a2dfc2fee6022c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-09-17 +%global gh_date 2025-09-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.3.8 +Version: 12.4.0 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -181,12 +181,15 @@ exit $ret %files %license LICENSE %doc README.md -%doc ChangeLog-%{ver_major}.3.md +%doc ChangeLog-%{ver_major}.4.md %doc composer.json %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major} %changelog +* Wed Sep 24 2025 Remi Collet - 12.4.0-1 +- update to 12.4.0 + * Wed Sep 17 2025 Remi Collet - 12.3.8-1 - update to 12.3.8 diff --git a/sources b/sources index a9600f7..0cc59d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.3.8-99e692c.tgz) = f3a60e16d54ab7b57e027c45a8260149baab69b06e735637a2d5a19a8c7a0436ce6ed1486db43daf4466a1c1a60797d44fc162343e104dbcd3313e580d574520 +SHA512 (php-phpunit-php-code-coverage12-12.4.0-67e8aed.tgz) = 8689640574e2c80d59813f57877465450ab9a925ae16948740e7cf601045b688c8b9541c7180867230c770d8dc979df29f7440986c2e40364a8e7e9fa3266f5b From 1aff8cc83db72a9cafed25c9cef0c80b2a05ccf6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Dec 2025 10:59:44 +0100 Subject: [PATCH 09/11] update to 12.5.0 raise dependency on nikic/php-parser 5.6.1 raise dependency on theseer/tokenizer 1.3.1 (cherry picked from commit eab55ab8e4822fa7875dc714c0f1cfef070c25e8) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 31 ++++++++++++++++------------ sources | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 82ea3ce..6c87a96 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /php-phpunit-php-code-coverage12-12.3.7-bbede0f.tgz /php-phpunit-php-code-coverage12-12.3.8-99e692c.tgz /php-phpunit-php-code-coverage12-12.4.0-67e8aed.tgz +/php-phpunit-php-code-coverage12-12.5.0-bca180c.tgz diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 5e8c057..7199c1e 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 67e8aed88f93d0e6e1cb7effe1a2dfc2fee6022c +%global gh_commit bca180c050dd3ae15f87c26d25cabb34fe1a0a5a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2025-09-24 +%global gh_date 2025-11-29 # 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.4.0 +Version: 12.5.0 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -43,22 +43,22 @@ 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.6.1 with php-composer(nikic/php-parser) < 6) +BuildRequires: (php-composer(nikic/php-parser) >= 5.6.2 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.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) >= 1.3.1 with php-composer(theseer/tokenizer) < 2) BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-libxml BuildRequires: php-tokenizer BuildRequires: php-xmlwriter # From composer.json, "require-dev": { -# "phpunit/phpunit": "^12.3.7" -BuildRequires: phpunit12 >= 12.3.7 +# "phpunit/phpunit": "^12.4.4" +BuildRequires: phpunit12 >= 12.4.4 BuildRequires: php-xdebug %endif @@ -67,26 +67,26 @@ BuildRequires: php-xdebug # "ext-dom": "*", # "ext-libxml": "*", # "ext-xmlwriter": "*", -# "nikic/php-parser": "^5.6.1", +# "nikic/php-parser": "^5.6.2", # "phpunit/php-file-iterator": "^6.0", # "phpunit/php-text-template": "^5.0", # "sebastian/complexity": "^5.0", # "sebastian/environment": "^8.0.3", # "sebastian/lines-of-code": "^4.0", # "sebastian/version": "^6.0", -# "theseer/tokenizer": "^1.2.3" +# "theseer/tokenizer": "^1.3.1" Requires: php(language) >= 8.3 Requires: php-dom Requires: php-libxml Requires: php-xmlwriter -Requires: (php-composer(nikic/php-parser) >= 5.6.1 with php-composer(nikic/php-parser) < 6) +Requires: (php-composer(nikic/php-parser) >= 5.6.2 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.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) >= 1.3.1 with php-composer(theseer/tokenizer) < 2) # From composer.json, suggest # "ext-pcov": "*", # "ext-xdebug": "*" @@ -165,7 +165,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 \ @@ -181,12 +181,17 @@ exit $ret %files %license LICENSE %doc README.md -%doc ChangeLog-%{ver_major}.4.md +%doc ChangeLog-%{ver_major}.5.md %doc composer.json %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major} %changelog +* Tue Dec 2 2025 Remi Collet - 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 - 12.4.0-1 - update to 12.4.0 diff --git a/sources b/sources index 0cc59d0..f9a70ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.4.0-67e8aed.tgz) = 8689640574e2c80d59813f57877465450ab9a925ae16948740e7cf601045b688c8b9541c7180867230c770d8dc979df29f7440986c2e40364a8e7e9fa3266f5b +SHA512 (php-phpunit-php-code-coverage12-12.5.0-bca180c.tgz) = 4b41b9295e440424aa6877ce4b6a8b4b4f987932d429c15bb6d08312f7d7fd4f7a5866c7bee938571241623f4bdd621874c367bf056f96ab22c49d42864c0040 From ec170c6411f854cc559f39abfd198bd7e484773a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Dec 2025 08:59:34 +0100 Subject: [PATCH 10/11] 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 (cherry picked from commit 1203b8e0146e28f87f09974f4fb03b239bc5b4e9) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 32 +++++++++++++++---------- sources | 2 +- upstream.patch | 36 ++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 upstream.patch diff --git a/.gitignore b/.gitignore index 6c87a96..e3776b4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /php-phpunit-php-code-coverage12-12.3.8-99e692c.tgz /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 diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index 7199c1e..d7a35a5 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 bca180c050dd3ae15f87c26d25cabb34fe1a0a5a +%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-11-29 +%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.5.0 +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.6.2 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.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.3.1 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.4.4" -BuildRequires: phpunit12 >= 12.4.4 +# "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.6.2", +# "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.3", # "sebastian/lines-of-code": "^4.0", # "sebastian/version": "^6.0", -# "theseer/tokenizer": "^1.3.1" +# "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.6.2 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.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.3.1 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": "*" @@ -117,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 @@ -134,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 @@ -187,6 +189,12 @@ exit $ret %changelog +* Tue Dec 9 2025 Remi Collet - 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 - 12.5.0-1 - update to 12.5.0 - raise dependency on nikic/php-parser 5.6.1 diff --git a/sources b/sources index f9a70ba..410a8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage12-12.5.0-bca180c.tgz) = 4b41b9295e440424aa6877ce4b6a8b4b4f987932d429c15bb6d08312f7d7fd4f7a5866c7bee938571241623f4bdd621874c367bf056f96ab22c49d42864c0040 +SHA512 (php-phpunit-php-code-coverage12-12.5.1-c467c59.tgz) = 840ac7744dbbf518c6d88d6a2b4d8c8251693598bc4ba4ed74a77813f4f42aca3eb78f9a35a9f484572521c48b2f74222bfa9b43930e685f563c4eb6b647ebdb 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 +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 @@ + function + + ( +- & ++ & + $val + , + From e5e95ab1bcf107e310fa5d30d093a3fb0143ef60 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jan 2026 11:54:41 +0100 Subject: [PATCH 11/11] v12.5.2 (cherry picked from commit b014dd071c51052f25c84b69b426228eddaf9bd7) --- .gitignore | 1 + php-phpunit-php-code-coverage12.spec | 11 +++++---- sources | 2 +- upstream.patch | 36 ---------------------------- 4 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 upstream.patch diff --git a/.gitignore b/.gitignore index e3776b4..fe4e1cc 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/php-phpunit-php-code-coverage12.spec b/php-phpunit-php-code-coverage12.spec index d7a35a5..a0e0c1d 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 - 12.5.2-1 +- update to 12.5.2 + * Tue Dec 9 2025 Remi Collet - 12.5.1-1 - update to 12.5.1 - raise dependency on nikic/php-parser 5.7.0 diff --git a/sources b/sources index 410a8fa..60d4a98 100644 --- a/sources +++ b/sources @@ -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 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 -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 @@ - function - - ( -- & -+ & - $val - , -