update formatters

Author: Alexsey-VR

Makefile

@@ -7,6 +7,9 @@ update:
 validate:
 	composer validate
 
+analyze:
+	./vendor/bin/phpstan analyze --level 3 src tests
+
 lint:
 	composer exec --verbose phpcs -- --standard=PSR12 src bin
 

composer.json

@@ -8,7 +8,8 @@
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.7",
-        "phpunit/phpunit": "^12.2.5"
+        "phpunit/phpunit": "^12.2.5",
+        "phpstan/phpstan": "^2.1.29"
     },
     "license": "MIT",
     "autoload": {

composer.lock

@@ -17,25 +17,26 @@ class CommandFactory implements CommandFactoryInterface
 {
     private mixed $parser;
     private FileReaderInterface $fileReader;
+/*
     private const array FORMAT_KEYS = [
         "stylish" => "stylish",
         "plain" => "plain",
         "json" => "json"
     ];
-
+*/
     public function __construct(
         mixed $parser,
         FileReaderInterface $fileReader
     ) {
         $this->parser = $parser;
         $this->fileReader = $fileReader;
     }
-
+/*
     public function getFormatKeys(): array
     {
         return self::FORMAT_KEYS;
     }
-
+*/
     public function getCommand(string $commandType): ?CommandInterface
     {
         switch ($commandType) {
@@ -46,6 +47,7 @@ public function getCommand(string $commandType): ?CommandInterface
                 $requestedCommand = (new FilesDiffCommand())
                                         ->setFileReader($this->fileReader);
                 break;
+            /*
             case self::FORMAT_KEYS["stylish"]:
                 $requestedCommand = new StylishCommand();
                 break;
@@ -55,6 +57,7 @@ public function getCommand(string $commandType): ?CommandInterface
             case self::FORMAT_KEYS["json"]:
                 $requestedCommand = new JSONCommand();
                 break;
+            */
             case "format":
                 $requestedCommand = new Formatters();
                 break;

src/CommandFactory.php

@@ -2,9 +2,32 @@
 
 namespace Differ;
 
+use Differ\Formatters\StylishCommand;
+use Differ\Formatters\PlainCommand;
+use Differ\Formatters\JSONCommand;
+
 class Formatters implements CommandInterface
 {
     private CommandInterface $formatCommand;
+    private const array FORMAT_KEYS = [
+        "stylish" => "stylish",
+        "plain" => "plain",
+        "json" => "json"
+    ];
+
+    private function createCommand(string $commandKey): CommandInterface
+    {
+        switch ($commandKey) {
+            case self::FORMAT_KEYS["stylish"]:
+                return new StylishCommand();
+            case self::FORMAT_KEYS["plain"]:
+                return new PlainCommand();
+            case self::FORMAT_KEYS["json"]:
+                return new JSONCommand();
+            default:
+                return throw new DifferException("input error: unknown output format\nUse gendiff -h\n");
+        }
+    }
 
     public function selectFormat(CommandInterface $command = null): CommandInterface
     {
@@ -13,14 +36,11 @@ public function selectFormat(CommandInterface $command = null): CommandInterface
             new FileReader()
         );
         $currentFormat = strtolower($command->getFormat());
-        $formatKeys = $commandFactory->getFormatKeys();
-        if (in_array($currentFormat, $formatKeys)) {
-            $this->formatCommand = $commandFactory->getCommand(
-                $currentFormat
-            );
-        } else {
-            throw new DifferException("input error: unknown output format\nUse gendiff -h\n");
-        }
+        //$formatKeys = $commandFactory->getFormatKeys();
+
+        $this->formatCommand = $this->createCommand(
+            $currentFormat
+        );
 
         return $this;
     }

src/Formatters.php

@@ -24,6 +24,7 @@
 #[CoversClass(DifferException::class)]
 #[CoversClass(StylishCommand::class)]
 #[CoversClass(PlainCommand::class)]
+#[CoversMethod(CommandFactory::class, 'getCommand')]
 class CommandFactoryTest extends TestCase
 {
     private $commandFactory;
@@ -36,21 +37,21 @@ public function setUp(): void
         );
     }
 
-    #[CoversFunction(CommandFactory::class, 'getCommand')]
+
     public function testGetCommand()
     {
         // Test for CommandLineParser
         $this->assertInstanceOf(CommandLineParser::class, $this->commandFactory->getCommand('parse'));
 
         // Test for FilesDiffCommand
         $this->assertInstanceOf(FilesDiffCommand::class, $this->commandFactory->getCommand('difference'));
-
+/*
         // Test for FilesDiffCommand
         $this->assertInstanceOf(StylishCommand::class, $this->commandFactory->getCommand('stylish'));
 
         // Test for FilesDiffCommand
         $this->assertInstanceOf(PlainCommand::class, $this->commandFactory->getCommand('plain'));
-
+*/
         // Test for DisplayCommand
         $this->assertInstanceOf(DisplayCommand::class, $this->commandFactory->getCommand('show'));
 

tests/CommandFactoryTest.php

@@ -28,6 +28,7 @@
 #[CoversClass(StylishCommand::class)]
 #[CoversClass(PlainCommand::class)]
 #[CoversClass(JSONCommand::class)]
+
 class FormattersTest extends TestCase
 {
     public static function getParserArguments(): array