misc

Author: TomasVotruba

src/Analyzer/UnusedDefinitionsAnalyzer.php

@@ -18,6 +18,11 @@
 
 final readonly class UnusedDefinitionsAnalyzer
 {
+    /**
+     * @var string
+     */
+    private const MASK_VALUE_REGEX = '#(\:[\W\w]+)#';
+
     public function __construct(
         private SymfonyStyle $symfonyStyle,
         private DefinitionMasksResolver $definitionMasksResolver,
@@ -93,7 +98,7 @@ private function isMaskUsed(AbstractMask $mask, array $featureInstructions): boo
 
         if ($mask instanceof NamedMask) {
             // normalize :mask definition to regex
-            $regexMask = '#' . Strings::replace($mask->mask, '#(\:[\W\w]+)#', '(.*?)') . '#';
+            $regexMask = '#' . Strings::replace($mask->mask, self::MASK_VALUE_REGEX, '(.*?)') . '#';
             if ($this->isRegexDefinitionUsed($regexMask, $featureInstructions)) {
                 return true;
             }

src/Command/DuplicatedDefinitionsCommand.php

@@ -59,7 +59,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $classMethodContextDefinitionByClassMethodHash
         );
 
-        foreach ($classMethodContextDefinitionByClassMethodHash as $i => $classAndMethods) {
+        $i = 0;
+        foreach ($classMethodContextDefinitionByClassMethodHash as $classAndMethods) {
             $this->symfonyStyle->section(sprintf('%d)', $i + 1));
 
             foreach ($classAndMethods as $classMethodContextDefinition) {
@@ -78,6 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             $this->symfonyStyle->newLine();
+            ++$i;
         }
 
         $this->symfonyStyle->error(
@@ -92,8 +94,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /**
      * @template TItem as object
      *
-     * @param TItem[] $items
-     * @return array<int, TItem>
+     * @param array<string, TItem[]> $items
+     * @return array<string, TItem[]>
      */
     private function filterOutNotDuplicated(array $items): array
     {
@@ -103,6 +105,6 @@ private function filterOutNotDuplicated(array $items): array
             }
         }
 
-        return array_values($items);
+        return $items;
     }
 }