From 67a3e15f506f9d2321f7700f6828e5da54cf14a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Jan 2024 16:13:43 +0100 Subject: [PATCH 1/3] add upstream patch for phpunit >= 10.4 FTBFS #2261508 (cherry picked from commit 0e15668b9685a2dd49b919e8c9232fee5d814c06) --- php-sebastian-comparator5-upstream.patch | 35 ++++++++++++++++++++++++ php-sebastian-comparator5.spec | 13 ++++++--- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 php-sebastian-comparator5-upstream.patch diff --git a/php-sebastian-comparator5-upstream.patch b/php-sebastian-comparator5-upstream.patch new file mode 100644 index 0000000..b3b26b4 --- /dev/null +++ b/php-sebastian-comparator5-upstream.patch @@ -0,0 +1,35 @@ +From 3aca4f8e053d429c9972b07ebbee044a4fe79608 Mon Sep 17 00:00:00 2001 +From: Sebastian Bergmann +Date: Fri, 6 Oct 2023 13:38:06 +0200 +Subject: [PATCH] Sync with PHPUnit 10.4 + +--- + composer.json | 2 +- + tests/MockObjectComparatorTest.php | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/composer.json b/composer.json +index a53ecba..1886cbb 100644 +--- a/composer.json ++++ b/composer.json +@@ -35,7 +35,7 @@ + "ext-mbstring": "*" + }, + "require-dev": { +- "phpunit/phpunit": "^10.3" ++ "phpunit/phpunit": "^10.4" + }, + "config": { + "platform": { +diff --git a/tests/MockObjectComparatorTest.php b/tests/MockObjectComparatorTest.php +index 0188ab8..61be82c 100644 +--- a/tests/MockObjectComparatorTest.php ++++ b/tests/MockObjectComparatorTest.php +@@ -161,6 +161,6 @@ private static function createMockForComparatorTest(string $type, array $constru + { + $generator = new Generator; + +- return $generator->getMock($type, null, $constructorArguments); ++ return $generator->testDouble($type, true, null, $constructorArguments); + } + } diff --git a/php-sebastian-comparator5.spec b/php-sebastian-comparator5.spec index 51540d5..7deaa27 100644 --- a/php-sebastian-comparator5.spec +++ b/php-sebastian-comparator5.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sebastian-comparator5 # -# Copyright (c) 2014-2023 Remi Collet +# Copyright (c) 2014-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.1 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Compare PHP values for equality, version %{major} License: BSD-3-Clause @@ -33,6 +33,7 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +Patch0: %{name}-upstream.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 @@ -45,8 +46,8 @@ BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer( BuildRequires: php-fedora-autoloader-devel %if %{with tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^10.3" -BuildRequires: phpunit10 >= 10.3 +# "phpunit/phpunit": "^10.4" +BuildRequires: phpunit10 >= 10.4 %endif # from composer.json @@ -79,6 +80,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch -P0 -p1 %build @@ -126,6 +128,9 @@ exit $ret %changelog +* Tue Jan 30 2024 Remi Collet - 5.0.1-4 +- add upstream patch for phpunit >= 10.4 FTBFS #2261508 + * Fri Aug 18 2023 Remi Collet - 5.0.1-1 - update to 5.0.1 From a5c11c65bc71506574fc5c83b839876437c55247 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Aug 2024 10:32:19 +0200 Subject: [PATCH 2/3] v5.0.2 (cherry picked from commit b0dba3390f79a0edd7ef80e22c7980590ba61dd6) (cherry picked from commit 297701f268ff1e47f7ec3494414fd458ca2349e9) --- .gitignore | 1 + php-sebastian-comparator5-upstream.patch | 35 ------------------------ php-sebastian-comparator5.spec | 13 +++++---- sources | 2 +- 4 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 php-sebastian-comparator5-upstream.patch diff --git a/.gitignore b/.gitignore index c1e3880..1217517 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-sebastian-comparator5-5.0.0-72f01e6.tgz /php-sebastian-comparator5-5.0.1-2db5010.tgz +/php-sebastian-comparator5-5.0.2-2d3e04c.tgz diff --git a/php-sebastian-comparator5-upstream.patch b/php-sebastian-comparator5-upstream.patch deleted file mode 100644 index b3b26b4..0000000 --- a/php-sebastian-comparator5-upstream.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3aca4f8e053d429c9972b07ebbee044a4fe79608 Mon Sep 17 00:00:00 2001 -From: Sebastian Bergmann -Date: Fri, 6 Oct 2023 13:38:06 +0200 -Subject: [PATCH] Sync with PHPUnit 10.4 - ---- - composer.json | 2 +- - tests/MockObjectComparatorTest.php | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/composer.json b/composer.json -index a53ecba..1886cbb 100644 ---- a/composer.json -+++ b/composer.json -@@ -35,7 +35,7 @@ - "ext-mbstring": "*" - }, - "require-dev": { -- "phpunit/phpunit": "^10.3" -+ "phpunit/phpunit": "^10.4" - }, - "config": { - "platform": { -diff --git a/tests/MockObjectComparatorTest.php b/tests/MockObjectComparatorTest.php -index 0188ab8..61be82c 100644 ---- a/tests/MockObjectComparatorTest.php -+++ b/tests/MockObjectComparatorTest.php -@@ -161,6 +161,6 @@ private static function createMockForComparatorTest(string $type, array $constru - { - $generator = new Generator; - -- return $generator->getMock($type, null, $constructorArguments); -+ return $generator->testDouble($type, true, null, $constructorArguments); - } - } diff --git a/php-sebastian-comparator5.spec b/php-sebastian-comparator5.spec index 7deaa27..0425bd6 100644 --- a/php-sebastian-comparator5.spec +++ b/php-sebastian-comparator5.spec @@ -10,7 +10,7 @@ # disabled until phpunit10 available %bcond_without tests -%global gh_commit 2db5010a484d53ebf536087a70b4a5423c102372 +%global gh_commit 2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project comparator @@ -24,8 +24,8 @@ %global ns_project Comparator Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 5.0.1 -Release: 4%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: Compare PHP values for equality, version %{major} License: BSD-3-Clause @@ -33,7 +33,6 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: %{name}-upstream.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 @@ -80,7 +79,6 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p1 %build @@ -109,7 +107,7 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit10 --no-coverage || ret=1 @@ -128,6 +126,9 @@ exit $ret %changelog +* Mon Aug 12 2024 Remi Collet - 5.0.2-1 +- update to 5.0.2 + * Tue Jan 30 2024 Remi Collet - 5.0.1-4 - add upstream patch for phpunit >= 10.4 FTBFS #2261508 diff --git a/sources b/sources index ebc5117..15edbd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-comparator5-5.0.1-2db5010.tgz) = 594f8a213b1c3ada12ebe5d00ae8deba67ba09445b619eef05b3f99db20224b001b2007eaab623b5ee1e04679e6fe1952b7f2ecf2463dbe078e2143bdac4a9b5 +SHA512 (php-sebastian-comparator5-5.0.2-2d3e04c.tgz) = ded1691e0f27391c6b5923005965d27229a3489db3be4885c73676b189c429345030639bd489730a2b267bbaa1b8ebfef400a71591c7ba1a00c2c0e49715e7e8 From 0bc77f9aaa97512fab575534acac49b7538bcbfc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Oct 2024 10:26:57 +0200 Subject: [PATCH 3/3] v5.0.3 (cherry picked from commit 4ec5a1d9c78d4ad425aba3856ddacb0295bf9f39) --- .gitignore | 1 + php-sebastian-comparator5.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1217517..f7fbdc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-sebastian-comparator5-5.0.0-72f01e6.tgz /php-sebastian-comparator5-5.0.1-2db5010.tgz /php-sebastian-comparator5-5.0.2-2d3e04c.tgz +/php-sebastian-comparator5-5.0.3-a18251e.tgz diff --git a/php-sebastian-comparator5.spec b/php-sebastian-comparator5.spec index 0425bd6..701db56 100644 --- a/php-sebastian-comparator5.spec +++ b/php-sebastian-comparator5.spec @@ -10,7 +10,7 @@ # disabled until phpunit10 available %bcond_without tests -%global gh_commit 2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53 +%global gh_commit a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project comparator @@ -24,7 +24,7 @@ %global ns_project Comparator Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 5.0.2 +Version: 5.0.3 Release: 1%{?dist} Summary: Compare PHP values for equality, version %{major} @@ -45,8 +45,8 @@ BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer( BuildRequires: php-fedora-autoloader-devel %if %{with tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^10.4" -BuildRequires: phpunit10 >= 10.4 +# "phpunit/phpunit": "^10.5" +BuildRequires: phpunit10 >= 10.5 %endif # from composer.json @@ -126,6 +126,9 @@ exit $ret %changelog +* Mon Oct 21 2024 Remi Collet - 5.0.3-1 +- update to 5.0.3 + * Mon Aug 12 2024 Remi Collet - 5.0.2-1 - update to 5.0.2 diff --git a/sources b/sources index 15edbd6..b6be9bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-comparator5-5.0.2-2d3e04c.tgz) = ded1691e0f27391c6b5923005965d27229a3489db3be4885c73676b189c429345030639bd489730a2b267bbaa1b8ebfef400a71591c7ba1a00c2c0e49715e7e8 +SHA512 (php-sebastian-comparator5-5.0.3-a18251e.tgz) = e3e21b5ac069b74020e81397789aa49ad6594700b9145bf36208d482179cc595358bb3189d4f6b7889bcfd18c02caeafbf6dde4192cdfafc4b333256bf328903