1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
|
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Thu, 26 Jun 2025 13:32:07 +0200
Subject: Closes #129
Origin: upstream, https://github.com/sebastianbergmann/diff/commit/98c299d8486b460efd667d0d64f1a32dd588971d
---
.../Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php | 4 ++--
tests/Output/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 b51da5d..aa324ca 100644
--- a/tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php
+++ b/tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php
@@ -147,7 +147,7 @@ final class StrictUnifiedDiffOutputBuilderIntegrationTest extends TestCase
#[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 @@ final class StrictUnifiedDiffOutputBuilderIntegrationTest extends TestCase
#[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 7ae1da2..58bab66 100644
--- a/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php
+++ b/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php
@@ -86,7 +86,7 @@ final class UnifiedDiffOutputBuilderIntegrationTest extends TestCase
}
#[DataProvider('provideDiffWithLineNumbers')]
- public function testDiffWithLineNumbersGitApply(string $expected, string $from): void
+ public function testDiffWithLineNumbersGitApply(string $expected, string $from, string $to): void
{
$this->doIntegrationTestGitApply($expected, $from);
}
|