diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 296af7360856..0099d62ecf39 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'cf1d5b0a492598b893c3fe0ac1ec1d2fcd5018c6'; + public const PACKAGE_VERSION = 'dc6e83c69ff9848d5bbfeedc9c596a042239a840'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-11 11:10:32'; + public const RELEASE_DATE = '2023-08-11 11:16:33'; /** * @var int */ diff --git a/src/StaticReflection/DynamicSourceLocatorDecorator.php b/src/StaticReflection/DynamicSourceLocatorDecorator.php index d3ead1d85251..81b15eb95413 100644 --- a/src/StaticReflection/DynamicSourceLocatorDecorator.php +++ b/src/StaticReflection/DynamicSourceLocatorDecorator.php @@ -4,6 +4,7 @@ namespace Rector\Core\StaticReflection; use Rector\Core\FileSystem\FileAndDirectoryFilter; +use Rector\Core\FileSystem\FilesystemTweaker; use Rector\Core\FileSystem\PhpFilesFinder; use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider; /** @@ -27,11 +28,17 @@ final class DynamicSourceLocatorDecorator * @var \Rector\Core\FileSystem\FileAndDirectoryFilter */ private $fileAndDirectoryFilter; - public function __construct(DynamicSourceLocatorProvider $dynamicSourceLocatorProvider, PhpFilesFinder $phpFilesFinder, FileAndDirectoryFilter $fileAndDirectoryFilter) + /** + * @readonly + * @var \Rector\Core\FileSystem\FilesystemTweaker + */ + private $filesystemTweaker; + public function __construct(DynamicSourceLocatorProvider $dynamicSourceLocatorProvider, PhpFilesFinder $phpFilesFinder, FileAndDirectoryFilter $fileAndDirectoryFilter, FilesystemTweaker $filesystemTweaker) { $this->dynamicSourceLocatorProvider = $dynamicSourceLocatorProvider; $this->phpFilesFinder = $phpFilesFinder; $this->fileAndDirectoryFilter = $fileAndDirectoryFilter; + $this->filesystemTweaker = $filesystemTweaker; } /** * @param string[] $paths @@ -41,6 +48,7 @@ public function addPaths(array $paths) : void if ($paths === []) { return; } + $paths = $this->filesystemTweaker->resolveWithFnmatch($paths); $files = $this->fileAndDirectoryFilter->filterFiles($paths); $this->dynamicSourceLocatorProvider->addFiles($files); $directories = $this->fileAndDirectoryFilter->filterDirectories($paths); diff --git a/vendor/autoload.php b/vendor/autoload.php index 1ea955c38608..39b76abe1c24 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit16be4751e7661197313674642b820328::getLoader(); +return ComposerAutoloaderInit7e2a36abe81c5fcb5984b6057b1d2e16::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b04169067375..f859e3a85fea 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit16be4751e7661197313674642b820328 +class ComposerAutoloaderInit7e2a36abe81c5fcb5984b6057b1d2e16 { private static $loader; @@ -22,17 +22,17 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit16be4751e7661197313674642b820328', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit7e2a36abe81c5fcb5984b6057b1d2e16', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit16be4751e7661197313674642b820328', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit7e2a36abe81c5fcb5984b6057b1d2e16', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit16be4751e7661197313674642b820328::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit7e2a36abe81c5fcb5984b6057b1d2e16::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit16be4751e7661197313674642b820328::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit7e2a36abe81c5fcb5984b6057b1d2e16::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ac640791581c..3ecb46ed75a7 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit16be4751e7661197313674642b820328 +class ComposerStaticInit7e2a36abe81c5fcb5984b6057b1d2e16 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2980,9 +2980,9 @@ class ComposerStaticInit16be4751e7661197313674642b820328 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit16be4751e7661197313674642b820328::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit16be4751e7661197313674642b820328::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit16be4751e7661197313674642b820328::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit7e2a36abe81c5fcb5984b6057b1d2e16::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit7e2a36abe81c5fcb5984b6057b1d2e16::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit7e2a36abe81c5fcb5984b6057b1d2e16::$classMap; }, null, ClassLoader::class); }