From c830fb21758fbade41e4e3dc21931ed80c425716 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 30 Oct 2020 14:54:21 +0100 Subject: [PATCH 1/4] update to 9.2.5 raise dependency on sebastian/lines-of-code 1.0.3 raise dependency on nikic/php-parser 4.10.2 --- .gitignore | 2 ++ php-phpunit-php-code-coverage9.spec | 48 ++++++++++++++++------------- sources | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 39e48b8..3865be9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /php-phpunit-php-code-coverage9-9.2.0-53a4b73.tgz /php-phpunit-php-code-coverage9-9.2.1-ed363c3.tgz /php-phpunit-php-code-coverage9-9.2.2-229099d.tgz +/php-phpunit-php-code-coverage9-9.2.3-6b20e20.tgz +/php-phpunit-php-code-coverage9-9.2.5-f3e0266.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index 3c1e5ed..b2da7ba 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 229099d7d69fe5044f6e464f669b1fd34f252e8d +%global gh_commit f3e026641cc91909d421802dd3ac7827ebfd97e1 #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.2 +Version: 9.2.5 Release: 1%{?dist} Summary: PHP code coverage information @@ -42,15 +42,15 @@ 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.8 with php-composer(nikic/php-parser) < 5) -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) -BuildRequires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3) -BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/lines-of-code) >= 1.0 with php-composer(sebastian/lines-of-code) < 2) -BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) -BuildRequires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) +BuildRequires: (php-composer(nikic/php-parser) >= 4.10.2 with php-composer(nikic/php-parser) < 5) +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) +BuildRequires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3) +BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) +BuildRequires: (php-composer(sebastian/lines-of-code) >= 1.0.3 with php-composer(sebastian/lines-of-code) < 2) +BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) +BuildRequires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) # From composer.json, "require-dev": { # "phpunit/phpunit": "^9.3" BuildRequires: phpunit9 >= 9.3 @@ -68,22 +68,22 @@ BuildRequires: php-xdebug # "sebastian/code-unit-reverse-lookup": "^2.0.2", # "sebastian/complexity": "^2.0", # "sebastian/environment": "^5.1.2", -# "sebastian/lines-of-code": "^1.0", +# "sebastian/lines-of-code": "^1.0.3", # "sebastian/version": "^3.0.1", # "theseer/tokenizer": "^1.2.0" Requires: php(language) >= 7.3 Requires: php-dom Requires: php-libxml Requires: php-xmlwriter -Requires: (php-composer(nikic/php-parser) >= 4.8 with php-composer(nikic/php-parser) < 5) -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) -Requires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3) -Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/lines-of-code) >= 1.0 with php-composer(sebastian/lines-of-code) < 2) -Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) -Requires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) +Requires: (php-composer(nikic/php-parser) >= 4.10.2 with php-composer(nikic/php-parser) < 5) +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) +Requires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3) +Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) +Requires: (php-composer(sebastian/lines-of-code) >= 1.0.3 with php-composer(sebastian/lines-of-code) < 2) +Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) +Requires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2) # From composer.json, suggest # "ext-pcov": "*", # "ext-xdebug": "*" @@ -152,6 +152,7 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major} if ! php -v | grep Xdebug then EXT="-d zend_extension=xdebug.so -d xdebug.mode=coverage" fi +export XDEBUG_MODE=coverage cat << 'EOF' | tee tests/bootstrap.php - 9.2.5-1 +- update to 9.2.5 +- raise dependency on sebastian/lines-of-code 1.0.3 +- raise dependency on nikic/php-parser 4.10.2 + * Wed Oct 28 2020 Remi Collet - 9.2.2-1 - update to 9.2.2 diff --git a/sources b/sources index 25d3f18..7e6b4ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.2-229099d.tgz) = a86794353fea19273aa914d1f9935df8b72968904c0a019ae46e9cb5763ac9b4a531f3871553881372a3314ea5d0094e166a954cec95c65bbc3f953c7024b924 +SHA512 (php-phpunit-php-code-coverage9-9.2.5-f3e0266.tgz) = 2ac276396079e9f8f185ed01c459bb89ce97c272acbcd781986ba0a737b0b6339cd30c496d8ac728e483d80c334d46590504f4f1418bb724dd2c9e91f9f784cc From e877debab092858d8938e2cf86096f5a19a8258b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Mar 2021 08:52:01 +0200 Subject: [PATCH 2/4] v9.2.6 (cherry picked from commit 18232e0004475ceb65e1d694648dcc0d1e553dee) --- .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 3865be9..02b04d5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /php-phpunit-php-code-coverage9-9.2.2-229099d.tgz /php-phpunit-php-code-coverage9-9.2.3-6b20e20.tgz /php-phpunit-php-code-coverage9-9.2.5-f3e0266.tgz +/php-phpunit-php-code-coverage9-9.2.6-f6293e1.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index b2da7ba..4fb8617 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 f3e026641cc91909d421802dd3ac7827ebfd97e1 +%global gh_commit f6293e1b30a2354e8428e004689671b83871edde #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.5 +Version: 9.2.6 Release: 1%{?dist} Summary: PHP code coverage information @@ -183,6 +183,9 @@ exit $ret %changelog +* Mon Mar 29 2021 Remi Collet - 9.2.6-1 +- update to 9.2.6 + * Mon Nov 30 2020 Remi Collet - 9.2.5-1 - update to 9.2.5 - raise dependency on sebastian/lines-of-code 1.0.3 diff --git a/sources b/sources index 7e6b4ec..67c5b91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.5-f3e0266.tgz) = 2ac276396079e9f8f185ed01c459bb89ce97c272acbcd781986ba0a737b0b6339cd30c496d8ac728e483d80c334d46590504f4f1418bb724dd2c9e91f9f784cc +SHA512 (php-phpunit-php-code-coverage9-9.2.6-f6293e1.tgz) = c6e3535c379dd2afdc3adebd12ab7fd1debc0df5ea7460ad7cddb453bb0c856580f961a881e0f9b61813bd85f4b1580b7be463416252729f5e059b01dd74bc22 From 518a5ade91d9981e6ca16c5de924961faccfca01 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Sep 2021 10:05:25 +0200 Subject: [PATCH 3/4] update to 9.2.7 raise dependency on nikic/php-parser 4.12.0 (cherry picked from commit 8f69871bc587a9eb625360df06de129af1efae1e) (cherry picked from commit 2d1465dbbf0570296a1f49b7f76cd45cd58f60f9) --- .gitignore | 1 + php-phpunit-php-code-coverage9.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 02b04d5..c8d519f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /php-phpunit-php-code-coverage9-9.2.3-6b20e20.tgz /php-phpunit-php-code-coverage9-9.2.5-f3e0266.tgz /php-phpunit-php-code-coverage9-9.2.6-f6293e1.tgz +/php-phpunit-php-code-coverage9-9.2.7-d4c798e.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index 4fb8617..a036f35 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 f6293e1b30a2354e8428e004689671b83871edde +%global gh_commit d4c798ed8d51506800b441f7a13ecb0f76f12218 #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.6 +Version: 9.2.7 Release: 1%{?dist} Summary: PHP code coverage information @@ -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.10.2 with php-composer(nikic/php-parser) < 5) +BuildRequires: (php-composer(nikic/php-parser) >= 4.12.0 with php-composer(nikic/php-parser) < 5) 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.7", +# "nikic/php-parser": "^4.12.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.10.2 with php-composer(nikic/php-parser) < 5) +Requires: (php-composer(nikic/php-parser) >= 4.12.0 with php-composer(nikic/php-parser) < 5) 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) @@ -162,7 +162,7 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php73 php74 php80 php81; do if which $cmd; then $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ @@ -183,6 +183,10 @@ exit $ret %changelog +* Tue Sep 21 2021 Remi Collet - 9.2.7-1 +- update to 9.2.7 +- raise dependency on nikic/php-parser 4.12.0 + * Mon Mar 29 2021 Remi Collet - 9.2.6-1 - update to 9.2.6 diff --git a/sources b/sources index 67c5b91..cad6505 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.6-f6293e1.tgz) = c6e3535c379dd2afdc3adebd12ab7fd1debc0df5ea7460ad7cddb453bb0c856580f961a881e0f9b61813bd85f4b1580b7be463416252729f5e059b01dd74bc22 +SHA512 (php-phpunit-php-code-coverage9-9.2.7-d4c798e.tgz) = 0441cc49d79b8af881fa06d172f5819727dd78c7719b0b2c304dc074300b9d6776f79035805366995b62205eafc50d0a4d96f03ebc0b2b2e970ff93ee0cefa71 From 03ac9b2a06b7e336f01568d8d8afdd47817a19ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 07:56:18 +0100 Subject: [PATCH 4/4] update to 9.2.8 raise dependency on nikic/php-parser 4.13.0 (cherry picked from commit 9e90f59888aa35aeae3ee05c328f93a73cc5631b) --- .gitignore | 1 + php-phpunit-php-code-coverage9.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c8d519f..b463d92 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /php-phpunit-php-code-coverage9-9.2.5-f3e0266.tgz /php-phpunit-php-code-coverage9-9.2.6-f6293e1.tgz /php-phpunit-php-code-coverage9-9.2.7-d4c798e.tgz +/php-phpunit-php-code-coverage9-9.2.8-cf04e88.tgz diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec index a036f35..683a361 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 d4c798ed8d51506800b441f7a13ecb0f76f12218 +%global gh_commit cf04e88a2e3c56fc1a65488afd493325b4c1bc3e #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.7 +Version: 9.2.8 Release: 1%{?dist} Summary: PHP code coverage information @@ -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.12.0 with php-composer(nikic/php-parser) < 5) +BuildRequires: (php-composer(nikic/php-parser) >= 4.13.0 with php-composer(nikic/php-parser) < 5) 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.12.0", +# "nikic/php-parser": "^4.13.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.12.0 with php-composer(nikic/php-parser) < 5) +Requires: (php-composer(nikic/php-parser) >= 4.13.0 with php-composer(nikic/php-parser) < 5) 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) @@ -183,6 +183,10 @@ exit $ret %changelog +* Tue Nov 2 2021 Remi Collet - 9.2.8-1 +- update to 9.2.8 +- raise dependency on nikic/php-parser 4.13.0 + * Tue Sep 21 2021 Remi Collet - 9.2.7-1 - update to 9.2.7 - raise dependency on nikic/php-parser 4.12.0 diff --git a/sources b/sources index cad6505..5f3935e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage9-9.2.7-d4c798e.tgz) = 0441cc49d79b8af881fa06d172f5819727dd78c7719b0b2c304dc074300b9d6776f79035805366995b62205eafc50d0a4d96f03ebc0b2b2e970ff93ee0cefa71 +SHA512 (php-phpunit-php-code-coverage9-9.2.8-cf04e88.tgz) = 6d65458203d7018b92ee2ec8d9687babc933fb0333377703ba895e6167003d21c38c053ea05b0e752ac8bb60f7dd9e9a1fa3560f872615dfefa6a5ebab7be599