[Php82] Skip usage of already RecursiveDirectoryIterator::SKIP_DOTS o…

…n FilesystemIteratorSkipDotsRector (#5712) * [Php82] Skip usage of RecursiveDirectoryIterator::SKIP_DOTS on FilesystemIteratorSkipDotsRector * [Php82] Skip usage of RecursiveDirectoryIterator::SKIP_DOTS on FilesystemIteratorSkipDotsRector * fix doc * fix * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <[email protected]>
rectorphp · Mar 11, 2024 · 861a880 · 861a880
1 parent 8ade0b9
commit 861a880
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 24 deletions.
diff --git a/.../FilesystemIteratorSkipDotsRectorTest.php → .../FilesystemIteratorSkipDotsRectorTest.php b/.../FilesystemIteratorSkipDotsRectorTest.php → .../FilesystemIteratorSkipDotsRectorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;

diff --git a/...s/Fixture/append_constant_to_flag.php.inc → ...r/Fixture/append_constant_to_flag.php.inc b/...s/Fixture/append_constant_to_flag.php.inc → ...r/Fixture/append_constant_to_flag.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 
@@ -16,7 +16,7 @@ final class AppendConstantToFlag
 -----
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 

diff --git a/...append_constant_to_multiple_flags.php.inc → ...append_constant_to_multiple_flags.php.inc b/...append_constant_to_multiple_flags.php.inc → ...append_constant_to_multiple_flags.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 
@@ -16,7 +16,7 @@ final class AppendConstantToMultipleFlags
 -----
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 

diff --git a/...nstant_to_multiple_flags_with_fqn.php.inc → ...nstant_to_multiple_flags_with_fqn.php.inc b/...nstant_to_multiple_flags_with_fqn.php.inc → ...nstant_to_multiple_flags_with_fqn.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 final class AppendConstantToMultipleFlagsWithFqn
 {
@@ -14,7 +14,7 @@ final class AppendConstantToMultipleFlagsWithFqn
 -----
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 final class AppendConstantToMultipleFlagsWithFqn
 {

diff --git a/...ots/Fixture/skip_constant_present.php.inc → ...tor/Fixture/skip_constant_present.php.inc b/...ots/Fixture/skip_constant_present.php.inc → ...tor/Fixture/skip_constant_present.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 

diff --git a/...re/skip_constant_present_in_flags.php.inc → ...re/skip_constant_present_in_flags.php.inc b/...re/skip_constant_present_in_flags.php.inc → ...re/skip_constant_present_in_flags.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 

diff --git a/...re/skip_constant_present_with_fqn.php.inc → ...re/skip_constant_present_with_fqn.php.inc b/...re/skip_constant_present_with_fqn.php.inc → ...re/skip_constant_present_with_fqn.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 final class SkipConstantPresentWithFqn
 {

diff --git a/..._non_filesystem_iterator_instance.php.inc → ..._non_filesystem_iterator_instance.php.inc b/..._non_filesystem_iterator_instance.php.inc → ..._non_filesystem_iterator_instance.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use Symfony\Component\Console\Style\SymfonyStyle;
 

diff --git a/...p82/Rector/New_/FilesystemIteratorSkipDotsRector/Fixture/skip_recursive_skip_dots.php.inc b/...p82/Rector/New_/FilesystemIteratorSkipDotsRector/Fixture/skip_recursive_skip_dots.php.inc
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
+
+final class SkipRecursiveSkipDots
+{
+    public function run()
+    {
+        new \RecursiveDirectoryIterator(
+            '/path/to/dir',
+            \RecursiveDirectoryIterator::SKIP_DOTS
+        );
+    }
+}
+
+?>
diff --git a/...kipDots/Fixture/skip_use_variable.php.inc → ...sRector/Fixture/skip_use_variable.php.inc b/...kipDots/Fixture/skip_use_variable.php.inc → ...sRector/Fixture/skip_use_variable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 

diff --git a/...s/Fixture/skip_with_default_value.php.inc → ...r/Fixture/skip_with_default_value.php.inc b/...s/Fixture/skip_with_default_value.php.inc → ...r/Fixture/skip_with_default_value.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\Fixture;
+namespace Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\Fixture;
 
 use FilesystemIterator;
 

diff --git a/...eratorSkipDots/config/configured_rule.php → ...SkipDotsRector/config/configured_rule.php b/...eratorSkipDots/config/configured_rule.php → ...SkipDotsRector/config/configured_rule.php
diff --git a/rules/Php82/Rector/New_/FilesystemIteratorSkipDotsRector.php b/rules/Php82/Rector/New_/FilesystemIteratorSkipDotsRector.php
@@ -4,7 +4,6 @@
 
 namespace Rector\Php82\Rector\New_;
 
-use FilesystemIterator;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
@@ -13,31 +12,32 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Name\FullyQualified;
 use PHPStan\Type\ObjectType;
-use Rector\NodeNameResolver\NodeNameResolver\ClassConstFetchNameResolver;
+use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDots\FilesystemIteratorSkipDotsRectorTest
+ * @see \Rector\Tests\Php82\Rector\New_\FilesystemIteratorSkipDotsRector\FilesystemIteratorSkipDotsRectorTest
  */
 final class FilesystemIteratorSkipDotsRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
-        private readonly ClassConstFetchNameResolver $classConstFetchNameResolver
+        private readonly ValueResolver $valueResolver
     ) {
     }
 
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
             'Prior PHP 8.2 FilesystemIterator::SKIP_DOTS was always set and could not be removed, therefore FilesystemIterator::SKIP_DOTS is added in order to keep this behaviour.',
-            [new CodeSample(
-                'new ' . FilesystemIterator::class . '(__DIR__, ' . FilesystemIterator::class . '::KEY_AS_FILENAME);',
-                'new ' . FilesystemIterator::class . '(__DIR__, ' . FilesystemIterator::class . '::KEY_AS_FILENAME | ' . FilesystemIterator::class . '::SKIP_DOTS);'
-            ),
+            [
+                new CodeSample(
+                    'new FilesystemIterator(__DIR__, FilesystemIterator::KEY_AS_FILENAME);',
+                    'new FilesystemIterator(__DIR__, FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::SKIP_DOTS);'
+                ),
             ]
         );
     }
@@ -108,6 +108,11 @@ private function isSkipDots(Expr $expr): bool
             return true;
         }
 
-        return $this->classConstFetchNameResolver->resolve($expr, null) === 'FilesystemIterator::SKIP_DOTS';
+        if (! defined('FilesystemIterator::SKIP_DOTS')) {
+            return true;
+        }
+
+        $value = constant('FilesystemIterator::SKIP_DOTS');
+        return $this->valueResolver->isValue($expr, $value);
     }
 }
diff --git a/src/Autoloading/BootstrapFilesIncluder.php b/src/Autoloading/BootstrapFilesIncluder.php
@@ -4,7 +4,6 @@
 
 namespace Rector\Autoloading;
 
-use FilesystemIterator;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Exception\ShouldNotHappenException;
@@ -50,7 +49,7 @@ private function requireRectorStubs(): void
 
         $dir = new RecursiveDirectoryIterator(
             $stubsRectorDirectory,
-            RecursiveDirectoryIterator::SKIP_DOTS | FilesystemIterator::SKIP_DOTS
+            RecursiveDirectoryIterator::SKIP_DOTS
         );
         /** @var SplFileInfo[] $stubs */
         $stubs = new RecursiveIteratorIterator($dir);