diff --git a/.gitignore b/.gitignore index 1565742..c1e3880 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ /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 -/php-sebastian-comparator5-5.0.4-e8e5309.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 6b903fc..570b039 100644 --- a/php-sebastian-comparator5.spec +++ b/php-sebastian-comparator5.spec @@ -1,8 +1,8 @@ # remirepo/fedora spec file for php-sebastian-comparator5 # -# SPDX-FileCopyrightText: Copyright 2014-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2014-2024 Remi Collet +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # @@ -10,7 +10,7 @@ # disabled until phpunit10 available %bcond_without tests -%global gh_commit e8e53097718d2b53cfb2aa859b06a41abf58c62e +%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.4 -Release: 1%{?dist} +Version: 5.0.1 +Release: 4%{?dist} Summary: Compare PHP values for equality, version %{major} License: BSD-3-Clause @@ -33,18 +33,21 @@ 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 +BuildRequires: php-date BuildRequires: php-dom BuildRequires: php-mbstring +BuildRequires: php-spl BuildRequires: (php-composer(%{pk_vendor}/diff) >= 5.0 with php-composer(%{pk_vendor}/diff) < 6) BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer(%{pk_vendor}/exporter) < 6) BuildRequires: php-fedora-autoloader-devel %if %{with tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^10.5" -BuildRequires: phpunit10 >= 10.5 +# "phpunit/phpunit": "^10.4" +BuildRequires: phpunit10 >= 10.4 %endif # from composer.json @@ -59,6 +62,8 @@ Requires: php-mbstring Requires: (php-composer(%{pk_vendor}/diff) >= 5.0 with php-composer(%{pk_vendor}/diff) < 6) Requires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer(%{pk_vendor}/exporter) < 6) # from phpcompatinfo report for version 5.0.0 +Requires: php-date +Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -75,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 @@ -103,7 +109,7 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php81 php82 php83 php84 php85; 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 @@ -122,39 +128,12 @@ exit $ret %changelog -* Mon Sep 8 2025 Remi Collet - 5.0.4-1 -- update to 5.0.4 - -* Fri Jul 25 2025 Fedora Release Engineering - 5.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 5.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* 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 - -* Fri Jul 19 2024 Fedora Release Engineering - 5.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Tue Jan 30 2024 Remi Collet - 5.0.1-4 - add upstream patch for phpunit >= 10.4 FTBFS #2261508 -* Thu Jan 25 2024 Fedora Release Engineering - 5.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Fri Aug 18 2023 Remi Collet - 5.0.1-1 - update to 5.0.1 -* Fri Jul 21 2023 Fedora Release Engineering - 5.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * 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 55f805e..ebc5117 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-comparator5-5.0.4-e8e5309.tgz) = 1c23041312557f1b9750db3903b5026bd393a30b8eeb5130445dfe21e019b5e76feb63a4ce397b72f1d55606b975170773ee0e740b61df0c945b15e88fa60e3c +SHA512 (php-sebastian-comparator5-5.0.1-2db5010.tgz) = 594f8a213b1c3ada12ebe5d00ae8deba67ba09445b619eef05b3f99db20224b001b2007eaab623b5ee1e04679e6fe1952b7f2ecf2463dbe078e2143bdac4a9b5