From 9fa8e934a50a06192d4a8500ec40cdc027315f43 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Feb 2025 11:51:29 +0100 Subject: [PATCH 1/3] enable tests --- php-sebastian-diff7.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/php-sebastian-diff7.spec b/php-sebastian-diff7.spec index cd4e67c..00216ac 100644 --- a/php-sebastian-diff7.spec +++ b/php-sebastian-diff7.spec @@ -7,8 +7,7 @@ # Please, preserve the changelog entries # -# disabled until phpunit12 available -%bcond_with tests +%bcond_without tests %global gh_commit 7ab1ea946c012266ca32390913653d844ecd085f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -27,7 +26,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -109,6 +108,9 @@ exit $ret %changelog +* Mon Feb 10 2025 Remi Collet - 7.0.0-2 +- enable test suite + * Fri Feb 7 2025 Remi Collet - 7.0.0-1 - update to 7.0.0 - raise dependency on PHP 8.3 From 23bda8a29caffd8c8154a960ae1b4fafaa18db06 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Jun 2025 14:38:54 +0200 Subject: [PATCH 2/3] add upstream patch for test suite with phpunit 12.2 --- ...99d8486b460efd667d0d64f1a32dd588971d.patch | 45 +++++++++++++++++++ php-sebastian-diff7.spec | 8 +++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 98c299d8486b460efd667d0d64f1a32dd588971d.patch diff --git a/98c299d8486b460efd667d0d64f1a32dd588971d.patch b/98c299d8486b460efd667d0d64f1a32dd588971d.patch new file mode 100644 index 0000000..cb19294 --- /dev/null +++ b/98c299d8486b460efd667d0d64f1a32dd588971d.patch @@ -0,0 +1,45 @@ +From 98c299d8486b460efd667d0d64f1a32dd588971d Mon Sep 17 00:00:00 2001 +From: Sebastian Bergmann +Date: Thu, 26 Jun 2025 13:32:07 +0200 +Subject: [PATCH] Closes #129 + +--- + .../StrictUnifiedDiffOutputBuilderIntegrationTest.php | 4 ++-- + .../Integration/UnifiedDiffOutputBuilderIntegrationTest.php | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php b/tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php +index b51da5d6..aa324ca6 100644 +--- a/tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php ++++ b/tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php +@@ -147,7 +147,7 @@ public function testIntegrationUsingPHPFileInVendorPatch(string $fileFrom, strin + #[DataProvider('provideBasicDiffGeneration')] + #[DataProvider('provideOutputBuildingCases')] + #[DataProvider('provideSample')] +- public function testIntegrationOfUnitTestCasesGitApply(string $expected, string $from, string $to): void ++ public function testIntegrationOfUnitTestCasesGitApply(string $expected, string $from, string $to, ?array $options = null): void + { + $this->doIntegrationTestGitApply($expected, $from); + } +@@ -155,7 +155,7 @@ public function testIntegrationOfUnitTestCasesGitApply(string $expected, string + #[DataProvider('provideBasicDiffGeneration')] + #[DataProvider('provideOutputBuildingCases')] + #[DataProvider('provideSample')] +- public function testIntegrationOfUnitTestCasesPatch(string $expected, string $from, string $to): void ++ public function testIntegrationOfUnitTestCasesPatch(string $expected, string $from, string $to, ?array $options = null): void + { + $this->doIntegrationTestPatch($expected, $from, $to); + } +diff --git a/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php b/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php +index 7ae1da26..58bab66c 100644 +--- a/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php ++++ b/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php +@@ -86,7 +86,7 @@ public function testDiffWithLineNumbersPath(string $expected, string $from, stri + } + + #[DataProvider('provideDiffWithLineNumbers')] +- public function testDiffWithLineNumbersGitApply(string $expected, string $from): void ++ public function testDiffWithLineNumbersGitApply(string $expected, string $from, string $to): void + { + $this->doIntegrationTestGitApply($expected, $from); + } diff --git a/php-sebastian-diff7.spec b/php-sebastian-diff7.spec index 00216ac..86f8754 100644 --- a/php-sebastian-diff7.spec +++ b/php-sebastian-diff7.spec @@ -26,7 +26,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 7.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -38,6 +38,8 @@ Source1: makesrc.sh %global symfony_version 7.2.0 Source2: https://github.com/symfony/process/archive/v%{symfony_version}/php-symfony-process-%{symfony_version}.tar.gz +Patch0: https://github.com/sebastianbergmann/diff/commit/98c299d8486b460efd667d0d64f1a32dd588971d.patch + BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with tests} @@ -68,6 +70,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -a 2 +%patch -P0 -p1 %build @@ -108,6 +111,9 @@ exit $ret %changelog +* Thu Jun 26 2025 Remi Collet - 7.0.0-3 +- add upstream patch for test suite with phpunit 12.2 + * Mon Feb 10 2025 Remi Collet - 7.0.0-2 - enable test suite From 17ba1d05e96068c43a0abdad7235010dd4e6ec77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:33:34 +0000 Subject: [PATCH 3/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-sebastian-diff7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-diff7.spec b/php-sebastian-diff7.spec index 86f8754..ba2cc37 100644 --- a/php-sebastian-diff7.spec +++ b/php-sebastian-diff7.spec @@ -26,7 +26,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 7.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 7.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 26 2025 Remi Collet - 7.0.0-3 - add upstream patch for test suite with phpunit 12.2