From ee75642ce76fb87c112223388bef0db841399b4d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 27 Jul 2023 15:22:53 +0200 Subject: [PATCH 01/11] v10.1.3 (cherry picked from commit f6f9f5bc364e076232313fcd88c219c592405e9d) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cd6489e..74caaa2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-phpunit-php-code-coverage10-10.1.2-db1497e.tgz +/php-phpunit-php-code-coverage10-10.1.3-be1fe46.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index 34a5e57..582f534 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -11,7 +11,7 @@ %bcond_with tests # Github -%global gh_commit db1497ec8dd382e82c962f7abbe0320e4882ee4e +%global gh_commit be1fe461fdc917de2a29a452ccf2657d325b443d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -25,8 +25,8 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.2 -Release: 2%{?dist} +Version: 10.1.3 +Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} # SPDX: Main license is BSD-3-Clause @@ -197,6 +197,9 @@ exit $ret %changelog +* Thu Jul 27 2023 Remi Collet - 10.1.3-1 +- update to 10.1.3 + * Mon Jun 19 2023 Remi Collet - 10.1.2-2 - fix dependencies, from review #2168110 diff --git a/sources b/sources index 3ab8506..6aee5c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.2-db1497e.tgz) = 3076daa5de44e43d5d94fcc7ef3f58cb4a61a3dbc953e5c9cae816c8281011a259a54374be7d5bdb2f37a8b615350f8992d09db264f7aa8180091ad2a795c7aa +SHA512 (php-phpunit-php-code-coverage10-10.1.3-be1fe46.tgz) = cb40d486ce563973524828a2c5e49a75eaf9e8c06252b681c6e9f236354674698568397060b5bf1f616610a0cf6b705da2f3ab1781f17b6eb919843a138dc08b From 6cddd290a37011b790a67871db17cc3485bafa93 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Aug 2023 10:22:41 +0200 Subject: [PATCH 02/11] v10.1.4 enable test suite (cherry picked from commit 98ed4e30c2552e8a679339ad8a10d807b14a7ba5) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 74caaa2..44aa9f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-phpunit-php-code-coverage10-10.1.2-db1497e.tgz /php-phpunit-php-code-coverage10-10.1.3-be1fe46.tgz +/php-phpunit-php-code-coverage10-10.1.4-cd59bb3.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index 582f534..a50429b 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -7,11 +7,10 @@ # Please, preserve the changelog entries # -# disabled until phpunit10 available -%bcond_with tests +%bcond_without tests # Github -%global gh_commit be1fe461fdc917de2a29a452ccf2657d325b443d +%global gh_commit cd59bb34756a16ca8253ce9b2909039c227fff71 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -25,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.3 +Version: 10.1.4 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -197,6 +196,10 @@ exit $ret %changelog +* Fri Sep 1 2023 Remi Collet - 10.1.4-1 +- update to 10.1.4 +- Enable test suite + * Thu Jul 27 2023 Remi Collet - 10.1.3-1 - update to 10.1.3 diff --git a/sources b/sources index 6aee5c8..58cb7e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.3-be1fe46.tgz) = cb40d486ce563973524828a2c5e49a75eaf9e8c06252b681c6e9f236354674698568397060b5bf1f616610a0cf6b705da2f3ab1781f17b6eb919843a138dc08b +SHA512 (php-phpunit-php-code-coverage10-10.1.4-cd59bb3.tgz) = 5e76b356468ad726b26c62bbf8d891337b694c57a6c7f77bc73386c7e993ba46bff13db6b1e60de682c167c64d33511a1b4792ab798220e54bf504f9adc450c4 From 19fe8662e43017b785270dac92b09691a79cc326 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Sep 2023 08:53:47 +0200 Subject: [PATCH 03/11] v10.1.5 (cherry picked from commit c97116202cb7739e21549bafcc1b4609da9025a2) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 44aa9f0..566d790 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-phpunit-php-code-coverage10-10.1.2-db1497e.tgz /php-phpunit-php-code-coverage10-10.1.3-be1fe46.tgz /php-phpunit-php-code-coverage10-10.1.4-cd59bb3.tgz +/php-phpunit-php-code-coverage10-10.1.5-1df504e.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index a50429b..6ae0749 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit cd59bb34756a16ca8253ce9b2909039c227fff71 +%global gh_commit 1df504e42a88044c27a90136910f0b3fe9e91939 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -24,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.4 +Version: 10.1.5 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -174,7 +174,7 @@ EOF ret=0 # testCanBeCreatedFromDefaults rely on git layout -for cmd in php php81 php82; do +for cmd in php php81 php82 php83; do if which $cmd; then $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ @@ -196,6 +196,9 @@ exit $ret %changelog +* Wed Sep 13 2023 Remi Collet - 10.1.5-1 +- update to 10.1.5 + * Fri Sep 1 2023 Remi Collet - 10.1.4-1 - update to 10.1.4 - Enable test suite diff --git a/sources b/sources index 58cb7e5..95a9891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.4-cd59bb3.tgz) = 5e76b356468ad726b26c62bbf8d891337b694c57a6c7f77bc73386c7e993ba46bff13db6b1e60de682c167c64d33511a1b4792ab798220e54bf504f9adc450c4 +SHA512 (php-phpunit-php-code-coverage10-10.1.5-1df504e.tgz) = 4008bb67475189f93f82e439da1a581f61b4ed0c3426dd0d28488d24be2373846c351109a49f5b6c9e4553f406aef78ee4e05b1e42500a35f50c19b8b86edc48 From ecb39ccb750c221fa4065664136fe04940ed9dcf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Sep 2023 09:57:49 +0200 Subject: [PATCH 04/11] v10.1.6 (cherry picked from commit 06c944c847862c6458132f9b7f563192d36d17bd) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 566d790..2bd0c60 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-phpunit-php-code-coverage10-10.1.3-be1fe46.tgz /php-phpunit-php-code-coverage10-10.1.4-cd59bb3.tgz /php-phpunit-php-code-coverage10-10.1.5-1df504e.tgz +/php-phpunit-php-code-coverage10-10.1.6-56f3354.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index 6ae0749..bef10bd 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 1df504e42a88044c27a90136910f0b3fe9e91939 +%global gh_commit 56f33548fe522c8d82da7ff3824b42829d324364 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -24,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.5 +Version: 10.1.6 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -196,6 +196,9 @@ exit $ret %changelog +* Tue Sep 19 2023 Remi Collet - 10.1.6-1 +- update to 10.1.6 + * Wed Sep 13 2023 Remi Collet - 10.1.5-1 - update to 10.1.5 diff --git a/sources b/sources index 95a9891..ea9290b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.5-1df504e.tgz) = 4008bb67475189f93f82e439da1a581f61b4ed0c3426dd0d28488d24be2373846c351109a49f5b6c9e4553f406aef78ee4e05b1e42500a35f50c19b8b86edc48 +SHA512 (php-phpunit-php-code-coverage10-10.1.6-56f3354.tgz) = 52b3d226daefb9477380437f6a12e6aec21b13bd78e70e281083be7cb2d815a5a8f7c1b7641d91ff0f1c39b98a74616cd4d987159c4f18cfa2dcff3eb225b3ee From d2eefe3c03d46dabc96411e9854837ab92f7d0d4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Oct 2023 12:44:06 +0200 Subject: [PATCH 05/11] v10.1.7 (cherry picked from commit b758ac9481e6fcac78158bfe14e18452232a1ec2) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2bd0c60..77e8b35 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-phpunit-php-code-coverage10-10.1.4-cd59bb3.tgz /php-phpunit-php-code-coverage10-10.1.5-1df504e.tgz /php-phpunit-php-code-coverage10-10.1.6-56f3354.tgz +/php-phpunit-php-code-coverage10-10.1.7-355324c.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index bef10bd..9c1e7c6 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 56f33548fe522c8d82da7ff3824b42829d324364 +%global gh_commit 355324ca4980b8916c18b9db29f3ef484078f26e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -24,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.6 +Version: 10.1.7 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -196,6 +196,9 @@ exit $ret %changelog +* Thu Oct 5 2023 Remi Collet - 10.1.7-1 +- update to 10.1.7 + * Tue Sep 19 2023 Remi Collet - 10.1.6-1 - update to 10.1.6 diff --git a/sources b/sources index ea9290b..aee6dbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.6-56f3354.tgz) = 52b3d226daefb9477380437f6a12e6aec21b13bd78e70e281083be7cb2d815a5a8f7c1b7641d91ff0f1c39b98a74616cd4d987159c4f18cfa2dcff3eb225b3ee +SHA512 (php-phpunit-php-code-coverage10-10.1.7-355324c.tgz) = 0df1ccb069a769857e56d7e8331d1eaf52a2c13f9fb3fa62388d251c9be4ac24200f00efc7ac47c2dee4def77ad6b73ed3db6f5a71906cbc352a679526318451 From 6dde2f972afa57e96cc2c193c3acf82232b82d48 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Nov 2023 10:42:00 +0100 Subject: [PATCH 06/11] v10.1.8 (cherry picked from commit f7abdd9b83a60a1469c7d190a2b9d8d0cda883ae) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 77e8b35..e048b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /php-phpunit-php-code-coverage10-10.1.5-1df504e.tgz /php-phpunit-php-code-coverage10-10.1.6-56f3354.tgz /php-phpunit-php-code-coverage10-10.1.7-355324c.tgz +/php-phpunit-php-code-coverage10-10.1.8-84838ee.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index 9c1e7c6..0e37bbc 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 355324ca4980b8916c18b9db29f3ef484078f26e +%global gh_commit 84838eed9ded511f61dc3e8b5944a52d9017b297 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -24,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.7 +Version: 10.1.8 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -196,6 +196,9 @@ exit $ret %changelog +* Thu Nov 16 2023 Remi Collet - 10.1.8-1 +- update to 10.1.8 + * Thu Oct 5 2023 Remi Collet - 10.1.7-1 - update to 10.1.7 diff --git a/sources b/sources index aee6dbc..34c6795 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.7-355324c.tgz) = 0df1ccb069a769857e56d7e8331d1eaf52a2c13f9fb3fa62388d251c9be4ac24200f00efc7ac47c2dee4def77ad6b73ed3db6f5a71906cbc352a679526318451 +SHA512 (php-phpunit-php-code-coverage10-10.1.8-84838ee.tgz) = 2f70964c40d89872a12df9abc762cc23c901b4ffb5bc8b1b4691590c5705bbacf81f8f349ad196ea540e41f60763f31856cebabf84280f01009cdff2c7b4032c From 6aab4b8eda044bde4bf3aa07e02924bc37c2b55b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Nov 2023 13:56:04 +0100 Subject: [PATCH 07/11] v10.1.9 (cherry picked from commit 429e94a3087c9b3434677f6ca0c73ddb5d8c947b) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e048b2b..a5162e6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /php-phpunit-php-code-coverage10-10.1.6-56f3354.tgz /php-phpunit-php-code-coverage10-10.1.7-355324c.tgz /php-phpunit-php-code-coverage10-10.1.8-84838ee.tgz +/php-phpunit-php-code-coverage10-10.1.9-a56a9ab.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index 0e37bbc..957aa13 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 84838eed9ded511f61dc3e8b5944a52d9017b297 +%global gh_commit a56a9ab2f680246adcf3db43f38ddf1765774735 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -24,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.8 +Version: 10.1.9 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -196,6 +196,9 @@ exit $ret %changelog +* Thu Nov 23 2023 Remi Collet - 10.1.9-1 +- update to 10.1.9 + * Thu Nov 16 2023 Remi Collet - 10.1.8-1 - update to 10.1.8 diff --git a/sources b/sources index 34c6795..3a470f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.8-84838ee.tgz) = 2f70964c40d89872a12df9abc762cc23c901b4ffb5bc8b1b4691590c5705bbacf81f8f349ad196ea540e41f60763f31856cebabf84280f01009cdff2c7b4032c +SHA512 (php-phpunit-php-code-coverage10-10.1.9-a56a9ab.tgz) = 987375ed03b6cd8b941b4ba68744bd50f303702b666ce23b800afc871deb9c0149b1621132724b361f602c0a50ee1f4a21310164898c0ddee65216cd9d5e1333 From 678023e1c7df47962097fccd22b2d4623ba5c3ce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Dec 2023 08:34:37 +0100 Subject: [PATCH 08/11] v10.1.10 (cherry picked from commit 123f34bd21f9a390831e85a30571aaf7d6f8ee8b) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5162e6..be67f50 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-phpunit-php-code-coverage10-10.1.7-355324c.tgz /php-phpunit-php-code-coverage10-10.1.8-84838ee.tgz /php-phpunit-php-code-coverage10-10.1.9-a56a9ab.tgz +/php-phpunit-php-code-coverage10-10.1.10-599109c.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index 957aa13..c2451bc 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit a56a9ab2f680246adcf3db43f38ddf1765774735 +%global gh_commit 599109c8ca6bae97b23482d557d2874c25a65e59 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -24,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.9 +Version: 10.1.10 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -196,6 +196,9 @@ exit $ret %changelog +* Mon Dec 11 2023 Remi Collet - 10.1.10-1 +- update to 10.1.10 + * Thu Nov 23 2023 Remi Collet - 10.1.9-1 - update to 10.1.9 diff --git a/sources b/sources index 3a470f8..348bef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.9-a56a9ab.tgz) = 987375ed03b6cd8b941b4ba68744bd50f303702b666ce23b800afc871deb9c0149b1621132724b361f602c0a50ee1f4a21310164898c0ddee65216cd9d5e1333 +SHA512 (php-phpunit-php-code-coverage10-10.1.10-599109c.tgz) = a1cef77ce56db2001cac40b7414d89e5e7da5bc9ce8fe00100792992ccd8a2099e3e5f33af76095f62a7c38134d15b6ead8f3e5c7c0ad42d822fe9ecbeefbbf7 From 55497d4585a3954f7e611c5a717687dc5d48be8e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Dec 2023 16:56:23 +0100 Subject: [PATCH 09/11] update to 10.1.11 raise dependency on nikic/php-parser 4.18 and allow 5.0 (cherry picked from commit 997b1351edb480772133b8b6cf17442485d2eeb3) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index be67f50..023b16f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-phpunit-php-code-coverage10-10.1.8-84838ee.tgz /php-phpunit-php-code-coverage10-10.1.9-a56a9ab.tgz /php-phpunit-php-code-coverage10-10.1.10-599109c.tgz +/php-phpunit-php-code-coverage10-10.1.11-78c3b76.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index c2451bc..e6b67f3 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 599109c8ca6bae97b23482d557d2874c25a65e59 +%global gh_commit 78c3b7625965c2513ee96569a4dbb62601784145 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann %global gh_project php-code-coverage @@ -24,7 +24,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.10 +Version: 10.1.11 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -41,7 +41,7 @@ BuildArch: noarch BuildRequires: php(language) >= 8.1 BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} -BuildRequires: (php-composer(nikic/php-parser) >= 4.15 with php-composer(nikic/php-parser) < 5) +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) @@ -70,7 +70,7 @@ BuildRequires: php-xdebug # "ext-dom": "*", # "ext-libxml": "*", # "ext-xmlwriter": "*", -# "nikic/php-parser": "^4.15", +# "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", @@ -83,7 +83,7 @@ Requires: php(language) >= 8.1 Requires: php-dom Requires: php-libxml Requires: php-xmlwriter -Requires: (php-composer(nikic/php-parser) >= 4.15 with php-composer(nikic/php-parser) < 5) +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) @@ -138,7 +138,10 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/PhpParser4/autoload.php', + [ + '%{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', @@ -196,6 +199,10 @@ exit $ret %changelog +* 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 + * Mon Dec 11 2023 Remi Collet - 10.1.10-1 - update to 10.1.10 diff --git a/sources b/sources index 348bef8..8ae2eee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.10-599109c.tgz) = a1cef77ce56db2001cac40b7414d89e5e7da5bc9ce8fe00100792992ccd8a2099e3e5f33af76095f62a7c38134d15b6ead8f3e5c7c0ad42d822fe9ecbeefbbf7 +SHA512 (php-phpunit-php-code-coverage10-10.1.11-78c3b76.tgz) = 2946fe65087188ef06e43b26351fb4508854536dafcf32e351cc2d964bb0ce6fc484da30a943aebb297b3e9c70258e42c466a14f2893585771959337fe02fec5 From 8d95d892c1f87625b404ab24cee7da13ea366514 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Mar 2024 07:32:26 +0100 Subject: [PATCH 10/11] v10.1.13 (cherry picked from commit 27d672e22a3f9d5269b13123cb9927747bd3b318) (cherry picked from commit c14025d7eb263b073dec70986b6963894d43c893) --- .gitignore | 2 ++ php-phpunit-php-code-coverage10.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 023b16f..18b00fb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /php-phpunit-php-code-coverage10-10.1.9-a56a9ab.tgz /php-phpunit-php-code-coverage10-10.1.10-599109c.tgz /php-phpunit-php-code-coverage10-10.1.11-78c3b76.tgz +/php-phpunit-php-code-coverage10-10.1.12-842f726.tgz +/php-phpunit-php-code-coverage10-10.1.13-d51c3ae.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index e6b67f3..d522154 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-php-code-coverage10 # -# 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/ # @@ -10,10 +10,11 @@ %bcond_without tests # Github -%global gh_commit 78c3b7625965c2513ee96569a4dbb62601784145 +%global gh_commit d51c3aec14896d5e80b354fad58e998d1980f8f8 %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-03-09 # Packagist %global pk_vendor phpunit %global pk_project php-code-coverage @@ -24,7 +25,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.11 +Version: 10.1.13 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -33,7 +34,7 @@ Summary: PHP code coverage information, version %{ver_major} # MIT: boostrap, d3, holder, html5shiv, jquery, respond # Apache-2.0: nvd3 License: BSD-3-Clause AND MIT AND Apache-2.0 -URL: https://github.com/%{gh_vendor}/%{gh_project} +URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -199,6 +200,9 @@ exit $ret %changelog +* Mon Mar 11 2024 Remi Collet - 10.1.13-1 +- update to 10.1.13 + * 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 diff --git a/sources b/sources index 8ae2eee..dbe936e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.11-78c3b76.tgz) = 2946fe65087188ef06e43b26351fb4508854536dafcf32e351cc2d964bb0ce6fc484da30a943aebb297b3e9c70258e42c466a14f2893585771959337fe02fec5 +SHA512 (php-phpunit-php-code-coverage10-10.1.13-d51c3ae.tgz) = 46736c3fb3eae1e0f505806299b92fb2252216382f9ff0122af5a4f665b52c3e3eef20a0d51c52fe43f6a31ae5a8de8c369407a161e2360a7fa6eb4c71a57158 From 031a90c028072d25639e5ae57a7cc5aaf37c4e46 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2024 09:00:59 +0100 Subject: [PATCH 11/11] v10.1.14 (cherry picked from commit 3c67b83768bd32911c45e54673e76749b5f0a604) --- .gitignore | 1 + php-phpunit-php-code-coverage10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 18b00fb..84ddecc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /php-phpunit-php-code-coverage10-10.1.11-78c3b76.tgz /php-phpunit-php-code-coverage10-10.1.12-842f726.tgz /php-phpunit-php-code-coverage10-10.1.13-d51c3ae.tgz +/php-phpunit-php-code-coverage10-10.1.14-e3f5145.tgz diff --git a/php-phpunit-php-code-coverage10.spec b/php-phpunit-php-code-coverage10.spec index d522154..021f9c2 100644 --- a/php-phpunit-php-code-coverage10.spec +++ b/php-phpunit-php-code-coverage10.spec @@ -10,11 +10,11 @@ %bcond_without tests # Github -%global gh_commit d51c3aec14896d5e80b354fad58e998d1980f8f8 +%global gh_commit e3f51450ebffe8e0efdf7346ae966a656f7d5e5b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-code-coverage -%global gh_date 2024-03-09 +%global gh_date 2024-03-12 # Packagist %global pk_vendor phpunit %global pk_project php-code-coverage @@ -25,7 +25,7 @@ %global ver_major 10 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 10.1.13 +Version: 10.1.14 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -200,6 +200,9 @@ exit $ret %changelog +* Wed Mar 13 2024 Remi Collet - 10.1.14-1 +- update to 10.1.14 + * Mon Mar 11 2024 Remi Collet - 10.1.13-1 - update to 10.1.13 diff --git a/sources b/sources index dbe936e..fd529fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage10-10.1.13-d51c3ae.tgz) = 46736c3fb3eae1e0f505806299b92fb2252216382f9ff0122af5a4f665b52c3e3eef20a0d51c52fe43f6a31ae5a8de8c369407a161e2360a7fa6eb4c71a57158 +SHA512 (php-phpunit-php-code-coverage10-10.1.14-e3f5145.tgz) = b43916d9a1e0d154ad92d33e18947e6aac23b11b64464188f45aad95d7c78da9ac5430e92db7b5e35e0d7342f14d39e8a856ec2d351561f40a1233c379005721