diff --git a/.gitignore b/.gitignore index f1f08f7..c1e3880 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-sebastian-comparator5-5.0.0-72f01e6.tgz +/php-sebastian-comparator5-5.0.1-2db5010.tgz 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 8a12b8d..570b039 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/ # @@ -8,9 +8,9 @@ # # disabled until phpunit10 available -%bcond_with tests +%bcond_without tests -%global gh_commit 72f01e6586e0caf6af81297897bd112eb7e9627c +%global gh_commit 2db5010a484d53ebf536087a70b4a5423c102372 %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.0 -Release: 1%{?dist} +Version: 5.0.1 +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.0" -BuildRequires: phpunit10 +# "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 @@ -107,7 +109,7 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php81 php82; do +for cmd in php php81 php82 php83; 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 @@ -126,6 +128,12 @@ 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 + * Fri Feb 3 2023 Remi Collet - 5.0.0-1 - update to 5.0.0 - raise dependency on PHP 8.1 diff --git a/sources b/sources index 7272580..ebc5117 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-comparator5-5.0.0-72f01e6.tgz) = 9945094a49dc8bca74509ea8cc0f243182d3cd9d5f8e7123347a79f6fcb5678ea86d0347923ea9b4d1be869acd293c817a09fde6b36771e8dc042614af89940f +SHA512 (php-sebastian-comparator5-5.0.1-2db5010.tgz) = 594f8a213b1c3ada12ebe5d00ae8deba67ba09445b619eef05b3f99db20224b001b2007eaab623b5ee1e04679e6fe1952b7f2ecf2463dbe078e2143bdac4a9b5