Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Remi Collet
7f0c8a9460 v5.0.3
(cherry picked from commit 4ec5a1d9c7)
2024-10-21 10:29:26 +02:00
Remi Collet
297701f268 v5.0.2
(cherry picked from commit b0dba3390f)
2024-08-12 10:33:12 +02:00
4 changed files with 15 additions and 44 deletions

2
.gitignore vendored
View file

@ -1,2 +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

View file

@ -1,35 +0,0 @@
From 3aca4f8e053d429c9972b07ebbee044a4fe79608 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
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);
}
}

View file

@ -10,7 +10,7 @@
# disabled until phpunit10 available
%bcond_without tests
%global gh_commit 2db5010a484d53ebf536087a70b4a5423c102372
%global gh_commit a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e
%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.3
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
@ -46,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
@ -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,12 @@ exit $ret
%changelog
* Mon Oct 21 2024 Remi Collet <remi@remirepo.net> - 5.0.3-1
- update to 5.0.3
* Mon Aug 12 2024 Remi Collet <remi@remirepo.net> - 5.0.2-1
- update to 5.0.2
* Tue Jan 30 2024 Remi Collet <remi@remirepo.net> - 5.0.1-4
- add upstream patch for phpunit >= 10.4 FTBFS #2261508

View file

@ -1 +1 @@
SHA512 (php-sebastian-comparator5-5.0.1-2db5010.tgz) = 594f8a213b1c3ada12ebe5d00ae8deba67ba09445b619eef05b3f99db20224b001b2007eaab623b5ee1e04679e6fe1952b7f2ecf2463dbe078e2143bdac4a9b5
SHA512 (php-sebastian-comparator5-5.0.3-a18251e.tgz) = e3e21b5ac069b74020e81397789aa49ad6594700b9145bf36208d482179cc595358bb3189d4f6b7889bcfd18c02caeafbf6dde4192cdfafc4b333256bf328903