From a282956666b2be88e47e8559f940a8e2af782e1b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jun 2019 13:20:00 +0200 Subject: [PATCH 01/28] v7.0.4 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fd236e6..3f9f882 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-phpunit-php-code-coverage7-7.0.0-2b0142c.tar.gz /php-phpunit-php-code-coverage7-7.0.2-cfca9c5.tar.gz /php-phpunit-php-code-coverage7-7.0.3-0317a76.tar.gz +/php-phpunit-php-code-coverage7-7.0.4-6024c8a.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index d786ab9..0f4cff0 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit 0317a769a81845c390e19684d9ba25d7f6aa4707 +%global gh_commit 6024c8a6cb962d496b7bd049ed8f48473824176d #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.3 +Version: 7.0.4 Release: 1%{?dist} Summary: PHP code coverage information @@ -155,7 +155,7 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF ret=0 -for cmd in php php72 php73; do +for cmd in php php72 php73 php74; do if which $cmd; then $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ @@ -176,6 +176,9 @@ exit $ret %changelog +* Wed May 29 2019 Remi Collet - 7.0.4-1 +- update to 7.0.4 + * Tue Feb 26 2019 Remi Collet - 7.0.3-1 - update to 7.0.3 diff --git a/sources b/sources index d6970d7..cc17c10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.3-0317a76.tar.gz) = 343c29ba32f511ca58b1fc9ad2104970d2418d590d4692fdd8d20fd4708d6bb80a956aceb4d3e3a8567ede958ab6d48a369e716b5a2be20a8a08e9ae9564b355 +SHA512 (php-phpunit-php-code-coverage7-7.0.4-6024c8a.tar.gz) = f2dabcbe2ae951472f3dbc39f407850812ff5862f039f78724afbdc5793577bc400006e70be422a57c4a2b53c44bd36b14bfbcf73277110de33fe0b1cbed1ae8 From 10bed191bdf126cc68b64bb0835f18285d802245 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 6 Jun 2019 16:38:16 +0200 Subject: [PATCH 02/28] v7.0.5 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3f9f882..76190bd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-phpunit-php-code-coverage7-7.0.2-cfca9c5.tar.gz /php-phpunit-php-code-coverage7-7.0.3-0317a76.tar.gz /php-phpunit-php-code-coverage7-7.0.4-6024c8a.tar.gz +/php-phpunit-php-code-coverage7-7.0.5-aed67b5.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 0f4cff0..be17cc0 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit 6024c8a6cb962d496b7bd049ed8f48473824176d +%global gh_commit aed67b57d459dcab93e84a5c9703d3deb5025dff #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.4 +Version: 7.0.5 Release: 1%{?dist} Summary: PHP code coverage information @@ -176,6 +176,9 @@ exit $ret %changelog +* Thu Jun 6 2019 Remi Collet - 7.0.5-1 +- update to 7.0.5 + * Wed May 29 2019 Remi Collet - 7.0.4-1 - update to 7.0.4 diff --git a/sources b/sources index cc17c10..b821c10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.4-6024c8a.tar.gz) = f2dabcbe2ae951472f3dbc39f407850812ff5862f039f78724afbdc5793577bc400006e70be422a57c4a2b53c44bd36b14bfbcf73277110de33fe0b1cbed1ae8 +SHA512 (php-phpunit-php-code-coverage7-7.0.5-aed67b5.tar.gz) = ea2ac421a92cb5be6edbe9990eeab3324fe56bb024e4a27d8ae3f9c127f0ad54472a839d18de5caaaf2740adbed1b44dd2f38da5e4cf601cadf799c506e8d2f1 From 44f16185efa9567bb5f517c12bdd06551ea8915d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Jul 2019 13:13:11 +0200 Subject: [PATCH 03/28] update to 7.0.6 raise dependency on phpunit/php-token-stream 3.0.2 raise dependency on sebastian/environment 4.2.2 raise dependency on theseer/tokenizer 1.1.3 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 32 +++++++++++++++++------------ sources | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 76190bd..9edec1b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-phpunit-php-code-coverage7-7.0.3-0317a76.tar.gz /php-phpunit-php-code-coverage7-7.0.4-6024c8a.tar.gz /php-phpunit-php-code-coverage7-7.0.5-aed67b5.tar.gz +/php-phpunit-php-code-coverage7-7.0.6-d471d0d.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index be17cc0..66cfb7e 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit aed67b57d459dcab93e84a5c9703d3deb5025dff +%global gh_commit d471d0d2b529a67c6a722dd446c4ec90881ac315 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.5 +Version: 7.0.6 Release: 1%{?dist} Summary: PHP code coverage information @@ -46,16 +46,16 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.0.1 with php-composer(phpunit/php-token-stream) < 4) +BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.0.2 with php-composer(phpunit/php-token-stream) < 4) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) -BuildRequires: (php-composer(sebastian/environment) >= 4.1 with php-composer(sebastian/environment) < 5) +BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) -BuildRequires: (php-composer(theseer/tokenizer) >= 1.1 with php-composer(theseer/tokenizer) < 2) +BuildRequires: (php-composer(theseer/tokenizer) >= 1.1.3 with php-composer(theseer/tokenizer) < 2) # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.0" +# "phpunit/phpunit": "^8.2.2" # 7.2 because of tests -BuildRequires: phpunit8 +BuildRequires: phpunit8 >= 8.2.2 BuildRequires: php-pecl-xdebug >= 2.6.1 %endif @@ -64,22 +64,22 @@ BuildRequires: php-pecl-xdebug >= 2.6.1 # "ext-dom": "*", # "ext-xmlwriter": "*", # "phpunit/php-file-iterator": "^2.0.2", -# "phpunit/php-token-stream": "^3.0.1", +# "phpunit/php-token-stream": "^3.0.2", # "phpunit/php-text-template": "^1.2.1", # "sebastian/code-unit-reverse-lookup": "^1.0.1", -# "sebastian/environment": "^4.1", +# "sebastian/environment": "^4.2.2", # "sebastian/version": "^2.0.1", -# "theseer/tokenizer": "^1.1" +# "theseer/tokenizer": "^1.1.3" Requires: php(language) >= 7.1 Requires: php-dom Requires: php-xmlwriter Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -Requires: (php-composer(phpunit/php-token-stream) >= 3.0.1 with php-composer(phpunit/php-token-stream) < 4) +Requires: (php-composer(phpunit/php-token-stream) >= 3.0.2 with php-composer(phpunit/php-token-stream) < 4) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) -Requires: (php-composer(sebastian/environment) >= 4.1 with php-composer(sebastian/environment) < 5) +Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) -Requires: (php-composer(theseer/tokenizer) >= 1.1 with php-composer(theseer/tokenizer) < 2) +Requires: (php-composer(theseer/tokenizer) >= 1.1.3 with php-composer(theseer/tokenizer) < 2) # From composer.json, suggest # "ext-xdebug": ">=2.6.1", Suggests: php-xdebug @@ -176,6 +176,12 @@ exit $ret %changelog +* Mon Jul 8 2019 Remi Collet - 7.0.6-1 +- update to 7.0.6 +- raise dependency on phpunit/php-token-stream 3.0.2 +- raise dependency on sebastian/environment 4.2.2 +- raise dependency on theseer/tokenizer 1.1.3 + * Thu Jun 6 2019 Remi Collet - 7.0.5-1 - update to 7.0.5 diff --git a/sources b/sources index b821c10..d9afb65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.5-aed67b5.tar.gz) = ea2ac421a92cb5be6edbe9990eeab3324fe56bb024e4a27d8ae3f9c127f0ad54472a839d18de5caaaf2740adbed1b44dd2f38da5e4cf601cadf799c506e8d2f1 +SHA512 (php-phpunit-php-code-coverage7-7.0.6-d471d0d.tar.gz) = be6551edada95ec15a6228f20948608a6366fdb0468d85994219869887bbbd79d6feb782a195cd24f2d3c69acbdfe71ba2ebeb94b5b53c38b5e7af47ffa2096b From 525ff83a8e7714f775e803e6380ca21d4129aef4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Jul 2019 08:39:05 +0200 Subject: [PATCH 04/28] update to 7.0.7 (no change) raise dependency on phpunit/php-token-stream 3.1.0 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9edec1b..32465f0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /php-phpunit-php-code-coverage7-7.0.4-6024c8a.tar.gz /php-phpunit-php-code-coverage7-7.0.5-aed67b5.tar.gz /php-phpunit-php-code-coverage7-7.0.6-d471d0d.tar.gz +/php-phpunit-php-code-coverage7-7.0.7-7743bbc.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 66cfb7e..aaa19dd 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit d471d0d2b529a67c6a722dd446c4ec90881ac315 +%global gh_commit 7743bbcfff2a907e9ee4a25be13d0f8ec5e73800 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.6 +Version: 7.0.7 Release: 1%{?dist} Summary: PHP code coverage information @@ -64,7 +64,7 @@ BuildRequires: php-pecl-xdebug >= 2.6.1 # "ext-dom": "*", # "ext-xmlwriter": "*", # "phpunit/php-file-iterator": "^2.0.2", -# "phpunit/php-token-stream": "^3.0.2", +# "phpunit/php-token-stream": "^3.1.0", # "phpunit/php-text-template": "^1.2.1", # "sebastian/code-unit-reverse-lookup": "^1.0.1", # "sebastian/environment": "^4.2.2", @@ -74,7 +74,7 @@ Requires: php(language) >= 7.1 Requires: php-dom Requires: php-xmlwriter Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -Requires: (php-composer(phpunit/php-token-stream) >= 3.0.2 with php-composer(phpunit/php-token-stream) < 4) +Requires: (php-composer(phpunit/php-token-stream) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 4) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -176,6 +176,10 @@ exit $ret %changelog +* Thu Jul 25 2019 Remi Collet - 7.0.7-1 +- update to 7.0.7 (no change) +- raise dependency on phpunit/php-token-stream 3.1.0 + * Mon Jul 8 2019 Remi Collet - 7.0.6-1 - update to 7.0.6 - raise dependency on phpunit/php-token-stream 3.0.2 diff --git a/sources b/sources index d9afb65..1034fd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.6-d471d0d.tar.gz) = be6551edada95ec15a6228f20948608a6366fdb0468d85994219869887bbbd79d6feb782a195cd24f2d3c69acbdfe71ba2ebeb94b5b53c38b5e7af47ffa2096b +SHA512 (php-phpunit-php-code-coverage7-7.0.7-7743bbc.tar.gz) = db201c958b103db1bb6cc3c6cc72d9a731a3cb1bfdc3b4665083b2f76303df5dda44ef9572811cf97ca476a43a974e4e6ed29665b95d853335612d09ade879ab From 1ba9c554c46e26837554ff2957c7d7dd20e97fb4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Sep 2019 09:48:13 +0200 Subject: [PATCH 05/28] update to 7.0.8 raise dependency on phpunit/php-token-stream 3.1.1 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 32465f0..27b3aab 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /php-phpunit-php-code-coverage7-7.0.5-aed67b5.tar.gz /php-phpunit-php-code-coverage7-7.0.6-d471d0d.tar.gz /php-phpunit-php-code-coverage7-7.0.7-7743bbc.tar.gz +/php-phpunit-php-code-coverage7-7.0.8-aa0d179.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index aaa19dd..5945752 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit 7743bbcfff2a907e9ee4a25be13d0f8ec5e73800 +%global gh_commit aa0d179a13284c7420fc281fc32750e6cc7c9e2f #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.7 +Version: 7.0.8 Release: 1%{?dist} Summary: PHP code coverage information @@ -46,7 +46,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.0.2 with php-composer(phpunit/php-token-stream) < 4) +BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 4) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -74,7 +74,7 @@ Requires: php(language) >= 7.1 Requires: php-dom Requires: php-xmlwriter Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -Requires: (php-composer(phpunit/php-token-stream) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 4) +Requires: (php-composer(phpunit/php-token-stream) >= 3.1.1 with php-composer(phpunit/php-token-stream) < 4) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -96,11 +96,11 @@ Requires: php-composer(fedora/autoloader) # Composer Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} # Bundled assets in HTML template -Provides: bundled(js-bootstrap) = 4.3.0 +Provides: bundled(js-bootstrap) = 4.3.1 Provides: bundled(js-d3) = 3.5.17 Provides: bundled(js-holder) = 2.7.1 Provides: bundled(js-html5shiv) = 3.7.3 -Provides: bundled(js-jquery) = 3.1.1 +Provides: bundled(js-jquery) = 3.4.1 Provides: bundled(js-nvd3) = 1.8.1 Provides: bundled(js-respond) = 1.1.2 @@ -176,6 +176,10 @@ exit $ret %changelog +* Tue Sep 17 2019 Remi Collet - 7.0.8-1 +- update to 7.0.8 +- raise dependency on phpunit/php-token-stream 3.1.1 + * Thu Jul 25 2019 Remi Collet - 7.0.7-1 - update to 7.0.7 (no change) - raise dependency on phpunit/php-token-stream 3.1.0 diff --git a/sources b/sources index 1034fd9..e1a013f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.7-7743bbc.tar.gz) = db201c958b103db1bb6cc3c6cc72d9a731a3cb1bfdc3b4665083b2f76303df5dda44ef9572811cf97ca476a43a974e4e6ed29665b95d853335612d09ade879ab +SHA512 (php-phpunit-php-code-coverage7-7.0.8-aa0d179.tar.gz) = a52d8f0d1b730652e2967d8a7df2a8fcf7b6dfcba1dbeaa4a5a6ddffa7b8d53e5bafa0d0874e8c1bb0a0cc13d080d89a59e5a41981474a93a3d23029f883f8a3 From a651dfe6ab67bca529f51f43ca4c5f03767791fa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Nov 2019 13:21:55 +0100 Subject: [PATCH 06/28] v7.0.9 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 27b3aab..f9e3aa0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-phpunit-php-code-coverage7-7.0.6-d471d0d.tar.gz /php-phpunit-php-code-coverage7-7.0.7-7743bbc.tar.gz /php-phpunit-php-code-coverage7-7.0.8-aa0d179.tar.gz +/php-phpunit-php-code-coverage7-7.0.9-075572d.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 5945752..a10cc1e 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit aa0d179a13284c7420fc281fc32750e6cc7c9e2f +%global gh_commit 075572dd777ea8317196838f8b59b1de2a642abc #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.8 +Version: 7.0.9 Release: 1%{?dist} Summary: PHP code coverage information @@ -83,7 +83,7 @@ Requires: (php-composer(theseer/tokenizer) >= 1.1.3 with # From composer.json, suggest # "ext-xdebug": ">=2.6.1", Suggests: php-xdebug -Suggests: php-pcov +Recommends: php-pcov # From phpcompatinfo report for version 5.0.0 Requires: php-reflection Requires: php-date @@ -176,6 +176,9 @@ exit $ret %changelog +* Wed Nov 20 2019 Remi Collet - 7.0.9-1 +- update to 7.0.9 + * Tue Sep 17 2019 Remi Collet - 7.0.8-1 - update to 7.0.8 - raise dependency on phpunit/php-token-stream 3.1.1 diff --git a/sources b/sources index e1a013f..9c93222 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.8-aa0d179.tar.gz) = a52d8f0d1b730652e2967d8a7df2a8fcf7b6dfcba1dbeaa4a5a6ddffa7b8d53e5bafa0d0874e8c1bb0a0cc13d080d89a59e5a41981474a93a3d23029f883f8a3 +SHA512 (php-phpunit-php-code-coverage7-7.0.9-075572d.tar.gz) = 6a0e752bc4c9323ade7e1dcf74a547defdf0ad2ccedc366ad796f5c25b8051b575769335cfab9953e2311ff367f983319020bfd2a16fd13f07177352fe880d48 From ff30eb8fc0ae497e8271b8be1e5b13e121d4a696 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Nov 2019 16:41:56 +0100 Subject: [PATCH 07/28] v7.0.10 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9e3aa0..eae1dfe 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-phpunit-php-code-coverage7-7.0.7-7743bbc.tar.gz /php-phpunit-php-code-coverage7-7.0.8-aa0d179.tar.gz /php-phpunit-php-code-coverage7-7.0.9-075572d.tar.gz +/php-phpunit-php-code-coverage7-7.0.10-f188418.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index a10cc1e..6436d67 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit 075572dd777ea8317196838f8b59b1de2a642abc +%global gh_commit f1884187926fbb755a9aaf0b3836ad3165b478bf #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.9 +Version: 7.0.10 Release: 1%{?dist} Summary: PHP code coverage information @@ -176,6 +176,9 @@ exit $ret %changelog +* Wed Nov 20 2019 Remi Collet - 7.0.10-1 +- update to 7.0.10 + * Wed Nov 20 2019 Remi Collet - 7.0.9-1 - update to 7.0.9 diff --git a/sources b/sources index 9c93222..5e0fda7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.9-075572d.tar.gz) = 6a0e752bc4c9323ade7e1dcf74a547defdf0ad2ccedc366ad796f5c25b8051b575769335cfab9953e2311ff367f983319020bfd2a16fd13f07177352fe880d48 +SHA512 (php-phpunit-php-code-coverage7-7.0.10-f188418.tar.gz) = 3ad2a667ede5cf75eace07a3f9217e33c43885b707e123927afe2470ac1c05010e76eecec4f0fbf5ba00c830ef82d832cb782beb929de5bad324a0374a145c0b From 1c48b6e780672014a709b958d8235f235b83b3fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 08:31:25 +0000 Subject: [PATCH 08/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 6436d67..faf185f 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -176,6 +176,9 @@ exit $ret %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 7.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Nov 20 2019 Remi Collet - 7.0.10-1 - update to 7.0.10 From c391f254024f7a76306acdabf588ac2828cd8bf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:01:56 +0000 Subject: [PATCH 09/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index faf185f..fae9fe5 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -176,6 +176,9 @@ exit $ret %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 7.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 7.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a49e12450278955d2803b44b025828334fad522c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Nov 2020 07:17:57 +0100 Subject: [PATCH 10/28] v7.0.12 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eae1dfe..ed140aa 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /php-phpunit-php-code-coverage7-7.0.8-aa0d179.tar.gz /php-phpunit-php-code-coverage7-7.0.9-075572d.tar.gz /php-phpunit-php-code-coverage7-7.0.10-f188418.tar.gz +/php-phpunit-php-code-coverage7-7.0.12-52f5578.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index fae9fe5..617cb80 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit f1884187926fbb755a9aaf0b3836ad3165b478bf +%global gh_commit 52f55786aa2e52c26cd9e2db20aff2981e0f7399 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,8 +29,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.10 -Release: 3%{?dist} +Version: 7.0.12 +Release: 1%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -56,7 +56,7 @@ BuildRequires: (php-composer(theseer/tokenizer) >= 1.1.3 with # "phpunit/phpunit": "^8.2.2" # 7.2 because of tests BuildRequires: phpunit8 >= 8.2.2 -BuildRequires: php-pecl-xdebug >= 2.6.1 +BuildRequires: php-xdebug >= 2.6.1 %endif # From composer.json, require @@ -146,6 +146,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" fi +export XDEBUG_MODE=coverage cat << 'EOF' | tee tests/bootstrap.php - 7.0.12-1 +- update to 7.0.12 + * Tue Jul 28 2020 Fedora Release Engineering - 7.0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 5e0fda7..503b2ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.10-f188418.tar.gz) = 3ad2a667ede5cf75eace07a3f9217e33c43885b707e123927afe2470ac1c05010e76eecec4f0fbf5ba00c830ef82d832cb782beb929de5bad324a0374a145c0b +SHA512 (php-phpunit-php-code-coverage7-7.0.12-52f5578.tar.gz) = e385b7e8ffc3a394bd76a5d91f33405badd31a6632f0011779ba7002cba30fc4a5929eaf3f7896631c342183167ca97c7487730e1f07099e1d135ca774e9add7 From 68d1791b83f844c18ec4e31ca0350a401101f95e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Nov 2020 10:31:04 +0100 Subject: [PATCH 11/28] update to 7.0.13 (no change) --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ed140aa..b054675 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /php-phpunit-php-code-coverage7-7.0.9-075572d.tar.gz /php-phpunit-php-code-coverage7-7.0.10-f188418.tar.gz /php-phpunit-php-code-coverage7-7.0.12-52f5578.tar.gz +/php-phpunit-php-code-coverage7-7.0.13-ad0dcd7.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 617cb80..4512819 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit 52f55786aa2e52c26cd9e2db20aff2981e0f7399 +%global gh_commit ad0dcd7b184e76f7198a1fe07685bfbec3ae911a #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.12 +Version: 7.0.13 Release: 1%{?dist} Summary: PHP code coverage information @@ -60,7 +60,7 @@ BuildRequires: php-xdebug >= 2.6.1 %endif # From composer.json, require -# "php": "^7.2", +# "php": ">=7.2", # "ext-dom": "*", # "ext-xmlwriter": "*", # "phpunit/php-file-iterator": "^2.0.2", @@ -177,6 +177,9 @@ exit $ret %changelog +* Mon Nov 30 2020 Remi Collet - 7.0.13-1 +- update to 7.0.13 (no change) + * Fri Nov 27 2020 Remi Collet - 7.0.12-1 - update to 7.0.12 diff --git a/sources b/sources index 503b2ca..c6742cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.12-52f5578.tar.gz) = e385b7e8ffc3a394bd76a5d91f33405badd31a6632f0011779ba7002cba30fc4a5929eaf3f7896631c342183167ca97c7487730e1f07099e1d135ca774e9add7 +SHA512 (php-phpunit-php-code-coverage7-7.0.13-ad0dcd7.tar.gz) = 9e2917b6ac85cc24040c61f1ce2096951d1fec21240449781419d4515e418891d9044ab4b10f75474518025498034c289b968f8d2d67a1b983bfaab05839d7c3 From aa153f272162ed8355b9eb323a421b44074c2676 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Dec 2020 15:34:02 +0100 Subject: [PATCH 12/28] update to 7.0.14 (no change) allow phpunit/php-token-stream v4 --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 30 +++++++++++++++++++++-------- sources | 2 +- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b054675..9d12eaa 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /php-phpunit-php-code-coverage7-7.0.10-f188418.tar.gz /php-phpunit-php-code-coverage7-7.0.12-52f5578.tar.gz /php-phpunit-php-code-coverage7-7.0.13-ad0dcd7.tar.gz +/php-phpunit-php-code-coverage7-7.0.14-bb7c9a2.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 4512819..8158ae6 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit ad0dcd7b184e76f7198a1fe07685bfbec3ae911a +%global gh_commit bb7c9a210c72e4709cdde67f8b7362f672f2225c #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,7 +29,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.13 +Version: 7.0.14 Release: 1%{?dist} Summary: PHP code coverage information @@ -46,7 +46,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 4) +BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 5) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -64,7 +64,7 @@ BuildRequires: php-xdebug >= 2.6.1 # "ext-dom": "*", # "ext-xmlwriter": "*", # "phpunit/php-file-iterator": "^2.0.2", -# "phpunit/php-token-stream": "^3.1.0", +# "phpunit/php-token-stream": "^3.1.1 || ^4.0", # "phpunit/php-text-template": "^1.2.1", # "sebastian/code-unit-reverse-lookup": "^1.0.1", # "sebastian/environment": "^4.2.2", @@ -74,7 +74,7 @@ Requires: php(language) >= 7.1 Requires: php-dom Requires: php-xmlwriter Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -Requires: (php-composer(phpunit/php-token-stream) >= 3.1.1 with php-composer(phpunit/php-token-stream) < 4) +Requires: (php-composer(phpunit/php-token-stream) >= 3.1.1 with php-composer(phpunit/php-token-stream) < 5) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -125,7 +125,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}/SebastianBergmann/FileIterator2/autoload.php', - '%{php_home}/%{ns_vendor}/PhpTokenStream3/autoload.php', + [ + '%{php_home}/%{ns_vendor}/PhpTokenStream4/autoload.php', + '%{php_home}/%{ns_vendor}/PhpTokenStream3/autoload.php', + ], '%{php_home}/Text/Template/Autoload.php', '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup/autoload.php', '%{php_home}/%{ns_vendor}/Environment4/autoload.php', @@ -155,13 +158,20 @@ require __DIR__ . '/_files/BankAccountTest.php'; define('TEST_FILES_PATH', __DIR__ . '/_files/'); EOF + ret=0 -for cmd in php php72 php73 php74; do +for cmd in php php72 php73 php74 php80; do if which $cmd; then + if [ $($cmd -r 'echo PHP_VERSION_ID;') -lt 80000 ]; then + # ignore test failing with phpunit/php-token-stream v4 + FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction)).)*$'" + else + FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction|testForBankAccountTest)).)*$'" + fi $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ %{_bindir}/phpunit8 \ - --verbose || ret=1 + --verbose $FILTER || ret=1 fi done exit $ret @@ -177,6 +187,10 @@ exit $ret %changelog +* Wed Dec 2 2020 Remi Collet - 7.0.14-1 +- update to 7.0.14 (no change) +- allow phpunit/php-token-stream v4 + * Mon Nov 30 2020 Remi Collet - 7.0.13-1 - update to 7.0.13 (no change) diff --git a/sources b/sources index c6742cd..6adb041 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.13-ad0dcd7.tar.gz) = 9e2917b6ac85cc24040c61f1ce2096951d1fec21240449781419d4515e418891d9044ab4b10f75474518025498034c289b968f8d2d67a1b983bfaab05839d7c3 +SHA512 (php-phpunit-php-code-coverage7-7.0.14-bb7c9a2.tar.gz) = eacfc1bb8f4951b86ad361e55a4b80e3c9417842995e562cef7c22b015f6aad90f9ec3e36de8bbc8487e73eeeecff797d5bed016ee2eb27a9b163fcf15318f94 From 5a24f710435ac6f42f36edf8138d85feb6972a19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:39:04 +0000 Subject: [PATCH 13/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 8158ae6..4ab614d 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -187,6 +187,9 @@ exit $ret %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 7.0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 2 2020 Remi Collet - 7.0.14-1 - update to 7.0.14 (no change) - allow phpunit/php-token-stream v4 From e3e8d1bfd272f5302ed957e23104f28de6ee706e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:03:58 +0000 Subject: [PATCH 14/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 4ab614d..e4238fd 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -187,6 +187,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 7.0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 7.0.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9f7f654b77a6eeec0f3c1c486f09970fa6f5195f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Jul 2021 15:07:26 +0200 Subject: [PATCH 15/28] update to 7.0.15 (no change) --- .gitignore | 1 + php-phpunit-php-code-coverage7.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9d12eaa..072a161 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /php-phpunit-php-code-coverage7-7.0.12-52f5578.tar.gz /php-phpunit-php-code-coverage7-7.0.13-ad0dcd7.tar.gz /php-phpunit-php-code-coverage7-7.0.14-bb7c9a2.tar.gz +/php-phpunit-php-code-coverage7-7.0.15-819f92b.tar.gz diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index e4238fd..eac210b 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-php-code-coverage7 # -# Copyright (c) 2013-2019 Remi Collet +# Copyright (c) 2013-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit bb7c9a210c72e4709cdde67f8b7362f672f2225c +%global gh_commit 819f92bba8b001d4363065928088de22f25a3a48 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -29,8 +29,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.14 -Release: 3%{?dist} +Version: 7.0.15 +Release: 1%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -64,7 +64,7 @@ BuildRequires: php-xdebug >= 2.6.1 # "ext-dom": "*", # "ext-xmlwriter": "*", # "phpunit/php-file-iterator": "^2.0.2", -# "phpunit/php-token-stream": "^3.1.1 || ^4.0", +# "phpunit/php-token-stream": "^3.1.3 || ^4.0", # "phpunit/php-text-template": "^1.2.1", # "sebastian/code-unit-reverse-lookup": "^1.0.1", # "sebastian/environment": "^4.2.2", @@ -160,7 +160,7 @@ EOF ret=0 -for cmd in php php72 php73 php74 php80; do +for cmd in php php73 php74 php80; do if which $cmd; then if [ $($cmd -r 'echo PHP_VERSION_ID;') -lt 80000 ]; then # ignore test failing with phpunit/php-token-stream v4 @@ -187,6 +187,9 @@ exit $ret %changelog +* Mon Jul 26 2021 Remi Collet - 7.0.15-1 +- update to 7.0.15 (no change) + * Fri Jul 23 2021 Fedora Release Engineering - 7.0.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 6adb041..465e0f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.14-bb7c9a2.tar.gz) = eacfc1bb8f4951b86ad361e55a4b80e3c9417842995e562cef7c22b015f6aad90f9ec3e36de8bbc8487e73eeeecff797d5bed016ee2eb27a9b163fcf15318f94 +SHA512 (php-phpunit-php-code-coverage7-7.0.15-819f92b.tar.gz) = ba8921ddeacb6831baf922c80f62eb3d968036219e491f125737bd12db932b7dd97e88cb2466dce04dfeb14ca2e97af0e60d1de6b128ace13e2a51d4a6ebff1c From 0f1f7dce2f5e7b4f91231ef6517b73ccdb67c963 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:23:19 +0000 Subject: [PATCH 16/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index eac210b..90f9926 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -187,6 +187,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 7.0.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jul 26 2021 Remi Collet - 7.0.15-1 - update to 7.0.15 (no change) From 2382920a3b20a5c47bd0068950c35111331b8001 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:17:07 +0000 Subject: [PATCH 17/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 90f9926..81d2798 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -187,6 +187,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 7.0.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 7.0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From cea33a6ee21d292dcb5f16b5ac7f1759ffc102b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:14:29 +0000 Subject: [PATCH 18/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 81d2798..46a28d5 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -187,6 +187,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 7.0.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 7.0.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 11e70cb944054cf0df55e7a41177d00a158d823f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 20 Apr 2023 15:56:03 +0200 Subject: [PATCH 19/28] use SPDX license ID --- php-phpunit-php-code-coverage7.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 46a28d5..c40f280 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for php-phpunit-php-code-coverage7 # -# Copyright (c) 2013-2021 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -30,14 +30,14 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PHP code coverage information -# Main license is BSD -# BSD: D3 +# SPDX: Main license is BSD-3-Clause +# BSD-3-Clause: D3 # MIT: boostrap, d3, holder, html5shiv, jquery, respond -# ASL 2.0: nvd3 -License: BSD and MIT and ASL 2.0 +# Apache-2.0: nvd3 +License: BSD-3-Clause AND MIT AND Apache-2.0 URL: https://github.com/%{gh_vendor}/%{gh_project} Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz @@ -160,7 +160,7 @@ EOF ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then if [ $($cmd -r 'echo PHP_VERSION_ID;') -lt 80000 ]; then # ignore test failing with phpunit/php-token-stream v4 @@ -187,6 +187,9 @@ exit $ret %changelog +* Thu Apr 20 2023 Remi Collet - 7.0.15-5 +- use SPDX license ID + * Fri Jan 20 2023 Fedora Release Engineering - 7.0.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 456aec117e2bdf700c2cd40e218ffa3a86212601 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:01:29 +0000 Subject: [PATCH 20/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index c40f280..adca67a 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.15 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -187,6 +187,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 7.0.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Apr 20 2023 Remi Collet - 7.0.15-5 - use SPDX license ID From dcecb115b40209e4056717a7ec563bda85eaeb11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:17:59 +0000 Subject: [PATCH 21/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index adca67a..45ba1ad 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.15 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -187,6 +187,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 7.0.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 7.0.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From fb04a39f08a09ef794d2eb6277896e1dbafb2f63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:05:25 +0000 Subject: [PATCH 22/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 45ba1ad..c892a93 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.15 -Release: 7%{?dist} +Release: 8%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -187,6 +187,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 7.0.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 7.0.15-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6b468fb7e5894a94d7cdbbd40a1c1a2d1e5adf56 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Mar 2024 12:09:30 +0100 Subject: [PATCH 23/28] update to 7.0.17 sources from git snapshot --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++++++++++++++++ php-phpunit-php-code-coverage7.spec | 28 ++++++++++++++-------------- sources | 2 +- 4 files changed, 44 insertions(+), 15 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 072a161..029da84 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /php-phpunit-php-code-coverage7-7.0.13-ad0dcd7.tar.gz /php-phpunit-php-code-coverage7-7.0.14-bb7c9a2.tar.gz /php-phpunit-php-code-coverage7-7.0.15-819f92b.tar.gz +/php-phpunit-php-code-coverage7-7.0.17-40a4ed1.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..3d8028d --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + +echo "Cloning..." +rm -rf $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index c892a93..5239aa4 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-php-code-coverage7 # -# 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/ # @@ -9,10 +9,10 @@ %global bootstrap 0 # Github -%global gh_commit 819f92bba8b001d4363065928088de22f25a3a48 +%global gh_commit 40a4ed114a4aea5afd6df8d0f0c9cd3033097f66 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_vendor sebastianbergmann +%global gh_owner sebastianbergmann %global gh_project php-code-coverage # Packagist %global pk_vendor phpunit @@ -29,8 +29,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: 7.0.15 -Release: 8%{?dist} +Version: 7.0.17 +Release: 1%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -38,8 +38,9 @@ Summary: PHP code coverage information # 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} -Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +URL: https://github.com/%{gh_owner}/%{gh_project} +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 @@ -160,14 +161,9 @@ EOF ret=0 -for cmd in php php74 php80 php81 php82; do +for cmd in php php81 php82 php83; do if which $cmd; then - if [ $($cmd -r 'echo PHP_VERSION_ID;') -lt 80000 ]; then - # ignore test failing with phpunit/php-token-stream v4 - FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction)).)*$'" - else - FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction|testForBankAccountTest)).)*$'" - fi + FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction|testForBankAccountTest|testGetLinesToBeIgnored3|testGetLinesToBeIgnoredOneLineAnnotations)).)*$'" $cmd $EXT \ -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \ %{_bindir}/phpunit8 \ @@ -187,6 +183,10 @@ exit $ret %changelog +* Tue Mar 5 2024 Remi Collet - 7.0.17-1 +- update to 7.0.17 +- sources from git snapshot + * Thu Jan 25 2024 Fedora Release Engineering - 7.0.15-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 465e0f9..838409b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-code-coverage7-7.0.15-819f92b.tar.gz) = ba8921ddeacb6831baf922c80f62eb3d968036219e491f125737bd12db932b7dd97e88cb2466dce04dfeb14ca2e97af0e60d1de6b128ace13e2a51d4a6ebff1c +SHA512 (php-phpunit-php-code-coverage7-7.0.17-40a4ed1.tgz) = 6141c867d1d1992d1dc8b16e10db6f91d912e5cf70879d792def6796444a8b47e5815e8bb958156d20c08278c15efd5dd140c60a1ce876d8a7321f196c798f33 From ababe223cfc63947b96f3915a38e242e5c1aa366 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:19:34 +0000 Subject: [PATCH 24/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 5239aa4..df5494f 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -183,6 +183,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 7.0.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Mar 5 2024 Remi Collet - 7.0.17-1 - update to 7.0.17 - sources from git snapshot From 9267cdaa4a11b2e99d4d102adb50521239e58ee8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:33:35 +0000 Subject: [PATCH 25/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index df5494f..21859c5 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -183,6 +183,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 7.0.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 7.0.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 43b4a3e23b14bf090fda41e929e69ac32ccd008b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 May 2025 12:29:37 +0200 Subject: [PATCH 26/28] drop phpunit/php-token-stream v3 --- php-phpunit-php-code-coverage7.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 21859c5..466849f 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -1,8 +1,8 @@ # remirepo/fedora spec file for php-phpunit-php-code-coverage7 # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.17 -Release: 3%{?dist} +Release: 2%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -47,7 +47,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.1.0 with php-composer(phpunit/php-token-stream) < 5) +BuildRequires: (php-composer(phpunit/php-token-stream) >= 4.0 with php-composer(phpunit/php-token-stream) < 5) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -75,7 +75,7 @@ Requires: php(language) >= 7.1 Requires: php-dom Requires: php-xmlwriter Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) -Requires: (php-composer(phpunit/php-token-stream) >= 3.1.1 with php-composer(phpunit/php-token-stream) < 5) +Requires: (php-composer(phpunit/php-token-stream) >= 4.0 with php-composer(phpunit/php-token-stream) < 5) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) @@ -86,10 +86,7 @@ Requires: (php-composer(theseer/tokenizer) >= 1.1.3 with Suggests: php-xdebug Recommends: php-pcov # From phpcompatinfo report for version 5.0.0 -Requires: php-reflection -Requires: php-date Requires: php-json -Requires: php-spl Requires: php-tokenizer # Autoloader Requires: php-composer(fedora/autoloader) @@ -126,10 +123,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/SebastianBergmann/FileIterator2/autoload.php', - [ - '%{php_home}/%{ns_vendor}/PhpTokenStream4/autoload.php', - '%{php_home}/%{ns_vendor}/PhpTokenStream3/autoload.php', - ], + '%{php_home}/%{ns_vendor}/PhpTokenStream4/autoload.php', '%{php_home}/Text/Template/Autoload.php', '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup/autoload.php', '%{php_home}/%{ns_vendor}/Environment4/autoload.php', @@ -161,7 +155,7 @@ EOF ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then FILTER="--filter '^((?!(testCloverForFileWithIgnoredLines|testCloverForClassWithAnonymousFunction|testForFileWithIgnoredLines|testForClassWithAnonymousFunction|testForBankAccountTest|testGetLinesToBeIgnored3|testGetLinesToBeIgnoredOneLineAnnotations)).)*$'" $cmd $EXT \ @@ -183,6 +177,9 @@ exit $ret %changelog +* Thu May 22 2025 Remi Collet - 7.0.17-2 +- drop phpunit/php-token-stream v3 + * Sat Jan 18 2025 Fedora Release Engineering - 7.0.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c7d735b5ea1330e2b954cad22351a4421881145f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 May 2025 12:40:03 +0200 Subject: [PATCH 27/28] bump release --- php-phpunit-php-code-coverage7.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index 466849f..f1a89a3 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.17 -Release: 2%{?dist} +Release: 4%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -177,7 +177,7 @@ exit $ret %changelog -* Thu May 22 2025 Remi Collet - 7.0.17-2 +* Thu May 22 2025 Remi Collet - 7.0.17-4 - drop phpunit/php-token-stream v3 * Sat Jan 18 2025 Fedora Release Engineering - 7.0.17-3 From 1ce519e5e81ca7c9854ce103465e63bad31a1736 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:26:59 +0000 Subject: [PATCH 28/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-phpunit-php-code-coverage7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index f1a89a3..abe0825 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -30,7 +30,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{ver_major} Version: 7.0.17 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PHP code coverage information # SPDX: Main license is BSD-3-Clause @@ -177,6 +177,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 7.0.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 22 2025 Remi Collet - 7.0.17-4 - drop phpunit/php-token-stream v3