summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--phpunit13-rpm.patch8
-rw-r--r--phpunit13.spec14
-rw-r--r--upstream.patch37
3 files changed, 51 insertions, 8 deletions
diff --git a/phpunit13-rpm.patch b/phpunit13-rpm.patch
index 8e56aa0..b1b209e 100644
--- a/phpunit13-rpm.patch
+++ b/phpunit13-rpm.patch
@@ -96,7 +96,7 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/
diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Configuration/Xml/SchemaFinder.php
--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-11-28 07:29:40.000000000 +0100
+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-11-28 07:31:32.759973771 +0100
-@@ -77,6 +77,6 @@ final readonly class SchemaFinder
+@@ -78,6 +78,6 @@ final readonly class SchemaFinder
return __PHPUNIT_PHAR_ROOT__ . '/';
}
@@ -138,7 +138,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
diff -up ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php
--- ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm 2024-11-28 07:29:40.000000000 +0100
+++ ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php 2024-11-28 07:31:32.759973771 +0100
-@@ -28,7 +28,7 @@ final class VersionCheckCommandTest exte
+@@ -31,7 +31,7 @@ final class VersionCheckCommandTest exte
{
return [
[
@@ -147,7 +147,7 @@ diff -up ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm ./
Result::SUCCESS,
10,
'10.5.0',
-@@ -36,8 +36,9 @@ final class VersionCheckCommandTest exte
+@@ -39,8 +39,9 @@ final class VersionCheckCommandTest exte
'10.5.0',
],
[
@@ -158,7 +158,7 @@ diff -up ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm ./
'The latest version is PHPUnit 10.5.1.' . PHP_EOL,
Result::FAILURE,
10,
-@@ -46,9 +47,11 @@ final class VersionCheckCommandTest exte
+@@ -49,9 +50,11 @@ final class VersionCheckCommandTest exte
'10.5.1',
],
[
diff --git a/phpunit13.spec b/phpunit13.spec
index d6db63a..b2d24c6 100644
--- a/phpunit13.spec
+++ b/phpunit13.spec
@@ -32,7 +32,7 @@
Name: %{pk_project}%{ver_major}
Version: 13.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
License: BSD-3-Clause
@@ -43,6 +43,7 @@ Source1: makesrc.sh
# Fix command for autoload
Patch0: %{name}-rpm.patch
+Patch1: upstream.patch
BuildArch: noarch
BuildRequires: php(language) >= 8.4.1
@@ -58,7 +59,7 @@ BuildRequires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-c
BuildRequires: (php-composer(sebastian/comparator) >= 8.3.0 with php-composer(sebastian/comparator) < 9)
BuildRequires: (php-composer(sebastian/diff) >= 9.0 with php-composer(sebastian/diff) < 10)
BuildRequires: (php-composer(sebastian/environment) >= 9.3.2 with php-composer(sebastian/environment) < 10)
-BuildRequires: (php-composer(sebastian/exporter) >= 8.1.0 with php-composer(sebastian/exporter) < 9)
+BuildRequires: (php-composer(sebastian/exporter) >= 8.1.1 with php-composer(sebastian/exporter) < 9)
BuildRequires: (php-composer(sebastian/file-filter) >= 1.0 with php-composer(sebastian/file-filter) < 2)
BuildRequires: (php-composer(sebastian/git-state) >= 1.0.0 with php-composer(sebastian/git-state) < 2)
BuildRequires: (php-composer(sebastian/global-state) >= 9.0.1 with php-composer(sebastian/global-state) < 10)
@@ -96,7 +97,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "sebastian/comparator": "^8.3.0",
# "sebastian/diff": "^9.0",
# "sebastian/environment": "^9.3.2",
-# "sebastian/exporter": "^8.1.0",
+# "sebastian/exporter": "^8.1.1",
# "sebastian/file-filter": "^1.0",
# "sebastian/git-state": "^1.0",
# "sebastian/global-state": "^9.0.1",
@@ -124,7 +125,7 @@ Requires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-c
Requires: (php-composer(sebastian/comparator) >= 8.3.0 with php-composer(sebastian/comparator) < 9)
Requires: (php-composer(sebastian/diff) >= 9.0 with php-composer(sebastian/diff) < 10)
Requires: (php-composer(sebastian/environment) >= 9.3.2 with php-composer(sebastian/environment) < 10)
-Requires: (php-composer(sebastian/exporter) >= 8.1.0 with php-composer(sebastian/exporter) < 9)
+Requires: (php-composer(sebastian/exporter) >= 8.1.1 with php-composer(sebastian/exporter) < 9)
Requires: (php-composer(sebastian/file-filter) >= 1.0 with php-composer(sebastian/file-filter) < 2)
Requires: (php-composer(sebastian/git-state) >= 1.0.0 with php-composer(sebastian/git-state) < 2)
Requires: (php-composer(sebastian/global-state) >= 9.0.1 with php-composer(sebastian/global-state) < 10)
@@ -168,6 +169,7 @@ Documentation: https://phpunit.de/documentation.html
%prep
%setup -q -n %{gh_project}-%{version}
%patch -P0 -p0 -b .rpm
+%patch -P1 -p1 -b .upstream
find . -name \*.rpm -delete -print
@@ -299,6 +301,10 @@ exit $ret
%changelog
+* Wed Jul 22 2026 Remi Collet <remi@remirepo.net> - 13.2.4-2
+- add upstream patch for sebastian/exporter 8.1.1 FTBFS #2504411
+- raise dependency on sebastian/exporter 8.1.1
+
* Wed Jul 8 2026 Remi Collet <remi@remirepo.net> - 13.2.4-1
- update to 13.2.4
- raise dependency on phpunit/php-code-coverage 14.2.3
diff --git a/upstream.patch b/upstream.patch
new file mode 100644
index 0000000..0947628
--- /dev/null
+++ b/upstream.patch
@@ -0,0 +1,37 @@
+From 3f4aa956c28ab1a67d0ed8d382e3c09d3a1337c2 Mon Sep 17 00:00:00 2001
+From: Sebastian Bergmann <sb@sebastian-bergmann.de>
+Date: Mon, 13 Jul 2026 13:39:32 +0200
+Subject: [PATCH] Update dependencies
+
+---
+ composer.json | 2 +-
+ composer.lock | 16 ++++++++--------
+ .../Constraint/String/StringContainsTest.php | 2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/composer.json b/composer.json
+index a06542e165..5c688361a3 100644
+--- a/composer.json
++++ b/composer.json
+@@ -47,7 +47,7 @@
+ "sebastian/comparator": "^8.3.0",
+ "sebastian/diff": "^9.0",
+ "sebastian/environment": "^9.3.2",
+- "sebastian/exporter": "^8.1.0",
++ "sebastian/exporter": "^8.1.1",
+ "sebastian/file-filter": "^1.0",
+ "sebastian/git-state": "^1.0",
+ "sebastian/global-state": "^9.0.1",
+diff --git a/tests/unit/Framework/Constraint/String/StringContainsTest.php b/tests/unit/Framework/Constraint/String/StringContainsTest.php
+index 30096405d3..d977532351 100644
+--- a/tests/unit/Framework/Constraint/String/StringContainsTest.php
++++ b/tests/unit/Framework/Constraint/String/StringContainsTest.php
+@@ -174,7 +174,7 @@ public static function providesEvaluationCases(): array
+
+ 'Both the needle and haystack length in the failure message partly account for \r line endings given line endings are ignored' => [
+ false,
+- "Failed asserting that 'Some haystack with\\r\n line\\n\n endings \\n\\r\n' [ASCII](length: 36) contains \"Some needle with\n line\n endings \n\n\" [ASCII](length: 34).",
++ "Failed asserting that 'Some haystack with\\r\n line\\n\n endings \\n\n\\r\n' [ASCII](length: 36) contains \"Some needle with\n line\n endings \n\n\" [ASCII](length: 34).",
+ false,
+ true,
+ /**
generated by cgit (git 2.34.1) at 2026-07-23 23:13:55 +0000