added .yaml files support

Author: Alexsey-VR

file1.yaml

@@ -0,0 +1,4 @@
+host: hexlet.io
+timeout: 50
+proxy: 123.234.53.22
+follow: false

file2.yaml

@@ -0,0 +1,3 @@
+timeout: 20
+verbose: true
+host: hexlet.io

fixtures/file1.txt

@@ -0,0 +1,6 @@
+{
+  "host": "hexlet.io",
+  "timeout": 50,
+  "proxy": "123.234.53.22",
+  "follow": false
+}

fixtures/filesContent.txt renamed to fixtures/filesJSONContent.txt

@@ -3,11 +3,11 @@ file1.json content:
     hexlet.io
     50
     123.234.53.22
-    
+    false
 }
 file2.json content:
 {
     20
-    1
+    true
     hexlet.io
 }

fixtures/filesYAMLContent.txt

@@ -0,0 +1,13 @@
+file1.yaml content:
+{
+    hexlet.io
+    50
+    123.234.53.22
+    false
+}
+file2.yaml content:
+{
+    20
+    true
+    hexlet.io
+}

src/CommandFactory.php

@@ -6,6 +6,7 @@ class CommandFactory implements CommandFactoryInterface
 {
     private $parser;
     private $fileReader;
+    private $displayMode;
 
     public function __construct($parser, $fileReader)
     {

src/DisplayCommand.php

@@ -27,7 +27,7 @@ public function execute(CommandInterface $command = null): CommandInterface
                     print_r($command->getFilesContent());
                     break;
                 default:
-                    print_r("error: unknown mode");
+                    throw new \Exception("internal error: unknown mode for display\n");
             }
         }
 

src/FileReader.php

@@ -2,11 +2,18 @@
 
 namespace Differ;
 
+use Symfony\Component\Yaml\Yaml;
+
 class FileReader implements FileReaderInterface
 {
     private const MAX_FILE_SIZE = 4096;
     private string $fileFormat;
 
+    private function normalizeFilename(string $filename)
+    {
+        return strtolower($filename);
+    }
+
     public function __construct(string $fileFormat = 'json')
     {
         $this->fileFormat = $fileFormat;
@@ -15,14 +22,31 @@ public function __construct(string $fileFormat = 'json')
     public function readFile(string $filename, bool $isArray = null): ?array
     {
         if (file_exists($filename)) {
-            $handle = fopen($filename, "r");
-            $result = json_decode(fread($handle, self::MAX_FILE_SIZE), $isArray);
-            fclose($handle);
-            $type = gettype($result);
-            if ($type === 'object') {
-                return get_object_vars($result);
-            } elseif ($type === 'array') {
-                return $result;
+            $fileNameParts = explode(".", $this->normalizeFilename($filename));
+            $fileFormat = end($fileNameParts);
+            if ($fileFormat === 'json') {
+                $handle = fopen($filename, "r");
+                $result = json_decode(fread($handle, self::MAX_FILE_SIZE), $isArray);
+                fclose($handle);
+                $type = gettype($result);
+                if ($type === 'object') {
+                    return get_object_vars($result);
+                } elseif ($type === 'array') {
+                    return $result;
+                }
+            } else if ($fileFormat === 'yaml' || $fileFormat === 'yml') {
+                $handle = fopen($filename, "r");
+                $result = Yaml::parse(fread($handle, self::MAX_FILE_SIZE), Yaml::PARSE_OBJECT_FOR_MAP);
+                fclose($handle);
+                $type = gettype($result);
+                if ($type === 'object') {
+                    return get_object_vars($result);
+                } elseif ($type === 'array') {
+                    return $result;
+                }
+            } else {
+                throw new \Exception("Unknown files format: \n" .
+                                    "use .json, .yaml (.yml) enstead \n");
             }
         } else {
             return null;

src/FilesDiffCommand.php

@@ -14,7 +14,7 @@ class FilesDiffCommand implements CommandInterface
 
     private function constructContent($accum, $item): string
     {
-        return $accum .= "\n    " . $item;
+        return $accum .= "\n    " . $this->normalizeData($item);
     }
 
     private function normalizeData($data): string
@@ -57,14 +57,17 @@ public function execute(CommandInterface $command = null): CommandInterface
             $file1Content = $this->filesDataItems[0];
             $file2Content = $this->filesDataItems[1];
 
-            $this->filesContent[] = "file1.json content:\n";
+            $filename1Path = explode("/", $this->filesPaths[0]);
+            $filename2Path = explode("/", $this->filesPaths[1]);
+
+            $this->filesContent[] = end($filename1Path) . " content:\n";
             $this->filesContent[] = array_reduce(
                 $file1Content,
                 [$this, 'constructContent'],
                 "{"
             ) . "\n}\n";
 
-            $this->filesContent[] = "file2.json content:\n";
+            $this->filesContent[] = end($filename2Path) . " content:\n";
             $this->filesContent[] = array_reduce(
                 $file2Content,
                 [$this, 'constructContent'],

src/Gendiff.php

@@ -9,5 +9,9 @@ function runGendiff(
     )
 ): void {
     $consoleApp = new ConsoleApp($commandFactory);
-    $consoleApp->run();
+    try {
+        $consoleApp->run();
+    } catch (\Exception $e) {
+        print_r("{$e->getMessage()}");
+    }
 }