[DX] Remove undocumented and single implementer of skip voter, keep i…

…t simple (#6275)
rectorphp · Sep 2, 2024 · a957503 · a957503
1 parent 0c37a47
commit a957503
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 51 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -271,7 +271,7 @@ parameters:
                 # marker interface
                 - src/Contract/PhpParser/Node/StmtsAwareInterface.php
                 # designed for extension
-                - src/Skipper/Contract/SkipVoterInterface.php
+                #- src/Skipper/Contract/SkipVoterInterface.php
 
         # generated class in /vendor
         -

diff --git a/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php b/rules/CodingStyle/ClassNameImport/ClassNameImportSkipper.php
@@ -26,7 +26,7 @@
      */
     public function __construct(
         private iterable $classNameImportSkipVoters,
-        private UseImportsResolver $useImportsResolver
+        private UseImportsResolver $useImportsResolver,
     ) {
     }
 

diff --git a/src/DependencyInjection/LazyContainerFactory.php b/src/DependencyInjection/LazyContainerFactory.php
@@ -162,9 +162,7 @@
 use Rector\PHPStanStaticTypeMapper\TypeMapper\VoidTypeMapper;
 use Rector\PostRector\Application\PostFileProcessor;
 use Rector\Rector\AbstractRector;
-use Rector\Skipper\Contract\SkipVoterInterface;
 use Rector\Skipper\Skipper\Skipper;
-use Rector\Skipper\SkipVoter\ClassSkipVoter;
 use Rector\StaticTypeMapper\Contract\PhpDocParser\PhpDocTypeMapperInterface;
 use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface;
 use Rector\StaticTypeMapper\Mapper\PhpParserNodeMapper;
@@ -366,11 +364,6 @@ final class LazyContainerFactory
         ExprNodeMapper::class,
     ];
 
-    /**
-     * @var array<class-string<SkipVoterInterface>>
-     */
-    private const SKIP_VOTER_CLASSES = [ClassSkipVoter::class];
-
     /**
      * @var array<class-string<ConverterAttributeDecoratorInterface>>
      */
@@ -531,12 +524,6 @@ static function (UnionTypeMapper $unionTypeMapper, Container $container): void {
             ->needs('$nodeNameResolvers')
             ->giveTagged(NodeNameResolverInterface::class);
 
-        $rectorConfig->when(Skipper::class)
-            ->needs('$skipVoters')
-            ->giveTagged(SkipVoterInterface::class);
-
-        $this->registerTagged($rectorConfig, self::SKIP_VOTER_CLASSES, SkipVoterInterface::class);
-
         $rectorConfig->when(AttributeGroupNamedArgumentManipulator::class)
             ->needs('$converterAttributeDecorators')
             ->giveTagged(ConverterAttributeDecoratorInterface::class);

diff --git a/src/Skipper/Contract/SkipVoterInterface.php b/src/Skipper/Contract/SkipVoterInterface.php
diff --git a/src/Skipper/SkipVoter/ClassSkipVoter.php b/src/Skipper/SkipVoter/ClassSkipVoter.php
@@ -5,11 +5,10 @@
 namespace Rector\Skipper\SkipVoter;
 
 use PHPStan\Reflection\ReflectionProvider;
-use Rector\Skipper\Contract\SkipVoterInterface;
 use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver;
 use Rector\Skipper\Skipper\SkipSkipper;
 
-final readonly class ClassSkipVoter implements SkipVoterInterface
+final readonly class ClassSkipVoter
 {
     public function __construct(
         private SkipSkipper $skipSkipper,

diff --git a/src/Skipper/Skipper/Skipper.php b/src/Skipper/Skipper/Skipper.php
@@ -7,24 +7,19 @@
 use PhpParser\Node;
 use Rector\Contract\Rector\RectorInterface;
 use Rector\ProcessAnalyzer\RectifiedAnalyzer;
-use Rector\Skipper\Contract\SkipVoterInterface;
-use Webmozart\Assert\Assert;
+use Rector\Skipper\SkipVoter\ClassSkipVoter;
 
 /**
  * @api
  * @see \Rector\Tests\Skipper\Skipper\SkipperTest
  */
 final readonly class Skipper
 {
-    /**
-     * @param array<SkipVoterInterface> $skipVoters
-     */
     public function __construct(
         private RectifiedAnalyzer $rectifiedAnalyzer,
-        private array $skipVoters,
-        private PathSkipper $pathSkipper
+        private PathSkipper $pathSkipper,
+        private ClassSkipVoter $classSkipVoter,
     ) {
-        Assert::allIsInstanceOf($this->skipVoters, SkipVoterInterface::class);
     }
 
     public function shouldSkipElement(string | object $element): bool
@@ -39,19 +34,11 @@ public function shouldSkipFilePath(string $filePath): bool
 
     public function shouldSkipElementAndFilePath(string | object $element, string $filePath): bool
     {
-        foreach ($this->skipVoters as $skipVoter) {
-            if (! $skipVoter->match($element)) {
-                continue;
-            }
-
-            if (! $skipVoter->shouldSkip($element, $filePath)) {
-                continue;
-            }
-
-            return true;
+        if (! $this->classSkipVoter->match($element)) {
+            return false;
         }
 
-        return false;
+        return $this->classSkipVoter->shouldSkip($element, $filePath);
     }
 
     /**