Change logic of Parser: logic of the Translator moved to the Parser, Translator has been deleted. Output to the screen is delegated to the gendiff (binary file). Refactoring name of function.

Author: NikolaiProgramist

bin/gendiff

@@ -11,7 +11,7 @@ if (file_exists($autoloadPathLocal)) {
     require_once $autoloadPathGlobal;
 }
 
-use function Differ\Parser\parse;
+use function Differ\Differ\genDiff;
 
 $doc = <<<DOC
 Generate diff
@@ -29,4 +29,4 @@ DOC;
 
 $args = Docopt::handle($doc, array('version' => 'Gendiff 1.0'));
 
-parse($args['<firstFile>'], $args['<secondFile>'], $args['--format']);
+echo genDiff($args['<firstFile>'], $args['<secondFile>'], $args['--format']);

composer.json

@@ -26,7 +26,6 @@
         "files": [
             "src/Parser.php",
             "src/Differ/Differ.php",
-            "src/Differ/Translator.php",
             "src/Formatters.php",
             "src/Formatters/Stylish.php",
             "src/Formatters/Plain.php",

src/Differ/Differ.php

@@ -2,20 +2,20 @@
 
 namespace Differ\Differ;
 
-use function Differ\Formatters\selectFormatter;
 use function Functional\sort;
-use function Differ\Translator\getJson;
+use function Differ\Parser\parse;
+use function Differ\Parser\parseToJson;
 
 function genDiff(string $pathToFile1, string $pathToFile2, string $format = 'stylish'): string
 {
-    $firstFile = getJson($pathToFile1);
-    $secondFile = getJson($pathToFile2);
+    $firstFile = parseToJson($pathToFile1);
+    $secondFile = parseToJson($pathToFile2);
 
     $elements = sortingFirstFile($firstFile, $secondFile);
     $elements2 = sortingSecondFile($secondFile, $firstFile);
 
     $resultDiff = sortArrayByKeysRecursive(array_merge_recursive($elements, $elements2));
-    return selectFormatter($resultDiff, $format);
+    return parse($resultDiff, $format);
 }
 
 function sortingFirstFile(mixed $tree1, mixed $tree2): mixed

src/Differ/Translator.php

@@ -2,10 +2,35 @@
 
 namespace Differ\Parser;
 
-use function Differ\Differ\genDiff;
+use Symfony\Component\Yaml\Yaml;
 
-function parse(string $pathToFile1, string $pathToFile2, string $format): void
+use function Differ\Formatters\selectFormatter;
+
+function parse(array $resultDiff, string $format): string
+{
+    return selectFormatter($resultDiff, $format);
+}
+
+function parseToJson(string $path): array
 {
-    $resultString = genDiff($pathToFile1, $pathToFile2, $format);
-    echo $resultString;
+    $content = getFileContent($path);
+
+    if (str_ends_with($path, '.yaml') || str_ends_with($path, '.yml')) {
+        return Yaml::parse($content);
+    }
+
+    return json_decode($content, true);
+}
+
+function getFileContent(string $path): string
+{
+    $dirPath = __DIR__;
+
+    if (str_starts_with($path, '/')) {
+        $fullPath = $path;
+    } else {
+        $fullPath = "{$dirPath}/../../{$path}";
+    }
+
+    return file_get_contents($fullPath);
 }