update architecture

Alexsey-VR · Alexsey-VR · commit 5e94d254a683 · 2025-08-30T15:41:04.000Z
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "type": "project",
     "require": {
         "docopt/docopt": "^1.0.6",
-        "symfony/yaml": "*"
+        "symfony/yaml": "^7.3.2"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.7",
diff --git a/composer.lock b/composer.lock
diff --git a/docopt.txt b/docopt.txt
@@ -0,0 +1,13 @@
+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]
diff --git a/fixtures/docopt.txt b/fixtures/docopt.txt
diff --git a/fixtures/filesDiffs.txt b/fixtures/filesDiffs.txt
@@ -1,7 +1,8 @@
 {
-    hexlet.io
-  - 50
-  + 20
-  - 123.234.53.22
-  - 
+    host: hexlet.io
+  - timeout: 50
+  + timeout: 20
+  - proxy: 123.234.53.22
+  - follow: false
+  + verbose: true
 }
diff --git a/src/CommandFactory.php b/src/CommandFactory.php
@@ -4,21 +4,24 @@
 
 class CommandFactory implements CommandFactoryInterface
 {
-    private string $docopt;
+    private $parser;
+    private $fileReader;
 
-    public function __construct(string $docopt = '')
+    public function __construct($parser, $fileReader)
     {
-        $this->docopt = $docopt;
+        $this->parser = $parser;
+        $this->fileReader = $fileReader;
     }
 
     public function getCommand(string $commandType): ?CommandInterface
     {
         switch ($commandType) {
             case "parse":
-                $requestedCommand = new CommandLineParser($this->docopt);
+                $requestedCommand = new CommandLineParser($this->parser);
                 break;
             case "difference":
-                $requestedCommand = new FilesDiffCommand();
+                $requestedCommand = (new FilesDiffCommand())
+                                        ->setFileReader($this->fileReader);
                 break;
             case "show":
                 $requestedCommand = new DisplayCommand();
diff --git a/src/CommandInterface.php b/src/CommandInterface.php
@@ -4,5 +4,5 @@
 
 interface CommandInterface
 {
-    public function execute(CommandInterface $data = null): CommandInterface;
+    public function execute(CommandInterface $command = null): CommandInterface;
 }
diff --git a/src/CommandLineParser.php b/src/CommandLineParser.php
@@ -2,23 +2,28 @@
 
 namespace Differ;
 
-use Docopt;
-
 class CommandLineParser implements CommandInterface
 {
-    private $docopt;
+    private string $parserDescriptor;
+    private $parser;
     private array $args;
 
-    public function __construct(string $docopt = "")
+    public function __construct($parser = null)
     {
-        $this->docopt = $docopt;
+        $this->parser = $parser;
+
+        $filename = __DIR__ . "/../docopt.txt";
+        $handler = @fopen($filename, 'r');
+        $filesize = filesize($filename);
+        $this->parserDescriptor = fread($handler, $filesize);
+        fclose($handler);
     }
 
     public function execute(CommandInterface $command = null): CommandInterface
     {
         if (is_null($command)) {
-            $this->args = (new Docopt())->handle($this->docopt, array('version' => '1.0.6'))
-                                        ->args;
+            $objArgs = $this->parser->handle($this->parserDescriptor, array('version' => '1.0.6'));
+            $this->args = $objArgs->args;
         }
 
         return $this;
diff --git a/src/ConsoleApp.php b/src/ConsoleApp.php
@@ -10,11 +10,9 @@ class ConsoleApp
     private FileReaderInterface $fileReader;
 
     public function __construct(
-        CommandFactoryInterface $commandFactory,
-        FileReaderInterface $fileReader
+        CommandFactoryInterface $commandFactory
     ) {
         $this->commandFactory = $commandFactory;
-        $this->fileReader = $fileReader;
     }
 
     public function run(): void
@@ -25,7 +23,6 @@ public function run(): void
 
         $this->currentCommand = $this->commandFactory->getCommand("difference");
         $this->nextCommand = $this->currentCommand
-                                  ->setFileReader($this->fileReader)
                                   ->execute($this->nextCommand);
 
         $this->currentCommand = $this->commandFactory->getCommand("show");
diff --git a/src/Differ.php b/src/Differ.php
@@ -10,7 +10,10 @@
 
 function genDiff(string $pathToFile1, string $pathToFile2)
 {
-    $commandFactory = new CommandFactory();
+    $commandFactory = new CommandFactory(
+        new \Docopt(),
+        new FileReader()
+    );
     $parserCommand = $commandFactory->getCommand('parse');
     $fileNames = [
         "FILE1" => $pathToFile1,
@@ -19,8 +22,7 @@ function genDiff(string $pathToFile1, string $pathToFile2)
     $nextCommand = $parserCommand->setFileNames($fileNames);
 
     $currentCommand = $commandFactory->getCommand('difference');
-    $nextCommand = $currentCommand->setFileReader(new FileReader())
-                                  ->execute($nextCommand);
+    $nextCommand = $currentCommand->execute($nextCommand);
 
     $currentCommand = $commandFactory->getCommand('show');
     return $currentCommand->execute($nextCommand);
diff --git a/src/DocoptDouble.php b/src/DocoptDouble.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Differ;
+
+class DocoptDouble
+{
+    public array $args;
+
+    public function __construct()
+    {
+        $this->args = [
+            "--help" => null,
+            "--version" => null,
+            "Options" => 0,
+            "FILE1" => "file1.json",
+            "FILE2" => "file2.json"
+        ];
+    }
+
+    public function handle(string $data, array $default)
+    {
+        return $this;
+    }
+}
diff --git a/src/FileReader.php b/src/FileReader.php
@@ -5,8 +5,14 @@
 class FileReader implements FileReaderInterface
 {
     private const MAX_FILE_SIZE = 4096;
+    private string $fileFormat;
 
-    public function readFile(string $filename, bool $isArray = null): array | null
+    public function __construct(string $fileFormat = 'json')
+    {
+        $this->fileFormat = $fileFormat;
+    }
+
+    public function readFile(string $filename, bool $isArray = null): ?array
     {
         if (file_exists($filename)) {
             $handle = fopen($filename, "r");
diff --git a/src/FileReaderInterface.php b/src/FileReaderInterface.php
@@ -4,5 +4,5 @@
 
 interface FileReaderInterface
 {
-    public function readFile(string $filename): array | null;
+    public function readFile(string $filename): ?array;
 }
diff --git a/src/Gendiff.php b/src/Gendiff.php
@@ -2,31 +2,12 @@
 
 namespace Differ;
 
-function runGendiff(CommandFactoryInterface $commandFactory = null): 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;
-
-    if (is_null($commandFactory)) {
-        $commandFactory = new CommandFactory($docopt);
-    }
-
-    $fileReader = new FileReader();
-
-    $consoleApp = new ConsoleApp($commandFactory, $fileReader);
+function runGendiff(
+    $commandFactory = new CommandFactory(
+        new \Docopt(),
+        new FileReader()
+    )
+): void {
+    $consoleApp = new ConsoleApp($commandFactory);
     $consoleApp->run();
 }
diff --git a/tests/CommandFactoryTest.php b/tests/CommandFactoryTest.php
@@ -9,17 +9,24 @@
 use Differ\CommandLineParser;
 use Differ\FilesDiffCommand;
 use Differ\DisplayCommand;
+use Differ\FileReader;
+use Differ\DocoptDouble;
 
 #[CoversClass(CommandFactory::class)]
 #[CoversClass(CommandLineParser::class)]
 #[CoversClass(FilesDiffCommand::class)]
 #[CoversClass(DisplayCommand::class)]
+#[CoversClass(DocoptDouble::class)]
+#[CoversClass(FileReader::class)]
 class CommandFactoryTest extends TestCase
 {
     #[CoversFunction(CommandFactory::class, 'getCommand')]
     public function testGetCommand()
     {
-        $commandFactory = new CommandFactory();
+        $commandFactory = new CommandFactory(
+            new DocoptDouble(),
+            new FileReader()
+        );
 
         // Test for CommandLineParser
         $this->assertInstanceOf(CommandLineParser::class, $commandFactory->getCommand('parse'));
diff --git a/tests/CommandLineParserTest.php b/tests/CommandLineParserTest.php
@@ -6,10 +6,12 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use Differ\CommandLineParser;
+use Differ\DocoptDouble;
 
 #[CoversClass(CommandLineParser::class)]
 #[CoversMethod(CommandLineParser::class, 'setFileNames')]
 #[CoversMethod(CommandLineParser::class, 'getFileNames')]
+#[CoversClass(DocoptDouble::class)]
 class CommandLineParserTest extends TestCase
 {
     public function testFileNames()
@@ -29,10 +31,17 @@ public function testFileNames()
 
     public function testExecute()
     {
-        $cmdLineParser = new CommandLineParser();
+        $parser = new DocoptDouble();
+        $cmdLineParser = new CommandLineParser($parser);
 
-        $stub = $this->createStub(CommandLineParser::class);
+        ob_start();
+        $cmdLineParser->execute();
+        $outputBuffer = ob_get_clean();
 
-        $this->assertInstanceOf(CommandLineParser::class, $cmdLineParser->execute($stub));
+        $this->assertEquals(
+            "",
+            $outputBuffer
+        );
     }
+        
 }
diff --git a/tests/ConsoleAppTest.php b/tests/ConsoleAppTest.php
@@ -16,50 +16,26 @@
 #[CoversClass(FilesDiffCommand::class)]
 #[CoversClass(FileReader::class)]
 #[CoversMethod(ConsoleApp::class, 'run')]
+#[CoversClass(DocoptDouble::class)]
+#[CoversClass(CommandLineParser::class)]
 class ConsoleAppTest extends TestCase
 {
     public function testConsoleAppRunning()
     {
-        $outputString = "{\n" .
-        "    hexlet.io\n" .
-        "  - 50\n" .
-        "  + 20\n" .
-        "  - 123.234.53.22\n" .
-        "  - \n" .
-        "}\n";
-
-        $commandLineParserStubToGetContent = $this->createConfiguredStub(
-            CommandLineParser::class,
-            [
-                'getFileNames' => [
-                    'FILE1' => __DIR__ . "/../file1.json",
-                    'FILE2' => __DIR__ . "/../file2.json"
-                ]
-            ]
-        );
-        $cmdLineParserStub = $this->createConfiguredStub(
-            CommandLineParser::class,
-            [
-                'execute' => $commandLineParserStubToGetContent
-            ]
+        $commandFactory = new CommandFactory(
+            new DocoptDouble(),
+            new FileReader()
         );
 
-        $filesDiffCommand = new FilesDiffCommand();
-        $displayCommand = new DisplayCommand();
+        $consoleApp = new ConsoleApp($commandFactory);
 
-        $commandFactoryMock = $this->createMock(CommandFactory::class);
-        $commandFactoryMock->expects($this->exactly(3))
-                           ->method('getCommand')
-                           ->willReturnMap([
-                                ['parse', $cmdLineParserStub],
-                                ['difference', $filesDiffCommand],
-                                ['show', $displayCommand]
-                           ]);
-        $fileReader = new FileReader();
-
-        $consoleApp = new ConsoleApp($commandFactoryMock, $fileReader);
+        ob_start();
         $consoleApp->run();
+        $outputBuffer = ob_get_clean();
 
-        $this->expectOutputString($outputString);
+        $this->assertStringEqualsFile(
+            __DIR__ . "/../fixtures/filesDiffs.txt",
+            $outputBuffer
+        );
     }
 }
diff --git a/tests/GenDiffUserTest.php b/tests/GenDiffUserTest.php
diff --git a/tests/GendiffTest.php b/tests/GendiffTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`		`- hexlet.io`
`3`		`- - 50`
`4`		`- + 20`
`5`		`- - 123.234.53.22`
`6`		`- -`
	`2`	`+ host: hexlet.io`
	`3`	`+ - timeout: 50`
	`4`	`+ + timeout: 20`
	`5`	`+ - proxy: 123.234.53.22`
	`6`	`+ - follow: false`
	`7`	`+ + verbose: true`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`
`5`	`5`	`interface CommandInterface`
`6`	`6`	`{`
`7`		`- public function execute(CommandInterface $data = null): CommandInterface;`
	`7`	`+ public function execute(CommandInterface $command = null): CommandInterface;`
`8`	`8`	`}`