using arguments array

Author: Alexsey-VR

src/CommandInterface.php

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

src/CommandLineParser.php

@@ -13,8 +13,9 @@ public function __construct(string $docopt)
         $this->docopt = $docopt;
     }
 
-    public function execute(): object | null
+    public function execute(): ?array
     {
-        return (new Docopt())->handle($this->docopt, array('version' => '1.0.6'));
+        return (new Docopt())->handle($this->docopt, array('version' => '1.0.6'))
+                             ->args;
     }
 }

src/CommandLineParserInterface.php

@@ -4,5 +4,5 @@
 
 interface CommandLineParserInterface
 {
-    public function execute(): object | null;
+    public function execute(): ?array;
 }

src/ConsoleApp.php

@@ -7,12 +7,9 @@ class ConsoleApp
     private string $docopt;
     private array $commandTypeList;
     private $currentCommand;
+    private array $cliData;
+    private array $filesContent;
     private CommandFactoryInterface $commandFactory;
-    private CommandLineParserInterface $commandLineParser;
-    private CommandInterface $filesDiffCommand;
-    private CommandInterface $displayCommand;
-    private object $cliData;
-    private object $filesContent;
 
     public function __construct()
     {
@@ -46,37 +43,16 @@ public function run(): void
                     $this->cliData = $this->currentCommand->execute();
                     break;
                 case "difference":
-                    $this->filesContent = $this->currentCommand->setFileReader(new FileReader())
-                                                               ->execute($this->cliData);
+                    $this->currentCommand->setFileReader(new FileReader());
+                    $this->filesContent = $this->currentCommand->execute($this->cliData);
                     break;
                 case "show":
-                    $this->currentCommand->execute($this->filesContent)
-                                         ->showDiffsToConsole();
+                    $this->currentCommand->execute($this->filesContent);
+                    $this->currentCommand->showDiffsToConsole();
                     break;
                 default:
                     throw new \Exception('unknown command type');
             }
         }
-/*
-        if ($this->commandLineParser = $this->commandFactory->getCommand("parse")) {
-            $this->cliData = $this->commandLineParser->execute();
-        } else {
-            throw new \Exception("can't create command line parser");
-        }
-
-        if ($this->filesDiffCommand = $this->commandFactory->getCommand("difference")) {
-            $this->filesContent = $this->filesDiffCommand->setFileReader(new FileReader())
-                                                         ->execute($this->cliData);
-        } else {
-            throw new \Exception("can't create files difference command");
-        }
-
-        if ($this->displayCommand = $this->commandFactory->getCommand("show")) {
-            $this->displayCommand->execute($this->filesContent)
-                                 ->showDiffsToConsole();
-        } else {
-            throw new \Exception("can't create display command");
-        }
-*/
     }
 }

src/DisplayCommand.php

@@ -11,35 +11,33 @@ public function __construct()
     {
         $this->filesContent = [];
         $this->filesDiffContent = [];
-
-        return $this;
     }
 
     private function constructContent($accum, $item)
     {
         return $accum .= "\n    " . $item;
     }
 
-    public function execute(object $data): object
+    public function execute(array $data): ?array
     {
 
         $this->filesContent[] = "file1.json content:\n";
         $this->filesContent[] = array_reduce(
-            $data->file1,
+            $data['file1'],
             [$this, 'constructContent'],
             "{"
         ) . "\r}\n";
 
         $this->filesContent[] = "file2.json content:\n";
         $this->filesContent[] = array_reduce(
-            $data->file2,
+            $data['file2'],
             [$this, 'constructContent'],
             "{"
         ) . "\n}\n";
 
-        $file1Array = $data->file1;
+        $file1Array = $data['file1'];
         $file1Keys = array_keys($file1Array);
-        $file2Array = $data->file2;
+        $file2Array = $data['file2'];
         $this->filesDiffContent = array_map(
             function ($file1Key) use ($file1Array, $file2Array) {
                 if (array_key_exists($file1Key, $file2Array)) {
@@ -55,20 +53,20 @@ function ($file1Key) use ($file1Array, $file2Array) {
             },
             $file1Keys
         );
-        return $this;
+        return
+        [
+            "content" => $this->filesContent,
+            "diff" => $this->filesDiffContent
+        ];
     }
 
     public function showContentToConsole()
     {
         echo implode("", $this->filesContent);
-
-        return $this;
     }
 
     public function showDiffsToConsole()
     {
         echo "{\n" . implode("", $this->filesDiffContent) . "}\n";
-
-        return $this;
     }
 }

src/FilesDiffCommand.php

@@ -13,26 +13,22 @@ public function __construct()
     {
         $this->file1Content = [];
         $this->file2Content = [];
-
-        return $this;
     }
 
-    public function setFileReader(FileReaderInterface $fileReader): object
+    public function setFileReader(FileReaderInterface $fileReader)
     {
         $this->fileReader = $fileReader;
-
-        return $this;
     }
 
-    public function execute(object $cliData): object
+    public function execute(array $cliData): ?array
     {
-        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']);
+        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
         ];