improved maintainability

Author: Alexsey-VR

src/ConsoleApp.php

@@ -30,8 +30,8 @@ public function run(): void
         $commandFactory = $this->commandFactory;
         foreach ($this->flowSteps as $step) {
             $currentCommand = $commandFactory->createCommand($step);
-            $nextCommand = $currentCommand->execute($this->initCommand);
-            $this->initCommand = $nextCommand;
+            $this->nextCommand = $currentCommand->execute($this->initCommand);
+            $this->initCommand = $this->nextCommand;
         }
     }
 }

src/Differ.php

@@ -9,8 +9,11 @@
 use Differ\DisplayCommand;
 use Differ\Formatters;
 
-function genDiff(string $pathToFile1, string $pathToFile2, string $format = 'stylish')
-{
+function genDiff(
+    string $pathToFile1,
+    string $pathToFile2,
+    string $format = 'stylish'
+): string {
     $commandFactory = new CommandFactory(
         new \Docopt(),
         new FileReader(),

src/Formatters.php

@@ -17,21 +17,20 @@ class Formatters implements CommandFactoryInterface
 
     public function createCommand(string $commandKey): CommandInterface
     {
-        $requestedCommand = null;
         switch ($commandKey) {
             case self::FORMAT_KEYS["stylish"]:
-                $requestedCommand = new StylishCommand();
+                $this->formatCommand = new StylishCommand();
                 break;
             case self::FORMAT_KEYS["plain"]:
-                $requestedCommand = new PlainCommand();
+                $this->formatCommand = new PlainCommand();
                 break;
             case self::FORMAT_KEYS["json"]:
-                $requestedCommand = new JSONCommand();
+                $this->formatCommand = new JSONCommand();
                 break;
             default:
                 return throw new DifferException("input error: unknown output format\n");
         }
 
-        return $requestedCommand;
+        return $this->formatCommand;
     }
 }