added console application interface

Author: Alexsey-VR

src/CommandFactory.php

@@ -11,10 +11,10 @@ public function __construct(string $docopt = '')
         $this->docopt = $docopt;
     }
 
-    public function getCommand(string $commandType): CommandInterface | OutputInterface | null
+    public function getCommand(string $commandType): CommandInterface | CommandLineParserInterface | null
     {
         if (!strcmp($commandType, "parse")) {
-            return new Output($this->docopt);
+            return new CommandLineParser($this->docopt);
         } elseif (!strcmp($commandType, "difference")) {
             return new FilesDiffCommand();
         } elseif (!strcmp($commandType, "show")) {

src/CommandFactoryInterface.php

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

src/Output.php renamed to src/CommandLineParser.php

@@ -4,7 +4,7 @@
 
 use Docopt;
 
-class Output implements OutputInterface
+class CommandLineParser implements CommandLineParserInterface
 {
     private string $docopt;
 
@@ -13,7 +13,7 @@ public function __construct(string $docopt)
         $this->docopt = $docopt;
     }
 
-    public function parseCommandData(): object
+    public function execute(): object | null
     {
         return (new Docopt())->handle($this->docopt, array('version' => '1.0.6'));
     }

src/CommandLineParserInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Differ;
+
+interface CommandLineParserInterface
+{
+    public function execute(): object | null;
+}

src/ConsoleApp.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Differ;
+
+class ConsoleApp
+{
+    private string $docopt;
+    private CommandFactoryInterface $commandFactory;
+    private CommandLineParserInterface $commandLineParser;
+    private CommandInterface $filesDiffCommand;
+    private CommandInterface $displayCommand;
+    private object $cliData;
+    private object $filesContent;
+
+    public function __construct()
+    {
+        $this->docopt = <<<'DOCOPT'
+        gendiff -h
+
+        Generate diff
+
+        Usage:
+          gendiff (-h|--help)
+          gendiff (-v|--version)
+          gendiff [Options]... FILE1 FILE2
+
+        Options:
+          -h --help                  Show this screen
+          -v --version               Show version
+          --format <fmt>             Report format [default: stylish]
+
+        DOCOPT;
+
+        $this->commandFactory = new CommandFactory($this->docopt);
+    }
+
+    public function run(): void
+    {
+        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(/*(object)*/$this->filesContent)
+                                 ->showDiffsToConsole();
+        } else {
+            throw new \Exception("can't create display command");
+        }
+    }
+}

src/ConsoleAppInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Differ;
+
+interface ConsoleAppInterface
+{
+    public function run(): void;
+}

src/Gendiff.php

@@ -4,48 +4,6 @@
 
 function runGendiff(): void
 {
-
-    $docopt = <<<'DOCOPT'
-    gendiff -h
-
-    Generate diff
-
-    Usage:
-      gendiff (-h|--help)
-      gendiff (-v|--version)
-      gendiff [Options]... FILE1 FILE2
-
-    Options:
-      -h --help                  Show this screen
-      -v --version               Show version
-      --format <fmt>             Report format [default: stylish]
-
-    DOCOPT;
-
-    $factory = new CommandFactory($docopt);
-
-    $outputParser = $factory->getCommand("parse");
-    if (is_null($outputParser)) {
-        print_r("error: can't create command to parse command data\n");
-    } else {
-        $cliData = $outputParser->parseCommandData();
-    }
-
-    $filesDiffCommand = $factory->getCommand("difference");
-    if (is_null($filesDiffCommand)) {
-        print_r("error: can't create command to get files difference\n");
-        exit;
-    } else {
-        $filesContent = $filesDiffCommand->setFileReader(new FileReader())
-                                         ->execute($cliData);
-    }
-
-    $displayCommand = $factory->getCommand("show");
-    if (is_null($displayCommand)) {
-        print_r("error: can't create command to show differences to console\n");
-        exit;
-    } else {
-        $displayCommand->execute((object)$filesContent)
-                       ->showDiffsToConsole();
-    }
+    $consoleApp = new ConsoleApp();
+    $consoleApp->run();
 }