Skip to content

Conversation

@emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Feb 10, 2026

Issue #11958

Targeting next minor as it's a dep change

This dep is not a fixed dependency

Should install the following:

  • PHPUnit ^11.3 sebastian/diff 6.0.2
  • PHPUnit ^12.0 sebastian/diff 7.0.0
  • PHPUnit ^13.0 sebastian/diff 8.0.0

IDK - I'm in 2 minds about this one. Looks like there is difference between 6.0.2 and 7.0.0 - https://github.com/sebastianbergmann/diff/compare/6.0.2..7.0.0 - I'm inclined to not merge this

@GuySartorelli
Copy link
Member

Converting to draft pending discussion about whether we should even do this - which we'll have on the issue.

}

#[DataProvider('provideLineEndingCompatibility')]
public function testLineEndingCompatibility(string $from, string $to, bool $escape, string $expected): void
Copy link
Member Author

@emteknetnz emteknetnz Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was added for a little additional test coverage, though it won't materially change the risk of allow additional versions of the diff module as we only test against a single major in CI

@emteknetnz emteknetnz marked this pull request as ready for review February 12, 2026 04:49
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@GuySartorelli GuySartorelli merged commit 95f77bd into silverstripe:6 Feb 12, 2026
13 checks passed
@GuySartorelli GuySartorelli deleted the pulls/6/multi-diff branch February 12, 2026 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants