From c12c94cc322be6fe1dd5779bc674ce84c64c9814 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 21:58:15 +0000 Subject: [PATCH 01/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index afd0ad9..85a78c7 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -20,7 +20,7 @@ Name: php-phpspec-prophecy Version: 1.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -133,6 +133,9 @@ exit $ret %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 8 2020 Remi Collet - 1.11.1-1 - update to 1.11.1 From afabea3cf821dd67b5710ab20073ebd2a7659e9f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 16:06:38 +0200 Subject: [PATCH 02/29] update to 1.12.0 raise dependency on phpdocumentor/reflection-docblock 5.2 --- .gitignore | 1 + php-phpspec-prophecy.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4634a21..db2b604 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /php-phpspec-prophecy-1.10.3-451c3cd.tgz /php-phpspec-prophecy-1.11.0-8ff0384.tgz /php-phpspec-prophecy-1.11.1-b20034b.tgz +/php-phpspec-prophecy-1.12.0-765cd5d.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 85a78c7..6c69a18 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit b20034be5efcdab4fb60ca3a29cba2949aead160 +%global gh_commit 765cd5d5d237525f8bbadaec5dc161c83a369119 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -19,8 +19,8 @@ %endif Name: php-phpspec-prophecy -Version: 1.11.1 -Release: 2%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -34,13 +34,13 @@ Source1: %{name}-autoload.php BuildArch: noarch BuildRequires: php(language) >= 7.2 %if %{with tests} -BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.0 with php-composer(phpdocumentor/reflection-docblock) < 6) +BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 5) BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) # from composer.json, "require-dev": { # "phpspec/phpspec": "^6.0" -# "phpunit/phpunit": "^8.0" +# "phpunit/phpunit": "^8.0 || ^9.0 <9.3" BuildRequires: php-composer(phpspec/phpspec) >= 6.0 BuildRequires: phpunit8 %endif @@ -48,13 +48,13 @@ BuildRequires: phpunit8 BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^5.3|^7.0", -# "phpdocumentor/reflection-docblock": "^5.0", +# "php": "^7.2 || ~8.0, <8.1", +# "phpdocumentor/reflection-docblock": "^5.2", # "sebastian/comparator": "^3.0|^4.0", # "doctrine/instantiator": "^1.2", # "sebastian/recursion-context": "^3.0|^4.0" Requires: php(language) >= 7.2 -Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.0 with php-composer(phpdocumentor/reflection-docblock) < 6) +Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 5) Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) @@ -133,6 +133,10 @@ exit $ret %changelog +* Mon Sep 28 2020 Remi Collet - 1.12.0-1 +- update to 1.12.0 +- raise dependency on phpdocumentor/reflection-docblock 5.2 + * Tue Jul 28 2020 Fedora Release Engineering - 1.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 6c9e620..4067cd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.11.1-b20034b.tgz) = 934ae0ae780651d31434118601610b6030b40a5d871a950601946fa4610273e9faf3dd955670fe79e7be86f6ab1636fe7ee08c51915455edb4322607cf4f87d9 +SHA512 (php-phpspec-prophecy-1.12.0-765cd5d.tgz) = 659d17ab451d3b4f1448401e271ac6a43996826f737e29611d86db29b0a1e2a1c6f43a35821cf8f982307779543451c34c8cf413f712e28a1c7beafa925c2369 From 982f82b95c73f2869f2f66a72d25c4726c8f2f70 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 16:55:44 +0200 Subject: [PATCH 03/29] switch to classmap autoloader --- php-phpspec-prophecy-autoload.php | 27 --------------------------- php-phpspec-prophecy.spec | 25 ++++++++++++++----------- 2 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 php-phpspec-prophecy-autoload.php diff --git a/php-phpspec-prophecy-autoload.php b/php-phpspec-prophecy-autoload.php deleted file mode 100644 index dfb7e08..0000000 --- a/php-phpspec-prophecy-autoload.php +++ /dev/null @@ -1,27 +0,0 @@ -= 7.2 %if %{with tests} @@ -79,11 +76,16 @@ to be used inside any testing framework out there with minimal effort. %prep %setup -q -n %{gh_project}-%{gh_commit} -cp %{SOURCE1} src/Prophecy/autoload.php - %build -# Nothing +phpab --template fedora --output src/Prophecy/autoload.php src +cat << 'EOF' | tee -a src/Prophecy/autoload.php + +\Fedora\Autoloader\Dependencies::required([ + '%{_datadir}/php/phpDocumentor/Reflection/DocBlock5/autoload.php', +]); +/* Comparator and RecursionContext pulled by phpspec or phpunit */ +EOF %install @@ -110,12 +112,10 @@ phpspec --version ret=0 for cmd in php php72 php73 php74; do if which $cmd; then - $cmd -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ - -d auto_prepend_file=vendor/autoload.php \ + $cmd -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpspec run --format pretty --verbose --no-ansi || ret=1 - $cmd -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ - -d auto_prepend_file=vendor/autoload.php \ + $cmd -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpunit8 || ret=1 fi done @@ -133,6 +133,9 @@ exit $ret %changelog +* Mon Sep 28 2020 Remi Collet - 1.12.0-2 +- switch to classmap autoloader + * Mon Sep 28 2020 Remi Collet - 1.12.0-1 - update to 1.12.0 - raise dependency on phpdocumentor/reflection-docblock 5.2 From ea3ddd8c664d3d8de5d9ffcf590894d9b4ade572 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Sep 2020 14:51:16 +0200 Subject: [PATCH 04/29] v1.12..1 --- .gitignore | 1 + php-phpspec-prophecy.spec | 27 +++++++++++++++++++++++---- sources | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index db2b604..f6ec961 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /php-phpspec-prophecy-1.11.0-8ff0384.tgz /php-phpspec-prophecy-1.11.1-b20034b.tgz /php-phpspec-prophecy-1.12.0-765cd5d.tgz +/php-phpspec-prophecy-1.12.1-8ce8751.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 4f7e2d6..4536ca0 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 765cd5d5d237525f8bbadaec5dc161c83a369119 +%global gh_commit 8ce87516be71aae9b956f81906aaf0338e0d8a2d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -19,8 +19,8 @@ %endif Name: php-phpspec-prophecy -Version: 1.12.0 -Release: 2%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -82,9 +82,25 @@ phpab --template fedora --output src/Prophecy/autoload.php src cat << 'EOF' | tee -a src/Prophecy/autoload.php \Fedora\Autoloader\Dependencies::required([ + '%{_datadir}/php/Doctrine/Instantiator/autoload.php', '%{_datadir}/php/phpDocumentor/Reflection/DocBlock5/autoload.php', ]); -/* Comparator and RecursionContext pulled by phpspec or phpunit */ +if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec + \Fedora\Autoloader\Dependencies::required([ + [ + '%{_datadir}/php/SebastianBergmann/Comparator4/autoload.php', + '%{_datadir}/php/SebastianBergmann/Comparator3/autoload.php', + ], + ]); +} +if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v2 from phpunit, v1 from phpspec + \Fedora\Autoloader\Dependencies::required([ + [ + '%{_datadir}/php/SebastianBergmann/RecursionContext4/autoload.php', + '%{_datadir}/php/SebastianBergmann/RecursionContext3/autoload.php', + ], + ]); +} EOF @@ -133,6 +149,9 @@ exit $ret %changelog +* Tue Sep 29 2020 Remi Collet - 1.12.1-1 +- update to 1.12.1 + * Mon Sep 28 2020 Remi Collet - 1.12.0-2 - switch to classmap autoloader diff --git a/sources b/sources index 4067cd6..5a47117 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.12.0-765cd5d.tgz) = 659d17ab451d3b4f1448401e271ac6a43996826f737e29611d86db29b0a1e2a1c6f43a35821cf8f982307779543451c34c8cf413f712e28a1c7beafa925c2369 +SHA512 (php-phpspec-prophecy-1.12.1-8ce8751.tgz) = 4ea205c1e5780c351b03c8db251968b136755226220d73bfea634ac48023d395f09304e50f8c655597d01b5208af79c32c0c35fbecb71f3b1ed333b7d1b2432d From c039cfffdbb4a33c5203f7d103e5808030330988 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Dec 2020 09:02:18 +0100 Subject: [PATCH 05/29] update to 1.12.2 switch to phpunit9 --- .gitignore | 1 + php-phpspec-prophecy.spec | 28 +++++++++++++++++++--------- sources | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index f6ec961..30d7e9b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /php-phpspec-prophecy-1.11.1-b20034b.tgz /php-phpspec-prophecy-1.12.0-765cd5d.tgz /php-phpspec-prophecy-1.12.1-8ce8751.tgz +/php-phpspec-prophecy-1.12.2-245710e.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 4536ca0..dd46318 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 8ce87516be71aae9b956f81906aaf0338e0d8a2d +%global gh_commit 245710e971a030f42e08f4912863805570f23d39 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -19,7 +19,7 @@ %endif Name: php-phpspec-prophecy -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -37,9 +37,14 @@ BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with p BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) # from composer.json, "require-dev": { # "phpspec/phpspec": "^6.0" -# "phpunit/phpunit": "^8.0 || ^9.0 <9.3" +# "phpunit/phpunit": "^8.0 || ^9.0" BuildRequires: php-composer(phpspec/phpspec) >= 6.0 -BuildRequires: phpunit8 +%if 0%{?fedora} >= 32 || 0%{?rhel} >=9 +%global phpunit %{_bindir}/phpunit9 +%else +%global phpunit %{_bindir}/phpunit8 +%endif +BuildRequires: %{phpunit} %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -126,13 +131,14 @@ php %{buildroot}%{_datadir}/php/Prophecy/autoload.php phpspec --version ret=0 -for cmd in php php72 php73 php74; do - if which $cmd; then - $cmd -d auto_prepend_file=vendor/autoload.php \ +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpspec run --format pretty --verbose --no-ansi || ret=1 - $cmd -d auto_prepend_file=vendor/autoload.php \ - %{_bindir}/phpunit8 || ret=1 + $1 -d auto_prepend_file=vendor/autoload.php \ + ${2:-%{_bindir}/phpunit9}|| ret=1 fi done exit $ret @@ -149,6 +155,10 @@ exit $ret %changelog +* Mon Dec 21 2020 Remi Collet - 1.12.2-1 +- update to 1.12.2 +- switch to phpunit9 + * Tue Sep 29 2020 Remi Collet - 1.12.1-1 - update to 1.12.1 diff --git a/sources b/sources index 5a47117..5e155cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.12.1-8ce8751.tgz) = 4ea205c1e5780c351b03c8db251968b136755226220d73bfea634ac48023d395f09304e50f8c655597d01b5208af79c32c0c35fbecb71f3b1ed333b7d1b2432d +SHA512 (php-phpspec-prophecy-1.12.2-245710e.tgz) = 71638338fdc27ab7f64ef4f0673070ac812ab2b7dedb4c952106f4cb498a5af04785aab0d957636cde95ed6e91df4a0aec8057b994c0db8fc021089bf7868d25 From 1d241f468f538e6d591d0ed16e460bd2dc049340 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:35:29 +0000 Subject: [PATCH 06/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index dd46318..423a16e 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -20,7 +20,7 @@ Name: php-phpspec-prophecy Version: 1.12.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -155,6 +155,9 @@ exit $ret %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 21 2020 Remi Collet - 1.12.2-1 - update to 1.12.2 - switch to phpunit9 From aef4e605487ec16ead802d53602f984e55fe3f1d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Mar 2021 06:55:03 +0100 Subject: [PATCH 07/29] v1.13.0 --- .gitignore | 1 + php-phpspec-prophecy.spec | 18 ++++++++---------- sources | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 30d7e9b..4bf7bcf 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /php-phpspec-prophecy-1.12.0-765cd5d.tgz /php-phpspec-prophecy-1.12.1-8ce8751.tgz /php-phpspec-prophecy-1.12.2-245710e.tgz +/php-phpspec-prophecy-1.13.0-be1996e.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 423a16e..262a21a 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -1,26 +1,21 @@ # remirepo/fedora spec file for php-phpspec-prophecy # -# Copyright (c) 2015-2019 Remi Collet +# Copyright (c) 2015-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global bootstrap 0 -%global gh_commit 245710e971a030f42e08f4912863805570f23d39 +%global gh_commit be1996ed8adc35c3fd795488a653f4b518be70ea %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy -%if %{bootstrap} -# no test because of circular dependency with phpspec -%bcond_with tests -%else + %bcond_without tests -%endif Name: php-phpspec-prophecy -Version: 1.12.2 -Release: 2%{?dist} +Version: 1.13.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -155,6 +150,9 @@ exit $ret %changelog +* Thu Mar 18 2021 Remi Collet - 1.13.0-1 +- update to 1.13.0 + * Wed Jan 27 2021 Fedora Release Engineering - 1.12.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 5e155cb..b1188a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.12.2-245710e.tgz) = 71638338fdc27ab7f64ef4f0673070ac812ab2b7dedb4c952106f4cb498a5af04785aab0d957636cde95ed6e91df4a0aec8057b994c0db8fc021089bf7868d25 +SHA512 (php-phpspec-prophecy-1.13.0-be1996e.tgz) = 12b80dbfe9bdbe54935eb25ad039d698ac1538dd5a6c30a3799df1aa3c761bdfcf2d8e8091a7c88eb8233af403d62e082373b3bbec19951b1432e0305aa5f037 From 5fe7353dbd380a8d25b8ab4df4c991cc5c9e5fc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:00:07 +0000 Subject: [PATCH 08/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 262a21a..9b804be 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -15,7 +15,7 @@ Name: php-phpspec-prophecy Version: 1.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -150,6 +150,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 18 2021 Remi Collet - 1.13.0-1 - update to 1.13.0 From ec87acb4616b32c3a7e9c613560d22dc958e5de1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Sep 2021 13:51:22 +0200 Subject: [PATCH 09/29] v1.14.0 --- .gitignore | 1 + php-phpspec-prophecy.spec | 24 +++++++++++++----------- sources | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 4bf7bcf..cb1089d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /php-phpspec-prophecy-1.12.1-8ce8751.tgz /php-phpspec-prophecy-1.12.2-245710e.tgz /php-phpspec-prophecy-1.13.0-be1996e.tgz +/php-phpspec-prophecy-1.14.0-d86dfc2.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 9b804be..0e5a3ce 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit be1996ed8adc35c3fd795488a653f4b518be70ea +%global gh_commit d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -14,8 +14,8 @@ %bcond_without tests Name: php-phpspec-prophecy -Version: 1.13.0 -Release: 2%{?dist} +Version: 1.14.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -31,21 +31,17 @@ BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with p BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) # from composer.json, "require-dev": { -# "phpspec/phpspec": "^6.0" +# "phpspec/phpspec": "^6.0 | ^7.0" # "phpunit/phpunit": "^8.0 || ^9.0" BuildRequires: php-composer(phpspec/phpspec) >= 6.0 -%if 0%{?fedora} >= 32 || 0%{?rhel} >=9 %global phpunit %{_bindir}/phpunit9 -%else -%global phpunit %{_bindir}/phpunit8 -%endif BuildRequires: %{phpunit} %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^7.2 || ~8.0, <8.1", +# "php": "^7.2 || ~8.0, <8.2", # "phpdocumentor/reflection-docblock": "^5.2", # "sebastian/comparator": "^3.0|^4.0", # "doctrine/instantiator": "^1.2", @@ -126,14 +122,17 @@ php %{buildroot}%{_datadir}/php/Prophecy/autoload.php phpspec --version ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +# ignore it_can_not_double_an_enum on all version. Not ready +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpspec run --format pretty --verbose --no-ansi || ret=1 $1 -d auto_prepend_file=vendor/autoload.php \ - ${2:-%{_bindir}/phpunit9}|| ret=1 + ${2:-%{_bindir}/phpunit9} \ + --filter '^((?!(it_can_not_double_an_enum)).)*$' \ + || ret=1 fi done exit $ret @@ -150,6 +149,9 @@ exit $ret %changelog +* Fri Sep 10 2021 Remi Collet - 1.14.0-1 +- update to 1.14.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index b1188a8..27712e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.13.0-be1996e.tgz) = 12b80dbfe9bdbe54935eb25ad039d698ac1538dd5a6c30a3799df1aa3c761bdfcf2d8e8091a7c88eb8233af403d62e082373b3bbec19951b1432e0305aa5f037 +SHA512 (php-phpspec-prophecy-1.14.0-d86dfc2.tgz) = 6fe5be017f47f445d9e0512da6daddc24b4e701736609ec0b7c91cb4851859c0787d48371a99beb3c16b738756ac31ff9c6663f9b3ee55bfd7c5754993a1a199 From d0ad52111e23152d7b72982c1faeb0162859283a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Dec 2021 14:07:33 +0100 Subject: [PATCH 10/29] v1.15.0 --- .gitignore | 1 + php-phpspec-prophecy.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cb1089d..fce8034 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ clog /php-phpspec-prophecy-1.12.2-245710e.tgz /php-phpspec-prophecy-1.13.0-be1996e.tgz /php-phpspec-prophecy-1.14.0-d86dfc2.tgz +/php-phpspec-prophecy-1.15.0-bbcd738.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 0e5a3ce..4048e93 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e +%global gh_commit bbcd7380b0ebf3961ee21409db7b38bc31d69a13 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -14,7 +14,7 @@ %bcond_without tests Name: php-phpspec-prophecy -Version: 1.14.0 +Version: 1.15.0 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -123,7 +123,7 @@ phpspec --version ret=0 # ignore it_can_not_double_an_enum on all version. Not ready -for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=vendor/autoload.php \ @@ -149,6 +149,9 @@ exit $ret %changelog +* Wed Dec 8 2021 Remi Collet - 1.15.0-1 +- update to 1.15.0 + * Fri Sep 10 2021 Remi Collet - 1.14.0-1 - update to 1.14.0 diff --git a/sources b/sources index 27712e7..1b09358 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.14.0-d86dfc2.tgz) = 6fe5be017f47f445d9e0512da6daddc24b4e701736609ec0b7c91cb4851859c0787d48371a99beb3c16b738756ac31ff9c6663f9b3ee55bfd7c5754993a1a199 +SHA512 (php-phpspec-prophecy-1.15.0-bbcd738.tgz) = 64e3b6fbba82bc4fe3058320e3967fecd94e1a4bb088ba83f5cf68850ff8b8cee069fdc72281ed79a3d95486404250a3fcfb8c1a0843b621de7a22383c6ac5f3 From 90fc564af5c1144ac86684d77e06bf4e77512a1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:19:51 +0000 Subject: [PATCH 11/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 4048e93..40720c0 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -15,7 +15,7 @@ Name: php-phpspec-prophecy Version: 1.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -149,6 +149,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Dec 8 2021 Remi Collet - 1.15.0-1 - update to 1.15.0 From 23ffb174599b29b7ef9a98372999988b63e46d88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:13:36 +0000 Subject: [PATCH 12/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 40720c0..0691782 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -15,7 +15,7 @@ Name: php-phpspec-prophecy Version: 1.15.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -149,6 +149,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.15.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9b8592c01f7f5ac743dbca6d925aa29b44b08acc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Dec 2022 11:29:11 +0100 Subject: [PATCH 13/29] v1.16.0 --- .gitignore | 1 + php-phpspec-prophecy.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fce8034..2d2ec82 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ clog /php-phpspec-prophecy-1.13.0-be1996e.tgz /php-phpspec-prophecy-1.14.0-d86dfc2.tgz /php-phpspec-prophecy-1.15.0-bbcd738.tgz +/php-phpspec-prophecy-1.16.0-be8cac5.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 0691782..0717858 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-phpspec-prophecy # -# Copyright (c) 2015-2021 Remi Collet +# Copyright (c) 2015-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit bbcd7380b0ebf3961ee21409db7b38bc31d69a13 +%global gh_commit be8cac52a0827776ff9ccda8c381ac5b71aeb359 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -14,8 +14,8 @@ %bcond_without tests Name: php-phpspec-prophecy -Version: 1.15.0 -Release: 3%{?dist} +Version: 1.16.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -41,7 +41,7 @@ BuildRequires: %{phpunit} BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^7.2 || ~8.0, <8.2", +# "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", # "phpdocumentor/reflection-docblock": "^5.2", # "sebastian/comparator": "^3.0|^4.0", # "doctrine/instantiator": "^1.2", @@ -123,7 +123,7 @@ phpspec --version ret=0 # ignore it_can_not_double_an_enum on all version. Not ready -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=vendor/autoload.php \ @@ -149,6 +149,9 @@ exit $ret %changelog +* Thu Dec 1 2022 Remi Collet - 1.16.0-1 +- update to 1.16.0 + * Fri Jul 22 2022 Fedora Release Engineering - 1.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 1b09358..966f96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.15.0-bbcd738.tgz) = 64e3b6fbba82bc4fe3058320e3967fecd94e1a4bb088ba83f5cf68850ff8b8cee069fdc72281ed79a3d95486404250a3fcfb8c1a0843b621de7a22383c6ac5f3 +SHA512 (php-phpspec-prophecy-1.16.0-be8cac5.tgz) = fe41c3b1b7bcefe7bc7073977a022a8939dfedf4daf70a100f77abd4629f2dbc4bde93e39d160e4b68313e4e162f70a77b8cde66c2efac42ae024eb71e0242ee From 2299ee8fd6b2f52129eb8c76db515728da7db984 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:11:03 +0000 Subject: [PATCH 14/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 0717858..193cd48 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -15,7 +15,7 @@ Name: php-phpspec-prophecy Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -149,6 +149,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.16.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 1 2022 Remi Collet - 1.16.0-1 - update to 1.16.0 From 271eaeee09d8ae06d9556dfcecf9217e91266175 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 08:56:21 +0100 Subject: [PATCH 15/29] update to 1.17.0 allow doctrine/instantiator v2 --- .gitignore | 1 + php-phpspec-prophecy.spec | 28 ++++++++++++++++++---------- sources | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 2d2ec82..22eba95 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ clog /php-phpspec-prophecy-1.14.0-d86dfc2.tgz /php-phpspec-prophecy-1.15.0-bbcd738.tgz /php-phpspec-prophecy-1.16.0-be8cac5.tgz +/php-phpspec-prophecy-1.17.0-15873c6.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 193cd48..7f9479e 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-phpspec-prophecy # -# Copyright (c) 2015-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2015-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit be8cac52a0827776ff9ccda8c381ac5b71aeb359 +%global gh_commit 15873c65b207b07765dbc3c95d20fdf4a320cbe2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -14,8 +14,8 @@ %bcond_without tests Name: php-phpspec-prophecy -Version: 1.16.0 -Release: 2%{?dist} +Version: 1.17.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -29,9 +29,10 @@ BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 5) BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) -BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) +BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # from composer.json, "require-dev": { # "phpspec/phpspec": "^6.0 | ^7.0" +# "phpstan/phpstan": "^1.9", # "phpunit/phpunit": "^8.0 || ^9.0" BuildRequires: php-composer(phpspec/phpspec) >= 6.0 %global phpunit %{_bindir}/phpunit9 @@ -44,13 +45,13 @@ BuildRequires: php-fedora-autoloader-devel # "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", # "phpdocumentor/reflection-docblock": "^5.2", # "sebastian/comparator": "^3.0|^4.0", -# "doctrine/instantiator": "^1.2", +# "doctrine/instantiator": "^1.2 || ^2.0", # "sebastian/recursion-context": "^3.0|^4.0" Requires: php(language) >= 7.2 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 5) Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) -Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) +Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # From phpcompatinfo report for version 1.11.0 Requires: php-pcre Requires: php-reflection @@ -78,7 +79,10 @@ phpab --template fedora --output src/Prophecy/autoload.php src cat << 'EOF' | tee -a src/Prophecy/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/Doctrine/Instantiator/autoload.php', + [ + '%{_datadir}/php/Doctrine/Instantiator2/autoload.php', + '%{_datadir}/php/Doctrine/Instantiator/autoload.php', + ], '%{_datadir}/php/phpDocumentor/Reflection/DocBlock5/autoload.php', ]); if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec @@ -109,7 +113,7 @@ cp -pr src/* %{buildroot}%{_datadir}/php %if %{with tests} : Dev autoloader mkdir vendor -phpab --output vendor/autoload.php fixtures +phpab --output vendor/autoload.php fixtures tests cat << 'EOF' | tee -a vendor/autoload.php require_once '%{buildroot}%{_datadir}/php/Prophecy/autoload.php'; @@ -149,6 +153,10 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 1.17.0-1 +- update to 1.17.0 +- allow doctrine/instantiator v2 + * Fri Jan 20 2023 Fedora Release Engineering - 1.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 966f96b..bc7904a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.16.0-be8cac5.tgz) = fe41c3b1b7bcefe7bc7073977a022a8939dfedf4daf70a100f77abd4629f2dbc4bde93e39d160e4b68313e4e162f70a77b8cde66c2efac42ae024eb71e0242ee +SHA512 (php-phpspec-prophecy-1.17.0-15873c6.tgz) = f8bc73952b0eeb46533e7080d6fd232e636c053bb0efc5884f106b53b4e437b7e9eabfebc6612b558b43dfcb008e2994b3408cf5c59f3e3dce04494cb69d3157 From a641dc6331bf87a2a96e64efb96dc460c0a37aea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 10:18:33 +0100 Subject: [PATCH 16/29] fix autoloader --- php-phpspec-prophecy.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 7f9479e..ea520e8 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -15,7 +15,7 @@ Name: php-phpspec-prophecy Version: 1.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -78,11 +78,16 @@ to be used inside any testing framework out there with minimal effort. phpab --template fedora --output src/Prophecy/autoload.php src cat << 'EOF' | tee -a src/Prophecy/autoload.php -\Fedora\Autoloader\Dependencies::required([ - [ +if (PHP_VERSION_ID > 80100) { + $inst = [ '%{_datadir}/php/Doctrine/Instantiator2/autoload.php', '%{_datadir}/php/Doctrine/Instantiator/autoload.php', - ], + ]; +} else { + $inst = '%{_datadir}/php/Doctrine/Instantiator/autoload.php'; +} +\Fedora\Autoloader\Dependencies::required([ + $inst, '%{_datadir}/php/phpDocumentor/Reflection/DocBlock5/autoload.php', ]); if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec @@ -153,6 +158,9 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 1.17.0-2 +- fix autoloader + * Fri Feb 3 2023 Remi Collet - 1.17.0-1 - update to 1.17.0 - allow doctrine/instantiator v2 From 6910895e6098d813b6c61edae62f67547b03fe7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:57:27 +0000 Subject: [PATCH 17/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index ea520e8..d07a6e8 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -15,7 +15,7 @@ Name: php-phpspec-prophecy Version: 1.17.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -158,6 +158,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Feb 3 2023 Remi Collet - 1.17.0-2 - fix autoloader From 1ba1a3b24ef0bbe5b4d1ac2ec523cbc5903ea898 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Sep 2023 16:33:17 +0200 Subject: [PATCH 18/29] disable phpspec tests --- php-phpspec-prophecy.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index d07a6e8..f9fd021 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -12,10 +12,11 @@ %global gh_project prophecy %bcond_without tests +%bcond_with phpspec Name: php-phpspec-prophecy Version: 1.17.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -34,7 +35,9 @@ BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with p # "phpspec/phpspec": "^6.0 | ^7.0" # "phpstan/phpstan": "^1.9", # "phpunit/phpunit": "^8.0 || ^9.0" +%if %{with phpspec} BuildRequires: php-composer(phpspec/phpspec) >= 6.0 +%endif %global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} %endif @@ -127,17 +130,20 @@ EOF : check autoloader php %{buildroot}%{_datadir}/php/Prophecy/autoload.php +%if %{with phpspec} : check phpspec phpspec --version +%endif ret=0 # ignore it_can_not_double_an_enum on all version. Not ready for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg +%if %{with phpspec} $1 -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpspec run --format pretty --verbose --no-ansi || ret=1 - +%endif $1 -d auto_prepend_file=vendor/autoload.php \ ${2:-%{_bindir}/phpunit9} \ --filter '^((?!(it_can_not_double_an_enum)).)*$' \ @@ -158,6 +164,9 @@ exit $ret %changelog +* Wed Sep 27 2023 Remi Collet - 1.17.0-4 +- disable phpspec tests + * Fri Jul 21 2023 Fedora Release Engineering - 1.17.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 2f6298279ad5ec8760705786eaaaa93eb5ba0c93 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 8 Dec 2023 08:14:24 +0100 Subject: [PATCH 19/29] update to 1.18.0 run test suite with phpunit8, phpunit9 and phpunit10 --- php-phpspec-prophecy.spec | 53 +++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index f9fd021..6b55cbc 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 15873c65b207b07765dbc3c95d20fdf4a320cbe2 +%global gh_commit d4f454f7e1193933f04e6500de3e79191648ed0c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -15,8 +15,8 @@ %bcond_with phpspec Name: php-phpspec-prophecy -Version: 1.17.0 -Release: 4%{?dist} +Version: 1.18.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -28,32 +28,33 @@ BuildArch: noarch BuildRequires: php(language) >= 7.2 %if %{with tests} BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 5) -BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) +BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 6) +BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 6) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # from composer.json, "require-dev": { -# "phpspec/phpspec": "^6.0 | ^7.0" +# "phpspec/phpspec": "^6.0 || ^7.0" # "phpstan/phpstan": "^1.9", -# "phpunit/phpunit": "^8.0 || ^9.0" +# "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" %if %{with phpspec} BuildRequires: php-composer(phpspec/phpspec) >= 6.0 %endif -%global phpunit %{_bindir}/phpunit9 -BuildRequires: %{phpunit} +BuildRequires: phpunit8 +BuildRequires: phpunit9 +BuildRequires: phpunit10 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", +# "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", # "phpdocumentor/reflection-docblock": "^5.2", -# "sebastian/comparator": "^3.0|^4.0", +# "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", # "doctrine/instantiator": "^1.2 || ^2.0", -# "sebastian/recursion-context": "^3.0|^4.0" +# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" Requires: php(language) >= 7.2 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 5) -Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) +Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 6) +Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 6) Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # From phpcompatinfo report for version 1.11.0 Requires: php-pcre @@ -96,6 +97,7 @@ if (PHP_VERSION_ID > 80100) { if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec \Fedora\Autoloader\Dependencies::required([ [ + '%{_datadir}/php/SebastianBergmann/Comparator5/autoload.php', '%{_datadir}/php/SebastianBergmann/Comparator4/autoload.php', '%{_datadir}/php/SebastianBergmann/Comparator3/autoload.php', ], @@ -104,6 +106,7 @@ if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from php if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v2 from phpunit, v1 from phpspec \Fedora\Autoloader\Dependencies::required([ [ + '%{_datadir}/php/SebastianBergmann/RecursionContext5/autoload.php', '%{_datadir}/php/SebastianBergmann/RecursionContext4/autoload.php', '%{_datadir}/php/SebastianBergmann/RecursionContext3/autoload.php', ], @@ -137,16 +140,20 @@ phpspec --version ret=0 # ignore it_can_not_double_an_enum on all version. Not ready -for cmdarg in "php %{phpunit}" php80 php81 php82; do - if which $cmdarg; then - set $cmdarg +for cmd in php php81 php82 php83; do + if which $cmd; then %if %{with phpspec} - $1 -d auto_prepend_file=vendor/autoload.php \ + $cmd -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpspec run --format pretty --verbose --no-ansi || ret=1 %endif - $1 -d auto_prepend_file=vendor/autoload.php \ - ${2:-%{_bindir}/phpunit9} \ - --filter '^((?!(it_can_not_double_an_enum)).)*$' \ + $cmd -d auto_prepend_file=vendor/autoload.php \ + %{_bindir}/phpunit8 \ + || ret=1 + $cmd -d auto_prepend_file=vendor/autoload.php \ + %{_bindir}/phpunit9 \ + || ret=1 + $cmd -d auto_prepend_file=vendor/autoload.php \ + %{_bindir}/phpunit10 \ || ret=1 fi done @@ -164,6 +171,10 @@ exit $ret %changelog +* Fri Dec 8 2023 Remi Collet - 1.18.0-1 +- update to 1.18.0 +- run test suite with phpunit8, phpunit9 and phpunit10 + * Wed Sep 27 2023 Remi Collet - 1.17.0-4 - disable phpspec tests From 674ec8535760c7e9219fa87be3968430ae44cb0d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 8 Dec 2023 08:20:16 +0100 Subject: [PATCH 20/29] 1.18.0 sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 22eba95..468a35c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ clog /php-phpspec-prophecy-1.15.0-bbcd738.tgz /php-phpspec-prophecy-1.16.0-be8cac5.tgz /php-phpspec-prophecy-1.17.0-15873c6.tgz +/php-phpspec-prophecy-1.18.0-d4f454f.tgz diff --git a/sources b/sources index bc7904a..c9bb8ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.17.0-15873c6.tgz) = f8bc73952b0eeb46533e7080d6fd232e636c053bb0efc5884f106b53b4e437b7e9eabfebc6612b558b43dfcb008e2994b3408cf5c59f3e3dce04494cb69d3157 +SHA512 (php-phpspec-prophecy-1.18.0-d4f454f.tgz) = 17445b49b7c3177d367d4ccfdddcf66b888d203e08b46eeeadf84d8cd5c3eb5aa4a845575e3670b72cdc951e16614bddb539f12f799113f1b8f3a14c256a8b90 From a7682f16222124b53699401f0b61635d59a03559 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:16:56 +0000 Subject: [PATCH 21/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 6b55cbc..73badcd 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -16,7 +16,7 @@ Name: php-phpspec-prophecy Version: 1.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -171,6 +171,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 8 2023 Remi Collet - 1.18.0-1 - update to 1.18.0 - run test suite with phpunit8, phpunit9 and phpunit10 From 93726928463f26f6ba16cad0abb17f9681585b71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:04:16 +0000 Subject: [PATCH 22/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 73badcd..b45977f 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -16,7 +16,7 @@ Name: php-phpspec-prophecy Version: 1.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -171,6 +171,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.18.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ddfae1a5a8e24b367a75e8d43423a99993ec205b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Feb 2024 15:21:31 +0100 Subject: [PATCH 23/29] v1.19.0 --- .gitignore | 1 + php-phpspec-prophecy.spec | 63 ++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 468a35c..d7a8140 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /php-phpspec-prophecy-1.16.0-be8cac5.tgz /php-phpspec-prophecy-1.17.0-15873c6.tgz /php-phpspec-prophecy-1.18.0-d4f454f.tgz +/php-phpspec-prophecy-1.19.0-67a759e.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index b45977f..aed2548 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit d4f454f7e1193933f04e6500de3e79191648ed0c +%global gh_commit 67a759e7d8746d501c41536ba40cd9c0a07d6a87 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -15,8 +15,8 @@ %bcond_with phpspec Name: php-phpspec-prophecy -Version: 1.18.0 -Release: 3%{?dist} +Version: 1.19.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -28,8 +28,8 @@ BuildArch: noarch BuildRequires: php(language) >= 7.2 %if %{with tests} BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 6) -BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 6) +BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 7) +BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 7) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # from composer.json, "require-dev": { # "phpspec/phpspec": "^6.0 || ^7.0" @@ -48,13 +48,13 @@ BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { # "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", # "phpdocumentor/reflection-docblock": "^5.2", -# "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", +# "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", # "doctrine/instantiator": "^1.2 || ^2.0", -# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" +# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" Requires: php(language) >= 7.2 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 6) -Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 6) +Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 7) +Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 7) Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # From phpcompatinfo report for version 1.11.0 Requires: php-pcre @@ -82,35 +82,39 @@ to be used inside any testing framework out there with minimal effort. phpab --template fedora --output src/Prophecy/autoload.php src cat << 'EOF' | tee -a src/Prophecy/autoload.php +$inst = ['%{_datadir}/php/Doctrine/Instantiator/autoload.php']; if (PHP_VERSION_ID > 80100) { - $inst = [ - '%{_datadir}/php/Doctrine/Instantiator2/autoload.php', - '%{_datadir}/php/Doctrine/Instantiator/autoload.php', - ]; -} else { - $inst = '%{_datadir}/php/Doctrine/Instantiator/autoload.php'; + array_unshift($inst, '%{_datadir}/php/Doctrine/Instantiator2/autoload.php'); } \Fedora\Autoloader\Dependencies::required([ $inst, '%{_datadir}/php/phpDocumentor/Reflection/DocBlock5/autoload.php', ]); if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec - \Fedora\Autoloader\Dependencies::required([ - [ - '%{_datadir}/php/SebastianBergmann/Comparator5/autoload.php', - '%{_datadir}/php/SebastianBergmann/Comparator4/autoload.php', - '%{_datadir}/php/SebastianBergmann/Comparator3/autoload.php', - ], - ]); + $inst = [ + '%{_datadir}/php/SebastianBergmann/Comparator4/autoload.php', + '%{_datadir}/php/SebastianBergmann/Comparator3/autoload.php', + ]; + if (PHP_VERSION_ID > 80100) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator5/autoload.php'); + } + if (PHP_VERSION_ID > 80200) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator6/autoload.php'); + } + \Fedora\Autoloader\Dependencies::required([$inst]); } if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v2 from phpunit, v1 from phpspec - \Fedora\Autoloader\Dependencies::required([ - [ - '%{_datadir}/php/SebastianBergmann/RecursionContext5/autoload.php', + $inst = [ '%{_datadir}/php/SebastianBergmann/RecursionContext4/autoload.php', '%{_datadir}/php/SebastianBergmann/RecursionContext3/autoload.php', - ], - ]); + ]; + if (PHP_VERSION_ID > 80100) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext5/autoload.php'); + } + if (PHP_VERSION_ID > 80200) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext6/autoload.php'); + } + \Fedora\Autoloader\Dependencies::required([$inst]); } EOF @@ -171,6 +175,11 @@ exit $ret %changelog +* Thu Feb 29 2024 Remi Collet - 1.19.0-1 +- update to 1.19.0 +- allow doctrine/instantiator 6 +- allow sebastian/recursion-context 6 + * Thu Jan 25 2024 Fedora Release Engineering - 1.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index c9bb8ae..1e400d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.18.0-d4f454f.tgz) = 17445b49b7c3177d367d4ccfdddcf66b888d203e08b46eeeadf84d8cd5c3eb5aa4a845575e3670b72cdc951e16614bddb539f12f799113f1b8f3a14c256a8b90 +SHA512 (php-phpspec-prophecy-1.19.0-67a759e.tgz) = 4eccf41d3135c2be26223dea0ae72921fc5a2af01941cad9617579fa93d320f702b40c9f116080dd9ce7c7b9f696e2e823e9fa6e36d9249d359a1a41bb81e38f From 93cf3baba8be37c123d634911470cbb85c47215e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:18:22 +0000 Subject: [PATCH 24/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index aed2548..22a59f2 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -16,7 +16,7 @@ Name: php-phpspec-prophecy Version: 1.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -175,6 +175,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Feb 29 2024 Remi Collet - 1.19.0-1 - update to 1.19.0 - allow doctrine/instantiator 6 From 3c40a08813fef66266bd73d3dfb13701072d5164 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Nov 2024 07:52:46 +0100 Subject: [PATCH 25/29] v1.20.0 --- .gitignore | 1 + php-phpspec-prophecy.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d7a8140..e1ca525 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ clog /php-phpspec-prophecy-1.17.0-15873c6.tgz /php-phpspec-prophecy-1.18.0-d4f454f.tgz /php-phpspec-prophecy-1.19.0-67a759e.tgz +/php-phpspec-prophecy-1.20.0-a0165c6.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 22a59f2..f9f7c5c 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-phpspec-prophecy # -# Copyright (c) 2015-2023 Remi Collet +# Copyright (c) 2015-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 67a759e7d8746d501c41536ba40cd9c0a07d6a87 +%global gh_commit a0165c648cab6a80311c74ffc708a07bb53ecc93 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -15,8 +15,8 @@ %bcond_with phpspec Name: php-phpspec-prophecy -Version: 1.19.0 -Release: 2%{?dist} +Version: 1.20.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -32,6 +32,7 @@ BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with p BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 7) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # from composer.json, "require-dev": { +# "friendsofphp/php-cs-fixer": "^3.40", # "phpspec/phpspec": "^6.0 || ^7.0" # "phpstan/phpstan": "^1.9", # "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -46,7 +47,7 @@ BuildRequires: phpunit10 BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", +# "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", # "phpdocumentor/reflection-docblock": "^5.2", # "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", # "doctrine/instantiator": "^1.2 || ^2.0", @@ -144,7 +145,7 @@ phpspec --version ret=0 # ignore it_can_not_double_an_enum on all version. Not ready -for cmd in php php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then %if %{with phpspec} $cmd -d auto_prepend_file=vendor/autoload.php \ @@ -175,6 +176,9 @@ exit $ret %changelog +* Thu Nov 21 2024 Remi Collet - 1.20.0-1 +- update to 1.20.0 + * Fri Jul 19 2024 Fedora Release Engineering - 1.19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 1e400d8..6124729 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.19.0-67a759e.tgz) = 4eccf41d3135c2be26223dea0ae72921fc5a2af01941cad9617579fa93d320f702b40c9f116080dd9ce7c7b9f696e2e823e9fa6e36d9249d359a1a41bb81e38f +SHA512 (php-phpspec-prophecy-1.20.0-a0165c6.tgz) = 24d33496fd2df4eb12700a9ece30158ececf8a3396e1df8a83bb767e38c65f66892b7997e7dd7700284925b3b88d1a6d2af3edb80b8bbdab8fd48351d87db89a From df1895cef53e0e66d35bd5c2b25dbb99324e0687 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:32:04 +0000 Subject: [PATCH 26/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index f9f7c5c..cdbd48f 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -16,7 +16,7 @@ Name: php-phpspec-prophecy Version: 1.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -176,6 +176,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.20.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Nov 21 2024 Remi Collet - 1.20.0-1 - update to 1.20.0 From 4e02ea1a8dfae2b8bcea0aefac34212a31c21476 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Apr 2025 07:36:54 +0200 Subject: [PATCH 27/29] update to 1.22.0 re-license spec file to CECILL-2.1 --- .gitignore | 1 + php-phpspec-prophecy.spec | 59 ++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index e1ca525..4083ba2 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ clog /php-phpspec-prophecy-1.18.0-d4f454f.tgz /php-phpspec-prophecy-1.19.0-67a759e.tgz /php-phpspec-prophecy-1.20.0-a0165c6.tgz +/php-phpspec-prophecy-1.22.0-35f1adb.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index cdbd48f..d875f13 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-phpspec-prophecy # -# Copyright (c) 2015-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2015-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit a0165c648cab6a80311c74ffc708a07bb53ecc93 +%global gh_commit 35f1adb388946d92e6edab2aa2cb2b60e132ebd5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -15,8 +15,8 @@ %bcond_with phpspec Name: php-phpspec-prophecy -Version: 1.20.0 -Release: 2%{?dist} +Version: 1.22.0 +Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -25,16 +25,16 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source2: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.4 %if %{with tests} BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 7) -BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 7) +BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 8) +BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 8) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # from composer.json, "require-dev": { # "friendsofphp/php-cs-fixer": "^3.40", # "phpspec/phpspec": "^6.0 || ^7.0" -# "phpstan/phpstan": "^1.9", +# "phpstan/phpstan": "^2.1.13", # "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" %if %{with phpspec} BuildRequires: php-composer(phpspec/phpspec) >= 6.0 @@ -42,20 +42,22 @@ BuildRequires: php-composer(phpspec/phpspec) >= 6.0 BuildRequires: phpunit8 BuildRequires: phpunit9 BuildRequires: phpunit10 +BuildRequires: phpunit11 +BuildRequires: phpunit12 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", +# "php": "^7.4 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", # "phpdocumentor/reflection-docblock": "^5.2", -# "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", +# "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", # "doctrine/instantiator": "^1.2 || ^2.0", -# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" -Requires: php(language) >= 7.2 +# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" +Requires: php(language) >= 7.4 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 7) -Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 7) +Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 8) +Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 8) Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # From phpcompatinfo report for version 1.11.0 Requires: php-pcre @@ -102,6 +104,9 @@ if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from php if (PHP_VERSION_ID > 80200) { array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator6/autoload.php'); } + if (PHP_VERSION_ID > 80300) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator7/autoload.php'); + } \Fedora\Autoloader\Dependencies::required([$inst]); } if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v2 from phpunit, v1 from phpspec @@ -115,6 +120,9 @@ if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v2 from if (PHP_VERSION_ID > 80200) { array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext6/autoload.php'); } + if (PHP_VERSION_ID > 80300) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext7/autoload.php'); + } \Fedora\Autoloader\Dependencies::required([$inst]); } EOF @@ -162,6 +170,21 @@ for cmd in php php81 php82 php83 php84; do || ret=1 fi done +for cmd in php php82 php83 php84; do + if which $cmd; then + $cmd -d auto_prepend_file=vendor/autoload.php \ + %{_bindir}/phpunit11 \ + || ret=1 + fi +done +# Not ready see https://github.com/phpspec/prophecy/issues/640 +for cmd in php php83 php84; do + if which $cmd; then + $cmd -d auto_prepend_file=vendor/autoload.php \ + %{_bindir}/phpunit12 \ + || ignore=1 + fi +done exit $ret %else : Test suite disabled @@ -176,6 +199,10 @@ exit $ret %changelog +* Wed Apr 30 2025 Remi Collet - 1.22.0-1 +- update to 1.22.0 +- re-license spec file to CECILL-2.1 + * Sat Jan 18 2025 Fedora Release Engineering - 1.20.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6124729..77767c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.20.0-a0165c6.tgz) = 24d33496fd2df4eb12700a9ece30158ececf8a3396e1df8a83bb767e38c65f66892b7997e7dd7700284925b3b88d1a6d2af3edb80b8bbdab8fd48351d87db89a +SHA512 (php-phpspec-prophecy-1.22.0-35f1adb.tgz) = abb30711891203c294676e73919231d77bb7c83822e936adeaa26abd8fe9a4374b32cb0c3a9d9c334c5db5e21be7e0e8e14e67f920104289847380799f5a8a22 From 1df7abefca2b153a38f36dd8eaa76388302fa713 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:26:08 +0000 Subject: [PATCH 28/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-phpspec-prophecy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index d875f13..1bd47eb 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -16,7 +16,7 @@ Name: php-phpspec-prophecy Version: 1.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP License: MIT @@ -199,6 +199,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.22.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Apr 30 2025 Remi Collet - 1.22.0-1 - update to 1.22.0 - re-license spec file to CECILL-2.1 From d43b6eef38425b35c8048406fe269a60c7804629 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jan 2026 09:46:09 +0100 Subject: [PATCH 29/29] update to 1.24.0 use doctrine/instantiator v2 only with PHP 8.4+ raise dependency on PHP 8.2 --- .gitignore | 1 + php-phpspec-prophecy.spec | 93 +++++++++++++++++---------------------- sources | 2 +- 3 files changed, 42 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 4083ba2..1255b50 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /php-phpspec-prophecy-1.19.0-67a759e.tgz /php-phpspec-prophecy-1.20.0-a0165c6.tgz /php-phpspec-prophecy-1.22.0-35f1adb.tgz +/php-phpspec-prophecy-1.24.0-a24f1bd.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 1bd47eb..7d1bcb3 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-phpspec-prophecy # -# SPDX-FileCopyrightText: Copyright 2015-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2015-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit 35f1adb388946d92e6edab2aa2cb2b60e132ebd5 +%global gh_commit a24f1bda2d00a03877f7f99d9e6b150baf543f6d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -15,7 +15,7 @@ %bcond_with phpspec Name: php-phpspec-prophecy -Version: 1.22.0 +Version: 1.24.0 Release: 2%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -25,23 +25,20 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source2: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.4 +BuildRequires: php(language) >= 8.2 %if %{with tests} BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 8) BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 8) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # from composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "^3.40", -# "phpspec/phpspec": "^6.0 || ^7.0" +# "friendsofphp/php-cs-fixer": "^3.88", +# "phpspec/phpspec": "^6.0 || ^7.0 || ^8.0", # "phpstan/phpstan": "^2.1.13", -# "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" +# "phpunit/phpunit": "^11.0 || ^12.0" %if %{with phpspec} BuildRequires: php-composer(phpspec/phpspec) >= 6.0 %endif -BuildRequires: phpunit8 -BuildRequires: phpunit9 -BuildRequires: phpunit10 BuildRequires: phpunit11 BuildRequires: phpunit12 %endif @@ -49,20 +46,19 @@ BuildRequires: phpunit12 BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^7.4 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", +# "php": "8.2.* || 8.3.* || 8.4.*", # "phpdocumentor/reflection-docblock": "^5.2", # "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", # "doctrine/instantiator": "^1.2 || ^2.0", -# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" -Requires: php(language) >= 7.4 +# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", +# "symfony/deprecation-contracts": "^2.5 || ^3.1" +Requires: php(language) >= 8.2 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 8) Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 8) Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # From phpcompatinfo report for version 1.11.0 -Requires: php-pcre -Requires: php-reflection -Requires: php-spl +# only pcre, reflection and spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -85,9 +81,13 @@ to be used inside any testing framework out there with minimal effort. phpab --template fedora --output src/Prophecy/autoload.php src cat << 'EOF' | tee -a src/Prophecy/autoload.php -$inst = ['%{_datadir}/php/Doctrine/Instantiator/autoload.php']; -if (PHP_VERSION_ID > 80100) { - array_unshift($inst, '%{_datadir}/php/Doctrine/Instantiator2/autoload.php'); +if (PHP_VERSION_ID > 80400) { + $inst = [ + '%{_datadir}/php/Doctrine/Instantiator2/autoload.php', + '%{_datadir}/php/Doctrine/Instantiator/autoload.php', + ]; +} else { + $inst = '%{_datadir}/php/Doctrine/Instantiator/autoload.php'; } \Fedora\Autoloader\Dependencies::required([ $inst, @@ -95,15 +95,11 @@ if (PHP_VERSION_ID > 80100) { ]); if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec $inst = [ + '%{_datadir}/php/SebastianBergmann/Comparator6/autoload.php', + '%{_datadir}/php/SebastianBergmann/Comparator5/autoload.php', '%{_datadir}/php/SebastianBergmann/Comparator4/autoload.php', '%{_datadir}/php/SebastianBergmann/Comparator3/autoload.php', ]; - if (PHP_VERSION_ID > 80100) { - array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator5/autoload.php'); - } - if (PHP_VERSION_ID > 80200) { - array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator6/autoload.php'); - } if (PHP_VERSION_ID > 80300) { array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator7/autoload.php'); } @@ -111,20 +107,23 @@ if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from php } if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v2 from phpunit, v1 from phpspec $inst = [ + '%{_datadir}/php/SebastianBergmann/RecursionContext6/autoload.php', + '%{_datadir}/php/SebastianBergmann/RecursionContext5/autoload.php', '%{_datadir}/php/SebastianBergmann/RecursionContext4/autoload.php', '%{_datadir}/php/SebastianBergmann/RecursionContext3/autoload.php', ]; - if (PHP_VERSION_ID > 80100) { - array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext5/autoload.php'); - } - if (PHP_VERSION_ID > 80200) { - array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext6/autoload.php'); - } if (PHP_VERSION_ID > 80300) { array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext7/autoload.php'); } \Fedora\Autoloader\Dependencies::required([$inst]); } +// from https://github.com/symfony/deprecation-contracts +if (!function_exists('trigger_deprecation')) { + function trigger_deprecation(string $package, string $version, string $message, mixed ...$args): void + { + @trigger_error(($package || $version ? "Since $package $version: " : '').($args ? vsprintf($message, $args) : $message), \E_USER_DEPRECATED); + } +} EOF @@ -152,39 +151,22 @@ phpspec --version %endif ret=0 -# ignore it_can_not_double_an_enum on all version. Not ready -for cmd in php php81 php82 php83 php84; do - if which $cmd; then -%if %{with phpspec} - $cmd -d auto_prepend_file=vendor/autoload.php \ - %{_bindir}/phpspec run --format pretty --verbose --no-ansi || ret=1 -%endif - $cmd -d auto_prepend_file=vendor/autoload.php \ - %{_bindir}/phpunit8 \ - || ret=1 - $cmd -d auto_prepend_file=vendor/autoload.php \ - %{_bindir}/phpunit9 \ - || ret=1 - $cmd -d auto_prepend_file=vendor/autoload.php \ - %{_bindir}/phpunit10 \ - || ret=1 - fi -done -for cmd in php php82 php83 php84; do +for cmd in php php82 php83 php84 php85; do if which $cmd; then $cmd -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpunit11 \ || ret=1 fi done -# Not ready see https://github.com/phpspec/prophecy/issues/640 -for cmd in php php83 php84; do +if [ -x %{_bindir}/phpunit12 ]; then +for cmd in php php83 php84 php85; do if which $cmd; then $cmd -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpunit12 \ - || ignore=1 + || ret=1 fi done +fi exit $ret %else : Test suite disabled @@ -199,6 +181,11 @@ exit $ret %changelog +* Mon Jan 12 2026 Remi Collet - 1.24.0-2 +- update to 1.24.0 +- use doctrine/instantiator v2 only with PHP 8.4+ +- raise dependency on PHP 8.2 + * Fri Jul 25 2025 Fedora Release Engineering - 1.22.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 77767c2..c5a1dbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.22.0-35f1adb.tgz) = abb30711891203c294676e73919231d77bb7c83822e936adeaa26abd8fe9a4374b32cb0c3a9d9c334c5db5e21be7e0e8e14e67f920104289847380799f5a8a22 +SHA512 (php-phpspec-prophecy-1.24.0-a24f1bd.tgz) = 1fb41f8835788bb06c4ec0ae67460f80370d0466a0036368ce5822750a3544ba306a3660011b95b127276695027cd099bcd85259e4d1faeff36caa11dd4610de