files processing and console output are separated

Author: Alexsey-VR

composer.json

@@ -17,8 +17,10 @@
             "vendor/docopt/docopt/src/docopt.php",
             "src/Gendiff.php",
             "src/CommandInterface.php",
-            "src/Command.php",
+            "src/FilesDiffCommand.php",
+            "src/DisplayCommand.php",
             "src/OutputInterface.php",
+            "src/Output.php",
             "src/FileReaderInterface.php",
             "src/FileReader.php"
         ]

src/Command.php

@@ -4,5 +4,5 @@
 
 interface CommandInterface
 {
-    public function execute(object $cliData);
+    public function execute(object $data): object | null;
 }

src/CommandInterface.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App;
+
+use App\CommandInterface;
+
+class DisplayCommand implements CommandInterface
+{
+    private array $filesDiffContent;
+
+    public function __construct()
+    {
+        $this->filesDiffContent = [];
+    }
+
+    private function constructContent($accum, $item)
+    {
+        return $accum .= "\n    " . $item;
+    }
+
+    public function execute(object $data): object
+    {
+
+        $this->filesDiffContent[] = "file1.json content:\n";
+        $this->filesDiffContent[] = array_reduce(
+            get_object_vars($data)['file1'],
+            [$this, 'constructContent'],
+            "{") . "\r}\n";
+
+        $this->filesDiffContent[] = "file2.json content:\n";
+        $this->filesDiffContent[] = array_reduce(
+            get_object_vars($data)['file2'],
+            [$this, 'constructContent'],
+            "{") . "\n}\n";
+
+        return $this;
+    }
+
+    public function showDiffsToConsole()
+    {
+        echo implode("", $this->filesDiffContent);
+    }
+}

src/DisplayCommand.php

@@ -8,6 +8,10 @@ class FileReader implements FileReaderInterface
 {
     private const MAX_FILE_SIZE = 4096;
 
+    public function __construct()
+    {
+    }
+
     public function readFile(string $filename): array | null
     {
         if (file_exists($filename)) {
@@ -18,7 +22,7 @@ public function readFile(string $filename): array | null
             if ($type === 'object') {
                 return (get_object_vars($result));
             } elseif ($type === 'array') {
-                return array_keys($result);
+                return $result;
             } else {
                 return null;
             }

src/FileReader.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App;
+
+use App\CommandInterface;
+use App\FileReaderInterface;
+use App\FileReader;
+
+class FilesDiffCommand implements CommandInterface
+{
+    private FileReaderInterface $fileReader;
+    private array $file1Content;
+    private array $file2Content;
+    private array $filesDiffContent;
+
+    public function __construct()
+    {
+        $this->file1Content = [];
+        $this->file2Content = [];
+    }
+
+    public function setFileReader(FileReaderInterface $fileReader): object
+    {
+        $this->fileReader = $fileReader;
+
+        return $this;
+    }
+
+    public function execute(object $cliData): object
+    {
+        if (isset($cliData['FILE1']) && isset($cliData['FILE2'])) {
+            $this->file1Content = $this->fileReader->readFile($cliData['FILE1']);
+            $this->file2Content = $this->fileReader->readFile($cliData['FILE2']);
+        }
+
+        return
+        (object)[
+            'file1' => $this->file1Content,
+            'file2' => $this->file2Content
+        ];
+    }
+}

src/FilesDiffCommand.php

@@ -2,9 +2,10 @@
 
 namespace App;
 
-use Docopt;
 use App\OutputInterface;
-use App\Command;
+use App\Output;
+use App\FilesDiffCommand;
+use App\DisplayCommand;
 use App\FileReader;
 
 function runGendiff(): void
@@ -27,16 +28,14 @@ function runGendiff(): void
 
     DOCOPT;
 
-    $output = new class implements OutputInterface
-    {
-        public function parseCommandData(string $docopt): object
-        {
-            return Docopt::handle($docopt, array('version' => '1.0.6'));
-        }
-    };
-
-    $fileReader = new FileReader();
-    $cliData = $output->parseCommandData($docopt);
-    $command = new ViewFilesCommand($fileReader);
-    $command->execute($cliData);
+    $output = new Output($docopt);
+    $cliData = $output->parseCommandData();
+
+    $filesDiffCommand = new FilesDiffCommand();
+    $filesContent = $filesDiffCommand->setFileReader(new FileReader())
+                                     ->execute($cliData);
+
+    $displayCommand = new DisplayCommand();
+    $displayCommand->execute((object)$filesContent)
+                   ->showDiffsToConsole();
 }

src/Gendiff.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App;
+
+use App\OutputInterface;
+use Docopt;
+
+class Output implements OutputInterface
+{
+    private string $docopt;
+
+    public function __construct(string $docopt)
+    {
+        $this->docopt = $docopt;
+    }
+
+    public function parseCommandData(): object
+    {
+        return (new Docopt)->handle($this->docopt, array('version' => '1.0.6'));
+    }
+}

src/Output.php

@@ -4,5 +4,5 @@
 
 interface OutputInterface
 {
-    public function parseCommandData(string $docopt): object;
+    public function parseCommandData(): object;
 }