set diff builder because from sebastian/diff version 5 is builder no …

…longer optional
sspooky13 · Mar 6, 2024 · 37bb2e4 · 37bb2e4
1 parent 2c73d13
commit 37bb2e4
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 11 deletions.
diff --git a/src/Model/YamlAlphabetical/YamlAlphabeticalChecker.php b/src/Model/YamlAlphabetical/YamlAlphabeticalChecker.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlAlphabetical;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use Symfony\Component\Yaml\Yaml;
 use YamlStandards\Model\AbstractChecker;
 use YamlStandards\Model\Config\StandardParametersData;
@@ -31,7 +32,7 @@ public function check(string $pathToFile, StandardParametersData $standardParame
             return new Result($pathToFile, Result::RESULT_CODE_OK);
         }
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($fileContent, $rightFileContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_INVALID_FILE_SYNTAX, $diffBetweenStrings);

diff --git a/src/Model/YamlAlphabetical/YamlAlphabeticalFixer.php b/src/Model/YamlAlphabetical/YamlAlphabeticalFixer.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlAlphabetical;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use Symfony\Component\Yaml\Yaml;
 use YamlStandards\Model\AbstractFixer;
 use YamlStandards\Model\Config\StandardParametersData;
@@ -33,7 +34,7 @@ public function fix(string $pathToFile, string $pathToDumpFixedFile, StandardPar
 
         file_put_contents($pathToDumpFixedFile, $rightFileContent);
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($fileContent, $rightFileContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_FIXED_INVALID_FILE_SYNTAX, $diffBetweenStrings);

diff --git a/src/Model/YamlEmptyLineAtEnd/YamlEmptyLineAtEndChecker.php b/src/Model/YamlEmptyLineAtEnd/YamlEmptyLineAtEndChecker.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlEmptyLineAtEnd;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractChecker;
 use YamlStandards\Model\Config\StandardParametersData;
 use YamlStandards\Result\Result;
@@ -30,7 +31,7 @@ public function check(string $pathToFile, StandardParametersData $standardParame
             return new Result($pathToFile, Result::RESULT_CODE_OK);
         }
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($yamlContent, $correctYamlContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_INVALID_FILE_SYNTAX, $diffBetweenStrings, true);

diff --git a/src/Model/YamlEmptyLineAtEnd/YamlEmptyLineAtEndFixer.php b/src/Model/YamlEmptyLineAtEnd/YamlEmptyLineAtEndFixer.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlEmptyLineAtEnd;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractFixer;
 use YamlStandards\Model\Config\StandardParametersData;
 use YamlStandards\Result\Result;
@@ -32,7 +33,7 @@ public function fix(string $pathToFile, string $pathToDumpFixedFile, StandardPar
 
         file_put_contents($pathToDumpFixedFile, $correctYamlContent);
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($yamlContent, $correctYamlContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_FIXED_INVALID_FILE_SYNTAX, $diffBetweenStrings);

diff --git a/src/Model/YamlIndent/YamlIndentChecker.php b/src/Model/YamlIndent/YamlIndentChecker.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlIndent;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractChecker;
 use YamlStandards\Model\Config\StandardParametersData;
 use YamlStandards\Result\Result;
@@ -35,7 +36,7 @@ public function check(string $pathToFile, StandardParametersData $standardParame
             return new Result($pathToFile, Result::RESULT_CODE_OK);
         }
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($fileContent, $rightFileContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_INVALID_FILE_SYNTAX, $diffBetweenStrings, true);

diff --git a/src/Model/YamlIndent/YamlIndentFixer.php b/src/Model/YamlIndent/YamlIndentFixer.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlIndent;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractFixer;
 use YamlStandards\Model\Config\StandardParametersData;
 use YamlStandards\Result\Result;
@@ -37,7 +38,7 @@ public function fix(string $pathToFile, string $pathToDumpFixedFile, StandardPar
 
         file_put_contents($pathToDumpFixedFile, $rightFileContent);
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($fileContent, $rightFileContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_FIXED_INVALID_FILE_SYNTAX, $diffBetweenStrings);

diff --git a/src/Model/YamlInline/YamlInlineChecker.php b/src/Model/YamlInline/YamlInlineChecker.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlInline;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use Symfony\Component\Yaml\Yaml;
 use YamlStandards\Model\AbstractChecker;
 use YamlStandards\Model\Component\YamlService;
@@ -41,7 +42,7 @@ public function check(string $pathToFile, StandardParametersData $standardParame
             return new Result($pathToFile, Result::RESULT_CODE_OK);
         }
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($filteredYamlFile, $yamlStringData);
 
         return new Result($pathToFile, Result::RESULT_CODE_INVALID_FILE_SYNTAX, $diffBetweenStrings);

diff --git a/src/Model/YamlServiceAliasing/YamlServiceAliasingChecker.php b/src/Model/YamlServiceAliasing/YamlServiceAliasingChecker.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlServiceAliasing;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractChecker;
 use YamlStandards\Model\Component\YamlService;
 use YamlStandards\Model\Config\StandardParametersData;
@@ -35,7 +36,7 @@ public function check(string $pathToFile, StandardParametersData $standardParame
             return new Result($pathToFile, Result::RESULT_CODE_OK);
         }
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($yamlContent, $correctYamlContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_INVALID_FILE_SYNTAX, $diffBetweenStrings, true);

diff --git a/src/Model/YamlServiceAliasing/YamlServiceAliasingFixer.php b/src/Model/YamlServiceAliasing/YamlServiceAliasingFixer.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlServiceAliasing;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractFixer;
 use YamlStandards\Model\Component\YamlService;
 use YamlStandards\Model\Config\StandardParametersData;
@@ -37,7 +38,7 @@ public function fix(string $pathToFile, string $pathToDumpFixedFile, StandardPar
 
         file_put_contents($pathToDumpFixedFile, $correctYamlContent);
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($yamlContent, $correctYamlContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_FIXED_INVALID_FILE_SYNTAX, $diffBetweenStrings);

diff --git a/src/Model/YamlSpacesBetweenGroups/YamlSpacesBetweenGroupsChecker.php b/src/Model/YamlSpacesBetweenGroups/YamlSpacesBetweenGroupsChecker.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlSpacesBetweenGroups;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractChecker;
 use YamlStandards\Model\Component\YamlService;
 use YamlStandards\Model\Config\StandardParametersData;
@@ -37,7 +38,7 @@ public function check(string $pathToFile, StandardParametersData $standardParame
             return new Result($pathToFile, Result::RESULT_CODE_OK);
         }
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($yamlContent, $correctYamlContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_INVALID_FILE_SYNTAX, $diffBetweenStrings, true);

diff --git a/src/Model/YamlSpacesBetweenGroups/YamlSpacesBetweenGroupsFixer.php b/src/Model/YamlSpacesBetweenGroups/YamlSpacesBetweenGroupsFixer.php
@@ -5,6 +5,7 @@
 namespace YamlStandards\Model\YamlSpacesBetweenGroups;
 
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use YamlStandards\Model\AbstractFixer;
 use YamlStandards\Model\Component\YamlService;
 use YamlStandards\Model\Config\StandardParametersData;
@@ -39,7 +40,7 @@ public function fix(string $pathToFile, string $pathToDumpFixedFile, StandardPar
 
         file_put_contents($pathToDumpFixedFile, $correctYamlContent);
 
-        $differ = new Differ();
+        $differ = new Differ(new UnifiedDiffOutputBuilder());
         $diffBetweenStrings = $differ->diff($yamlContent, $correctYamlContent);
 
         return new Result($pathToFile, Result::RESULT_CODE_FIXED_INVALID_FILE_SYNTAX, $diffBetweenStrings);