added type checking to files diff command

Author: Alexsey-VR

src/CommandFactory.php

@@ -15,7 +15,7 @@
 
 class CommandFactory implements CommandFactoryInterface
 {
-    private \Docopt $parser;
+    private \Docopt|DocoptDoubleInterface $parser;
     private FileReaderInterface $fileReader;
     private CommandFactoryInterface $formatters;
 
@@ -26,7 +26,7 @@ class CommandFactory implements CommandFactoryInterface
     ];
 
     public function __construct(
-        \Docopt $parser,
+        \Docopt|DocoptDoubleInterface $parser,
         FileReaderInterface $fileReader,
         CommandFactoryInterface $formatters
     ) {

src/CommandLineParser.php

@@ -45,6 +45,7 @@ private function getDocoptArgs(mixed $args): array
         /**
          * @var array<string,string>
          */
+
         $result = array_reduce(
             $keys,
             function ($accum, $key) use ($keys, $values): array {

src/DocoptDouble.php

@@ -2,10 +2,10 @@
 
 namespace Differ;
 
-class DocoptDouble implements \Docopt
+class DocoptDouble implements DocoptDoubleInterface
 {
     /**
-     * @var array<string,string>
+     * @var array
      */
     public array $args;
 
@@ -20,10 +20,7 @@ public function __construct(string $format = "stylish")
         ];
     }
 
-    /**
-     * @return mixed
-     */
-    public function handle()
+    public function handle(): DocoptDoubleInterface
     {
         return $this;
     }

src/DocoptDoubleInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Differ;
+
+interface DocoptDoubleInterface
+{
+    public function handle(): \Docopt\Response|DocoptDoubleInterface;
+}

src/FilesDiffCommand.php

@@ -72,8 +72,8 @@ private function normalizeData(mixed $data): mixed
      * @return array<mixed,mixed>
      */
     private function getContent(
-        $fileContentKeys,
-        $initContentDescriptor
+        array $fileContentKeys,
+        array $initContentDescriptor
     ): array {
         $result = array_reduce(
             $fileContentKeys,
@@ -222,12 +222,14 @@ function ($differenceDescriptor, $fileKey) {
                 if (is_array($file1Item)) {
                     $file1Content = in_array($fileKey, $file1Item) ? $file1Item[$fileKey] : null;
                 }
+
                 $file2Content = null;
                 if (is_array($file2Item)) {
                     $file2Content = in_array($fileKey, $file2Item) ? $file2Item[$fileKey] : null;
                 }
 
                 $nextItemIsNotArray = !(is_array($file1Item) && is_array($file2Item));
+
                 $currentStatus = "not changed";
                 if (is_array($differenceDescriptor)) {
                     $tmpStatus = $differenceDescriptor['status'];
@@ -281,7 +283,7 @@ function ($differenceDescriptor, $fileKey) {
         );
     }
 
-    public function execute(CommandLineParserInterface $command): FilesDiffCommandInterface
+     public function execute(CommandLineParserInterface $command): FilesDiffCommandInterface
     {
         $fileNames = $command->getFileNames();
         if (is_array($fileNames)) {

src/FilesDiffCommandInterface.php

@@ -22,4 +22,9 @@ public function getContent2Descriptor(): array;
      * @return array<mixed,mixed>
      */
     public function getDifferenceDescriptor(): array;
+
+    /**
+     * @return array<int,string>
+     */
+    public function getStatusKeys(): array;
 }

src/Formatters/JSONCommand.php

@@ -3,6 +3,7 @@
 namespace Differ\Formatters;
 
 use Differ\CommandInterface;
+use Differ\FilesDiffCommandInterface;
 use Differ\FormattersInterface;
 
 class JSONCommand implements FormattersInterface
@@ -12,7 +13,7 @@ class JSONCommand implements FormattersInterface
     public string $filesContentString;
     public string $filesDiffsString;
 
-    public function execute(CommandInterface $command): FormattersInterface
+    public function execute(FilesDiffCommandInterface $command): FormattersInterface
     {
         $file1Name = $command->getFile1Name();
         $file2Name = $command->getFile2Name();