Updated Rector to commit 1c4307b02a18437aab8aee317d4c1b01aae2fc62

1c4307b02a [DX] Use local file and directory filter (#2875)

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '4b6d1147546caf401b772b5bc7ab9002979c6cd5';
+    public const PACKAGE_VERSION = '1c4307b02a18437aab8aee317d4c1b01aae2fc62';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-08-31 17:31:56';
+    public const RELEASE_DATE = '2022-08-31 11:01:11';
     /**
      * @var int
      */

src/FileSystem/FileAndDirectoryFilter.php

@@ -0,0 +1,33 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Core\FileSystem;
+
+/**
+ * @see \Rector\Core\Tests\FileSystem\FileAndDirectoryFilter\FileAndDirectoryFilterTest
+ */
+final class FileAndDirectoryFilter
+{
+    /**
+     * @param string[] $filesAndDirectories
+     * @return string[]
+     */
+    public function filterDirectories(array $filesAndDirectories) : array
+    {
+        $directories = \array_filter($filesAndDirectories, static function (string $path) : bool {
+            return !\is_file($path);
+        });
+        return \array_values($directories);
+    }
+    /**
+     * @param string[] $filesAndDirectories
+     * @return string[]
+     */
+    public function filterFiles(array $filesAndDirectories) : array
+    {
+        $files = \array_filter($filesAndDirectories, static function (string $path) : bool {
+            return \is_file($path);
+        });
+        return \array_values($files);
+    }
+}

src/FileSystem/FilesFinder.php

@@ -8,7 +8,6 @@ use Rector\Core\Util\StringUtils;
 use RectorPrefix202208\Symfony\Component\Finder\Finder;
 use RectorPrefix202208\Symfony\Component\Finder\SplFileInfo;
 use RectorPrefix202208\Symplify\Skipper\SkipCriteriaResolver\SkippedPathsResolver;
-use RectorPrefix202208\Symplify\SmartFileSystem\FileSystemFilter;
 use Symplify\SmartFileSystem\SmartFileInfo;
 /**
  * @see \Rector\Core\Tests\FileSystem\FilesFinder\FilesFinderTest
@@ -30,11 +29,6 @@ final class FilesFinder
      * @var \Rector\Core\FileSystem\FilesystemTweaker
      */
     private $filesystemTweaker;
-    /**
-     * @readonly
-     * @var \Symplify\SmartFileSystem\FileSystemFilter
-     */
-    private $fileSystemFilter;
     /**
      * @readonly
      * @var \Symplify\Skipper\SkipCriteriaResolver\SkippedPathsResolver
@@ -45,12 +39,17 @@ final class FilesFinder
      * @var \Rector\Caching\UnchangedFilesFilter
      */
     private $unchangedFilesFilter;
-    public function __construct(\Rector\Core\FileSystem\FilesystemTweaker $filesystemTweaker, FileSystemFilter $fileSystemFilter, SkippedPathsResolver $skippedPathsResolver, UnchangedFilesFilter $unchangedFilesFilter)
+    /**
+     * @readonly
+     * @var \Rector\Core\FileSystem\FileAndDirectoryFilter
+     */
+    private $fileAndDirectoryFilter;
+    public function __construct(\Rector\Core\FileSystem\FilesystemTweaker $filesystemTweaker, SkippedPathsResolver $skippedPathsResolver, UnchangedFilesFilter $unchangedFilesFilter, \Rector\Core\FileSystem\FileAndDirectoryFilter $fileAndDirectoryFilter)
     {
         $this->filesystemTweaker = $filesystemTweaker;
-        $this->fileSystemFilter = $fileSystemFilter;
         $this->skippedPathsResolver = $skippedPathsResolver;
         $this->unchangedFilesFilter = $unchangedFilesFilter;
+        $this->fileAndDirectoryFilter = $fileAndDirectoryFilter;
     }
     /**
      * @param string[] $source
@@ -60,8 +59,8 @@ final class FilesFinder
     public function findInDirectoriesAndFiles(array $source, array $suffixes = []) : array
     {
         $filesAndDirectories = $this->filesystemTweaker->resolveWithFnmatch($source);
-        $filePaths = $this->fileSystemFilter->filterFiles($filesAndDirectories);
-        $directories = $this->fileSystemFilter->filterDirectories($filesAndDirectories);
+        $filePaths = $this->fileAndDirectoryFilter->filterFiles($filesAndDirectories);
+        $directories = $this->fileAndDirectoryFilter->filterDirectories($filesAndDirectories);
         $smartFileInfos = $this->unchangedFilesFilter->filterAndJoinWithDependentFileInfos($filePaths);
         return \array_merge($smartFileInfos, $this->findInDirectories($directories, $suffixes));
     }

src/StaticReflection/DynamicSourceLocatorDecorator.php

@@ -3,20 +3,15 @@
 declare (strict_types=1);
 namespace Rector\Core\StaticReflection;
 
+use Rector\Core\FileSystem\FileAndDirectoryFilter;
 use Rector\Core\FileSystem\PhpFilesFinder;
 use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
-use RectorPrefix202208\Symplify\SmartFileSystem\FileSystemFilter;
 /**
  * @see https://phpstan.org/blog/zero-config-analysis-with-static-reflection
  * @see https://github.com/rectorphp/rector/issues/3490
  */
 final class DynamicSourceLocatorDecorator
 {
-    /**
-     * @readonly
-     * @var \Symplify\SmartFileSystem\FileSystemFilter
-     */
-    private $fileSystemFilter;
     /**
      * @readonly
      * @var \Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider
@@ -27,11 +22,16 @@ final class DynamicSourceLocatorDecorator
      * @var \Rector\Core\FileSystem\PhpFilesFinder
      */
     private $phpFilesFinder;
-    public function __construct(FileSystemFilter $fileSystemFilter, DynamicSourceLocatorProvider $dynamicSourceLocatorProvider, PhpFilesFinder $phpFilesFinder)
+    /**
+     * @readonly
+     * @var \Rector\Core\FileSystem\FileAndDirectoryFilter
+     */
+    private $fileAndDirectoryFilter;
+    public function __construct(DynamicSourceLocatorProvider $dynamicSourceLocatorProvider, PhpFilesFinder $phpFilesFinder, FileAndDirectoryFilter $fileAndDirectoryFilter)
     {
-        $this->fileSystemFilter = $fileSystemFilter;
         $this->dynamicSourceLocatorProvider = $dynamicSourceLocatorProvider;
         $this->phpFilesFinder = $phpFilesFinder;
+        $this->fileAndDirectoryFilter = $fileAndDirectoryFilter;
     }
     /**
      * @param string[] $paths
@@ -41,9 +41,9 @@ final class DynamicSourceLocatorDecorator
         if ($paths === []) {
             return;
         }
-        $files = $this->fileSystemFilter->filterFiles($paths);
+        $files = $this->fileAndDirectoryFilter->filterFiles($paths);
         $this->dynamicSourceLocatorProvider->addFiles($files);
-        $directories = $this->fileSystemFilter->filterDirectories($paths);
+        $directories = $this->fileAndDirectoryFilter->filterDirectories($paths);
         foreach ($directories as $directory) {
             $filesInfosInDirectory = $this->phpFilesFinder->findInPaths([$directory]);
             $filesInDirectory = [];

vendor/autoload.php

@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit339f989701ef593d70eb65986354df68::getLoader();
+return ComposerAutoloaderInitb4738309597f06133670d5eb35ccd060::getLoader();

vendor/composer/autoload_classmap.php

@@ -1421,6 +1421,7 @@ return array(
     'Rector\\Core\\Exception\\ShouldNotHappenException' => $baseDir . '/src/Exception/ShouldNotHappenException.php',
     'Rector\\Core\\Exception\\VersionException' => $baseDir . '/src/Exception/VersionException.php',
     'Rector\\Core\\Exclusion\\ExclusionManager' => $baseDir . '/src/Exclusion/ExclusionManager.php',
+    'Rector\\Core\\FileSystem\\FileAndDirectoryFilter' => $baseDir . '/src/FileSystem/FileAndDirectoryFilter.php',
     'Rector\\Core\\FileSystem\\FilePathHelper' => $baseDir . '/src/FileSystem/FilePathHelper.php',
     'Rector\\Core\\FileSystem\\FilesFinder' => $baseDir . '/src/FileSystem/FilesFinder.php',
     'Rector\\Core\\FileSystem\\FilesystemTweaker' => $baseDir . '/src/FileSystem/FilesystemTweaker.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit339f989701ef593d70eb65986354df68
+class ComposerAutoloaderInitb4738309597f06133670d5eb35ccd060
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInit339f989701ef593d70eb65986354df68
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit339f989701ef593d70eb65986354df68', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitb4738309597f06133670d5eb35ccd060', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit339f989701ef593d70eb65986354df68', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitb4738309597f06133670d5eb35ccd060', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit339f989701ef593d70eb65986354df68::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitb4738309597f06133670d5eb35ccd060::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit339f989701ef593d70eb65986354df68::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInitb4738309597f06133670d5eb35ccd060::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire339f989701ef593d70eb65986354df68($fileIdentifier, $file);
+            composerRequireb4738309597f06133670d5eb35ccd060($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInit339f989701ef593d70eb65986354df68
  * @param string $file
  * @return void
  */
-function composerRequire339f989701ef593d70eb65986354df68($fileIdentifier, $file)
+function composerRequireb4738309597f06133670d5eb35ccd060($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit339f989701ef593d70eb65986354df68
+class ComposerStaticInitb4738309597f06133670d5eb35ccd060
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -1696,6 +1696,7 @@ class ComposerStaticInit339f989701ef593d70eb65986354df68
         'Rector\\Core\\Exception\\ShouldNotHappenException' => __DIR__ . '/../..' . '/src/Exception/ShouldNotHappenException.php',
         'Rector\\Core\\Exception\\VersionException' => __DIR__ . '/../..' . '/src/Exception/VersionException.php',
         'Rector\\Core\\Exclusion\\ExclusionManager' => __DIR__ . '/../..' . '/src/Exclusion/ExclusionManager.php',
+        'Rector\\Core\\FileSystem\\FileAndDirectoryFilter' => __DIR__ . '/../..' . '/src/FileSystem/FileAndDirectoryFilter.php',
         'Rector\\Core\\FileSystem\\FilePathHelper' => __DIR__ . '/../..' . '/src/FileSystem/FilePathHelper.php',
         'Rector\\Core\\FileSystem\\FilesFinder' => __DIR__ . '/../..' . '/src/FileSystem/FilesFinder.php',
         'Rector\\Core\\FileSystem\\FilesystemTweaker' => __DIR__ . '/../..' . '/src/FileSystem/FilesystemTweaker.php',
@@ -3146,9 +3147,9 @@ class ComposerStaticInit339f989701ef593d70eb65986354df68
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit339f989701ef593d70eb65986354df68::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit339f989701ef593d70eb65986354df68::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit339f989701ef593d70eb65986354df68::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitb4738309597f06133670d5eb35ccd060::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitb4738309597f06133670d5eb35ccd060::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitb4738309597f06133670d5eb35ccd060::$classMap;
 
         }, null, ClassLoader::class);
     }