From 37e0a14a8ab4a2d4cb141e490a541626446e7b35 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 27 Jul 2023 15:08:32 +0200 Subject: [PATCH 1/4] v9.2.27 (cherry picked from commit b24ef42855b18f16e7bb1f946285e20e8f68dea1) --- .gitignore | 1 + php-phpunit-php-code-coverage9.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e76f9bc..e337e2d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /php-phpunit-php-code-coverage9-9.2.24-2cf940e.tgz /php-phpunit-php-code-coverage9-9.2.25-0e2b405.tgz /php-phpunit-php-code-coverage9-9.2.26-443bc69.tgz +/php-phpunit-php-code-coverage9-9.2.27-b0a8825.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index 73ab026..c4f2791 100644 --- a/php-phpunit-php-code-coverage9.spec +++ b/php-phpunit-php-code-coverage9.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 443bc6912c9bd5b409254a40f4b0f4ced7c80ea1 +%global gh_commit b0a88255cb70d52653d80c890bd7f38740ea50d1 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 9.2.26 +Version: 9.2.27 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -113,7 +113,7 @@ Provides: bundled(js-popper) Library that provides collection, processing, and rendering functionality for PHP code coverage information. -This package provides the version %{ver_major} of the library. +This package provides version %{ver_major} of %{pk_vendor}/%{pk_project} library. Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php @@ -185,6 +185,9 @@ exit $ret %changelog +* Thu Jul 27 2023 Remi Collet - 9.2.27-1 +- update to 9.2.27 + * Mon Mar 6 2023 Remi Collet - 9.2.26-1 - update to 9.2.26 diff --git a/sources b/sources index 73838f6..8d52863 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.26-443bc69.tgz) = fc76aa0f29af539122998f9df6106bcf8ebce34d1b921e1f82fde8215b2c38f9de9c798ae922dc5790ed872670ea3294bb41c496e2cb1b3f3060fd87eed9e419 +SHA512 (php-phpunit-php-code-coverage9-9.2.27-b0a8825.tgz) = 09f7341956455fed3a282e30e8f6f79a5401417ee14cb4aac0903034580c33cef1e4a9d5c2daeed7a024871433aa931f97dae612c9b2ac0a12a35d65447ed755 From b67916312be706ec61ff5a2196ffb72495d0d79e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Sep 2023 08:44:30 +0200 Subject: [PATCH 2/4] 9.2.28 (cherry picked from commit 1678447ca51b5e8c07c72ef8b16ce18036469fdc) --- .gitignore | 1 + php-phpunit-php-code-coverage9.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e337e2d..a7283e7 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /php-phpunit-php-code-coverage9-9.2.25-0e2b405.tgz /php-phpunit-php-code-coverage9-9.2.26-443bc69.tgz /php-phpunit-php-code-coverage9-9.2.27-b0a8825.tgz +/php-phpunit-php-code-coverage9-9.2.28-7134a5c.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index c4f2791..b1ab675 100644 --- a/php-phpunit-php-code-coverage9.spec +++ b/php-phpunit-php-code-coverage9.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit b0a88255cb70d52653d80c890bd7f38740ea50d1 +%global gh_commit 7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 9.2.27 +Version: 9.2.28 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -164,7 +164,7 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF ret=0 -for cmd in php php80 php81 php82; do +for cmd in php php80 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 \ @@ -185,6 +185,9 @@ exit $ret %changelog +* Wed Sep 13 2023 Remi Collet - 9.2.28-1 +- update to 9.2.28 + * Thu Jul 27 2023 Remi Collet - 9.2.27-1 - update to 9.2.27 diff --git a/sources b/sources index 8d52863..db003ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.27-b0a8825.tgz) = 09f7341956455fed3a282e30e8f6f79a5401417ee14cb4aac0903034580c33cef1e4a9d5c2daeed7a024871433aa931f97dae612c9b2ac0a12a35d65447ed755 +SHA512 (php-phpunit-php-code-coverage9-9.2.28-7134a5c.tgz) = e74cd4b3613c1bf712a78ebcb938b8b151b214a509dfb51e13691287a2ddf6eb38fa3f0afdb7961ef858c9001fccaab665857ea1f134853e9f9d434584dd208a From 7ee460f5c3dac7bd0e7557e9eb62ede120875541 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Sep 2023 09:42:16 +0200 Subject: [PATCH 3/4] v9.2.29 (cherry picked from commit f513e79cca54940b6912c9edc279c4d7c7c27123) --- .gitignore | 1 + php-phpunit-php-code-coverage9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a7283e7..feaba49 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /php-phpunit-php-code-coverage9-9.2.26-443bc69.tgz /php-phpunit-php-code-coverage9-9.2.27-b0a8825.tgz /php-phpunit-php-code-coverage9-9.2.28-7134a5c.tgz +/php-phpunit-php-code-coverage9-9.2.29-6a3a87a.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index b1ab675..a6ab7b6 100644 --- a/php-phpunit-php-code-coverage9.spec +++ b/php-phpunit-php-code-coverage9.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef +%global gh_commit 6a3a87ac2bbe33b25042753df8195ba4aa534c76 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 9.2.28 +Version: 9.2.29 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -185,6 +185,9 @@ exit $ret %changelog +* Tue Sep 19 2023 Remi Collet - 9.2.29-1 +- update to 9.2.29 + * Wed Sep 13 2023 Remi Collet - 9.2.28-1 - update to 9.2.28 diff --git a/sources b/sources index db003ab..aafc657 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.28-7134a5c.tgz) = e74cd4b3613c1bf712a78ebcb938b8b151b214a509dfb51e13691287a2ddf6eb38fa3f0afdb7961ef858c9001fccaab665857ea1f134853e9f9d434584dd208a +SHA512 (php-phpunit-php-code-coverage9-9.2.29-6a3a87a.tgz) = b6259b656b4445fc3ab48da68c931a746f149226fecf261a84901a45b76a2b3cf345b1568a4f92b066336a42013b1dafbaa954696680210b766ef720d8fecefe From 494437787afe339ba085d011148bc3321158ca54 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Dec 2023 11:08:09 +0100 Subject: [PATCH 4/4] update to 9.2.30 raise dependency on nikic/php-parser 4.18 and allow 5.0 (cherry picked from commit 4ed88e1678e765abb1c30fa29934720d70cb6ed0) --- .gitignore | 1 + php-phpunit-php-code-coverage9.spec | 21 ++++++++++++++------- sources | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index feaba49..404509d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /php-phpunit-php-code-coverage9-9.2.27-b0a8825.tgz /php-phpunit-php-code-coverage9-9.2.28-7134a5c.tgz /php-phpunit-php-code-coverage9-9.2.29-6a3a87a.tgz +/php-phpunit-php-code-coverage9-9.2.30-ca2bd87.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index a6ab7b6..5b4c363 100644 --- a/php-phpunit-php-code-coverage9.spec +++ b/php-phpunit-php-code-coverage9.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 6a3a87ac2bbe33b25042753df8195ba4aa534c76 +%global gh_commit ca2bd87d2f9215904682a9cb9bb37dda98e76089 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 9.2.29 +Version: 9.2.30 Release: 1%{?dist} Summary: PHP code coverage information, version %{ver_major} @@ -42,7 +42,7 @@ BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} BuildRequires: php(language) >= 7.3 -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) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4) BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.2 with php-composer(sebastian/code-unit-reverse-lookup) < 3) @@ -62,7 +62,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": "^3.0.3", # "phpunit/php-text-template": "^2.0.2", # "sebastian/code-unit-reverse-lookup": "^2.0.2", @@ -75,7 +75,7 @@ Requires: php(language) >= 7.3 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) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4) Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.2 with php-composer(sebastian/code-unit-reverse-lookup) < 3) @@ -130,7 +130,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}/FileIterator3/autoload.php', '%{php_home}/%{ns_vendor}/Template2/autoload.php', '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup2/autoload.php', @@ -164,7 +167,7 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF ret=0 -for cmd in php php80 php81 php82 php83; 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 \ @@ -185,6 +188,10 @@ exit $ret %changelog +* Fri Dec 22 2023 Remi Collet - 9.2.30-1 +- update to 9.2.30 +- raise dependency on nikic/php-parser 4.18 and allow 5.0 + * Tue Sep 19 2023 Remi Collet - 9.2.29-1 - update to 9.2.29 diff --git a/sources b/sources index aafc657..78eafce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.29-6a3a87a.tgz) = b6259b656b4445fc3ab48da68c931a746f149226fecf261a84901a45b76a2b3cf345b1568a4f92b066336a42013b1dafbaa954696680210b766ef720d8fecefe +SHA512 (php-phpunit-php-code-coverage9-9.2.30-ca2bd87.tgz) = 98bca1f671c79db73d87df4d091de84e459de88855fa102777f610fb640558308a57a8a5d6936a4d3e43b8f9b4b9ff7866415b7c4522e559e542bcab108a3581