misc

Author: TomasVotruba

src/Analyzer/MaskAnalyzer.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Behastan\Analyzer;
+
+final class MaskAnalyzer
+{
+    /**
+     * @var string
+     */
+    private const MASK_REGEX = '#(\:[\W\w]+)#';
+
+    public static function isRegex(string $rawMask): bool
+    {
+        if (str_starts_with($rawMask, '/')) {
+            return true;
+        }
+
+        return str_ends_with($rawMask, '#');
+    }
+
+    public static function isValueMask(string $rawMask): bool
+    {
+        preg_match(self::MASK_REGEX, $rawMask, $match);
+
+        return $match !== [];
+    }
+}

src/Command/StatsCommand.php

@@ -5,6 +5,7 @@
 namespace Behastan\Command;
 
 use Behastan\Analyzer\ClassMethodContextDefinitionsAnalyzer;
+use Behastan\Analyzer\MaskAnalyzer;
 use Behastan\Finder\BehatMetafilesFinder;
 use Behastan\UsedInstructionResolver;
 use Symfony\Component\Console\Command\Command;
@@ -59,14 +60,24 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $featureInstructions = $this->usedInstructionResolver->resolveInstructionsFromFeatureFiles($featureFiles);
         $classMethodContextDefinitions = $this->classMethodContextDefinitionsAnalyzer->resolve($contextFiles);
 
-        foreach ($classMethodContextDefinitions as $i => $classMethodContextDefinition) {
-            $section = sprintf('%d) %s', $i + 1, $classMethodContextDefinition->getMask());
-            $this->symfonyStyle->section($section);
+        $i = 0;
+        foreach ($classMethodContextDefinitions as $classMethodContextDefinition) {
+            // @todo handle later, as dynamic
+            if (MaskAnalyzer::isRegex($classMethodContextDefinition->getMask())) {
+                continue;
+            }
+
+            if (MaskAnalyzer::isValueMask($classMethodContextDefinition->getMask())) {
+                continue;
+            }
+
+            $this->symfonyStyle->writeln(sprintf('%d) <fg=green>%s</>', $i + 1, $classMethodContextDefinition->getMask()));
 
             $classMethodContextDefinition->recordUsage($featureInstructions);
 
             $this->symfonyStyle->writeln(' * ' . $classMethodContextDefinition->getUsageCount() . ' usages');
-            $this->symfonyStyle->newLine(2);
+            $this->symfonyStyle->newLine();
+            ++$i;
         }
 
         return Command::SUCCESS;

src/DefinitionMasksResolver.php

@@ -4,6 +4,7 @@
 
 namespace Behastan;
 
+use Behastan\Analyzer\MaskAnalyzer;
 use Behastan\PhpParser\SimplePhpParser;
 use Behastan\Resolver\ClassMethodMasksResolver;
 use Behastan\ValueObject\ClassMethodContextDefinition;
@@ -19,6 +20,7 @@
 
 final class DefinitionMasksResolver
 {
+
     public function __construct(
         private readonly SimplePhpParser $simplePhpParser,
         private readonly NodeFinder $nodeFinder,
@@ -50,7 +52,7 @@ public function resolve(array $contextFiles): MaskCollection
             }
 
             // regex pattern, handled else-where
-            if (str_starts_with($rawMask, '/')) {
+            if (MaskAnalyzer::isRegex($rawMask)) {
                 $masks[] = new RegexMask(
                     $rawMask,
                     $classMethodContextDefinition->getFilePath(),
@@ -61,9 +63,7 @@ public function resolve(array $contextFiles): MaskCollection
             }
 
             // handled in mask one
-            preg_match('#(\:[\W\w]+)#', $rawMask, $match);
-
-            if ($match !== []) {
+            if (MaskAnalyzer::isValueMask($rawMask)) {
                 //  if (str_contains($rawMask, ':')) {
                 $masks[] = new NamedMask(
                     $rawMask,