misc

Author: TomasVotruba

src/Command/DuplicatedDefinitionsCommand.php

@@ -41,19 +41,15 @@ protected function configure(): void
             'Find duplicated definitions in *Context.php, use just one to keep definitions clear and to the point'
         );
 
-        $this->addArgument(
-            'test-directory',
-            InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-            'One or more paths to check or *.Context.php and feature.yml files'
-        );
+        $this->addArgument('test-directory', InputArgument::REQUIRED, 'Director with *.Context.php definition files');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $testDirectories = (array) $input->getArgument('test-directory');
-        Assert::allDirectory($testDirectories);
+        $testDirectory = (string) $input->getArgument('test-directory');
+        Assert::directory($testDirectory);
 
-        $contextFileInfos = $this->behatMetafilesFinder->findContextFiles($testDirectories);
+        $contextFileInfos = $this->behatMetafilesFinder->findContextFiles([$testDirectory]);
 
         if ($contextFileInfos === []) {
             $this->symfonyStyle->error('No *.Context files found. Please provide correct test directory');
@@ -100,31 +96,27 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         // keep only duplicated
-        foreach ($classMethodContextDefinitionByClassMethodHash as $hash => $classAndMethods) {
-            if (count($classAndMethods) < 2) {
-                unset($classMethodContextDefinitionByClassMethodHash[$hash]);
-            }
-
-        }
+        $classMethodContextDefinitionByClassMethodHash = $this->filterOutNotDuplicated($classMethodContextDefinitionByClassMethodHash);
 
-        foreach ($classMethodContextDefinitionByClassMethodHash as $classAndMethods) {
-            $this->symfonyStyle->warning('Found duplicated class classMethod contents');
+        foreach ($classMethodContextDefinitionByClassMethodHash as $i => $classAndMethods) {
+            $this->symfonyStyle->section(sprintf('%d)', $i + 1));
 
             foreach ($classAndMethods as $classMethodContextDefinition) {
                 /** @var ClassMethodContextDefinition $classMethodContextDefinition */
+                $relativeFilePath = substr($classMethodContextDefinition->getFilePath(), strlen($testDirectory ) + 1);
+
                 $this->symfonyStyle->writeln(
-                    ' * ' . $classMethodContextDefinition->getClass() . '::' . $classMethodContextDefinition->getMethodName() . ' in '
-                );
-                $this->symfonyStyle->writeln(
-                    $classMethodContextDefinition->getFilePath() . ':' . $classMethodContextDefinition->getMethodLine()
+                    $relativeFilePath . ':' . $classMethodContextDefinition->getMethodLine()
                 );
 
-                $this->symfonyStyle->writeln('Mask: <fg=green>' . $classMethodContextDefinition->getMask() . '</>');
+                $this->symfonyStyle->writeln('Mask: <fg=green>"' . $classMethodContextDefinition->getMask() . '"</>');
                 $this->symfonyStyle->newLine();
             }
+
+            $this->symfonyStyle->newLine();
         }
 
-        //        $this->symfonyStyle->error(sprintf('Found %d duplicated class classMethod contents', count($classMethodContextDefinitionByClassMethodHash)));
+        $this->symfonyStyle->error(sprintf('Found %d duplicated class classMethod contents', count($classMethodContextDefinitionByClassMethodHash)));
 
         return Command::FAILURE;
     }
@@ -134,4 +126,21 @@ private function createClassMethodHash(ClassMethod $classMethod): string
         $printedClassMethod = $this->printerStandard->prettyPrint((array) $classMethod->stmts);
         return sha1($printedClassMethod);
     }
+
+    /**
+     * @template TItem as object
+     *
+     * @param TItem[] $items
+     * @return array<int, TItem>
+     */
+    private function filterOutNotDuplicated(array $items): array
+    {
+        foreach ($items as $hash => $classAndMethods) {
+            if (count($classAndMethods) < 2) {
+                unset($items[$hash]);
+            }
+        }
+
+        return array_values($items);
+    }
 }