Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17ba1d05e9 | ||
|
|
23bda8a29c | ||
|
|
9fa8e934a5 |
2 changed files with 59 additions and 3 deletions
45
98c299d8486b460efd667d0d64f1a32dd588971d.patch
Normal file
45
98c299d8486b460efd667d0d64f1a32dd588971d.patch
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
From 98c299d8486b460efd667d0d64f1a32dd588971d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
@ -7,8 +7,7 @@
|
||||||
# Please, preserve the changelog entries
|
# Please, preserve the changelog entries
|
||||||
#
|
#
|
||||||
|
|
||||||
# disabled until phpunit12 available
|
%bcond_without tests
|
||||||
%bcond_with tests
|
|
||||||
|
|
||||||
%global gh_commit 7ab1ea946c012266ca32390913653d844ecd085f
|
%global gh_commit 7ab1ea946c012266ca32390913653d844ecd085f
|
||||||
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
|
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
|
||||||
|
|
@ -27,7 +26,7 @@
|
||||||
|
|
||||||
Name: php-%{pk_vendor}-%{pk_project}%{major}
|
Name: php-%{pk_vendor}-%{pk_project}%{major}
|
||||||
Version: 7.0.0
|
Version: 7.0.0
|
||||||
Release: 1%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Diff implementation, version %{major}
|
Summary: Diff implementation, version %{major}
|
||||||
|
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
|
|
@ -39,6 +38,8 @@ Source1: makesrc.sh
|
||||||
%global symfony_version 7.2.0
|
%global symfony_version 7.2.0
|
||||||
Source2: https://github.com/symfony/process/archive/v%{symfony_version}/php-symfony-process-%{symfony_version}.tar.gz
|
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
|
BuildArch: noarch
|
||||||
BuildRequires: php-fedora-autoloader-devel
|
BuildRequires: php-fedora-autoloader-devel
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
|
|
@ -69,6 +70,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{gh_project}-%{gh_commit} -a 2
|
%setup -q -n %{gh_project}-%{gh_commit} -a 2
|
||||||
|
%patch -P0 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
@ -109,6 +111,15 @@ exit $ret
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 26 2025 Remi Collet <remi@remirepo.net> - 7.0.0-3
|
||||||
|
- add upstream patch for test suite with phpunit 12.2
|
||||||
|
|
||||||
|
* Mon Feb 10 2025 Remi Collet <remi@remirepo.net> - 7.0.0-2
|
||||||
|
- enable test suite
|
||||||
|
|
||||||
* Fri Feb 7 2025 Remi Collet <remi@remirepo.net> - 7.0.0-1
|
* Fri Feb 7 2025 Remi Collet <remi@remirepo.net> - 7.0.0-1
|
||||||
- update to 7.0.0
|
- update to 7.0.0
|
||||||
- raise dependency on PHP 8.3
|
- raise dependency on PHP 8.3
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue