Skip to content
Snippets Groups Projects
Commit a9a7a349 authored by David Prévot's avatar David Prévot
Browse files

Update upstream source from tag 'upstream/6.0.1'

Update to upstream version '6.0.1'
with Debian dir e4d580c416d9e5165394ea28ecfe0ece37a3ada1
parents 789d8be3 fb2f8a43
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,12 @@
All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
## [6.0.1] - 2024-03-02
### Changed
* Do not use implicitly nullable parameters
## [6.0.0] - 2024-02-02
### Removed
......@@ -133,6 +139,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
* This component is no longer supported on PHP 5.6
[6.0.1]: https://github.com/sebastianbergmann/diff/compare/6.0.0...6.0.1
[6.0.0]: https://github.com/sebastianbergmann/diff/compare/5.1...6.0.0
[5.1.0]: https://github.com/sebastianbergmann/diff/compare/5.0.3...5.1.0
[5.0.3]: https://github.com/sebastianbergmann/diff/compare/5.0.2...5.0.3
......
......@@ -42,14 +42,14 @@ final class Differ
$this->outputBuilder = $outputBuilder;
}
public function diff(array|string $from, array|string $to, LongestCommonSubsequenceCalculator $lcs = null): string
public function diff(array|string $from, array|string $to, ?LongestCommonSubsequenceCalculator $lcs = null): string
{
$diff = $this->diffToArray($from, $to, $lcs);
return $this->outputBuilder->getDiff($diff);
}
public function diffToArray(array|string $from, array|string $to, LongestCommonSubsequenceCalculator $lcs = null): array
public function diffToArray(array|string $from, array|string $to, ?LongestCommonSubsequenceCalculator $lcs = null): array
{
if (is_string($from)) {
$from = $this->splitStringByLines($from);
......
......@@ -21,7 +21,7 @@ final class ConfigurationException extends InvalidArgumentException
string $expected,
$value,
int $code = 0,
Exception $previous = null
?Exception $previous = null
) {
parent::__construct(
sprintf(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment