update files reading executor

Author: Alexsey-VR

src/CommandFactory.php

@@ -5,21 +5,29 @@
 class CommandFactory implements CommandFactoryInterface
 {
     private string $docopt;
+    private const COMMAND_LIST = ["parse", "difference", "show"];
 
     public function __construct(string $docopt = '')
     {
         $this->docopt = $docopt;
     }
 
-    public function getCommand(string $commandType): CommandInterface | CommandLineParserInterface | null
+    public function getCommandTypeList(): array
     {
-        if (!strcmp($commandType, "parse")) {
-            return new CommandLineParser($this->docopt);
-        } elseif (!strcmp($commandType, "difference")) {
-            return new FilesDiffCommand();
-        } elseif (!strcmp($commandType, "show")) {
-            return new DisplayCommand();
+        return CommandFactory::COMMAND_LIST;
+    }
+
+    public function getCommand(string $commandType): CommandInterface | CommandLineParserInterface
+    {
+        switch ($commandType) {
+            case self::COMMAND_LIST[0]:
+                return new CommandLineParser($this->docopt);
+            case self::COMMAND_LIST[1]:
+                return new FilesDiffCommand();
+            case self::COMMAND_LIST[2]:
+                return new DisplayCommand();
+            default:
+                throw new \Exception("Unknown command");
         }
-        return null;
     }
 }

src/CommandFactoryInterface.php

@@ -4,5 +4,6 @@
 
 interface CommandFactoryInterface
 {
-    public function getCommand(string $commandType): CommandInterface | CommandLineParserInterface | null;
+    public function getCommandTypeList(): array;
+    public function getCommand(string $commandType): CommandInterface | CommandLineParserInterface;
 }

src/ConsoleApp.php

@@ -5,6 +5,8 @@
 class ConsoleApp
 {
     private string $docopt;
+    private array $commandTypeList;
+    private $currentCommand;
     private CommandFactoryInterface $commandFactory;
     private CommandLineParserInterface $commandLineParser;
     private CommandInterface $filesDiffCommand;
@@ -32,10 +34,30 @@ public function __construct()
         DOCOPT;
 
         $this->commandFactory = new CommandFactory($this->docopt);
+        $this->commandTypeList = $this->commandFactory->getCommandTypeList();
     }
 
     public function run(): void
     {
+        foreach ($this->commandTypeList as $commandType) {
+            $this->currentCommand = $this->commandFactory->getCommand($commandType);
+            switch ($commandType) {
+                case "parse":
+                    $this->cliData = $this->currentCommand->execute();
+                    break;
+                case "difference":
+                    $this->filesContent = $this->currentCommand->setFileReader(new FileReader())
+                                                               ->execute($this->cliData);
+                    break;
+                case "show":
+                    $this->currentCommand->execute($this->filesContent)
+                                         ->showDiffsToConsole();
+                    break;
+                default:
+                    throw new \Exception('unknown command type');
+            }
+        }
+/*
         if ($this->commandLineParser = $this->commandFactory->getCommand("parse")) {
             $this->cliData = $this->commandLineParser->execute();
         } else {
@@ -50,10 +72,11 @@ public function run(): void
         }
 
         if ($this->displayCommand = $this->commandFactory->getCommand("show")) {
-            $this->displayCommand->execute(/*(object)*/$this->filesContent)
+            $this->displayCommand->execute($this->filesContent)
                                  ->showDiffsToConsole();
         } else {
             throw new \Exception("can't create display command");
         }
+*/
     }
 }

src/DisplayCommand.php

@@ -25,21 +25,21 @@ public function execute(object $data): object
 
         $this->filesContent[] = "file1.json content:\n";
         $this->filesContent[] = array_reduce(
-            get_object_vars($data)['file1'],
+            $data->file1,
             [$this, 'constructContent'],
             "{"
         ) . "\r}\n";
 
         $this->filesContent[] = "file2.json content:\n";
         $this->filesContent[] = array_reduce(
-            get_object_vars($data)['file2'],
+            $data->file2,
             [$this, 'constructContent'],
             "{"
         ) . "\n}\n";
 
-        $file1Array = get_object_vars($data)['file1'];
+        $file1Array = $data->file1;
         $file1Keys = array_keys($file1Array);
-        $file2Array = get_object_vars($data)['file2'];
+        $file2Array = $data->file2;
         $this->filesDiffContent = array_map(
             function ($file1Key) use ($file1Array, $file2Array) {
                 if (array_key_exists($file1Key, $file2Array)) {

src/FilesDiffCommand.php

@@ -26,9 +26,9 @@ public function setFileReader(FileReaderInterface $fileReader): object
 
     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']);
+        if (isset($cliData->args['FILE1']) && isset($cliData->args['FILE2'])) {
+            $this->file1Content = $this->fileReader->readFile($cliData->args['FILE1']);
+            $this->file2Content = $this->fileReader->readFile($cliData->args['FILE2']);
         }
 
         return