From 5272a66ce132b8d12163b0b0658ec02b272d706d Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 12 Sep 2023 23:04:24 +0000 Subject: [PATCH] Updated Rector to commit 01c0ea9420b424bf1484c99dbb1185a0cd1c3e61 https://github.com/rectorphp/rector-src/commit/01c0ea9420b424bf1484c99dbb1185a0cd1c3e61 [Config] Remove asterisk support in import() for file, use explicit paths instead (#5010) --- e2e/attributes/rector.php | 2 +- e2e/dont-execute-code/rector.php | 2 +- e2e/parse-match-class-on-php74/rector.php | 2 +- e2e/parse-php7-code/rector.php | 2 +- e2e/parse-php8-code/rector.php | 2 +- packages/Config/RectorConfig.php | 9 +-------- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 10 files changed, 18 insertions(+), 25 deletions(-) diff --git a/e2e/attributes/rector.php b/e2e/attributes/rector.php index fe7a82b24be..719283e5720 100644 --- a/e2e/attributes/rector.php +++ b/e2e/attributes/rector.php @@ -7,7 +7,7 @@ use Rector\Core\ValueObject\PhpVersion; use Rector\Symfony\Set\SymfonySetList; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->import(SymfonySetList::SYMFONY_52); + $rectorConfig->sets([SymfonySetList::SYMFONY_52]); $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->paths([__DIR__ . '/src']); diff --git a/e2e/dont-execute-code/rector.php b/e2e/dont-execute-code/rector.php index 1ce2e5b5e1c..11af563f5c7 100644 --- a/e2e/dont-execute-code/rector.php +++ b/e2e/dont-execute-code/rector.php @@ -8,5 +8,5 @@ use Rector\Set\ValueObject\SetList; return static function (RectorConfig $rectorConfig): void { $rectorConfig->paths([__DIR__.'/src']); - $rectorConfig->import(SetList::PHP_53); + $rectorConfig->sets([SetList::PHP_53]); }; diff --git a/e2e/parse-match-class-on-php74/rector.php b/e2e/parse-match-class-on-php74/rector.php index 8349d3544d2..c51be29f58c 100644 --- a/e2e/parse-match-class-on-php74/rector.php +++ b/e2e/parse-match-class-on-php74/rector.php @@ -8,5 +8,5 @@ use Rector\Set\ValueObject\SetList; return static function (RectorConfig $rectorConfig): void { $rectorConfig->paths([__DIR__.'/src']); - $rectorConfig->import(SetList::DEAD_CODE); + $rectorConfig->sets([SetList::DEAD_CODE]); }; diff --git a/e2e/parse-php7-code/rector.php b/e2e/parse-php7-code/rector.php index 1ce2e5b5e1c..11af563f5c7 100644 --- a/e2e/parse-php7-code/rector.php +++ b/e2e/parse-php7-code/rector.php @@ -8,5 +8,5 @@ use Rector\Set\ValueObject\SetList; return static function (RectorConfig $rectorConfig): void { $rectorConfig->paths([__DIR__.'/src']); - $rectorConfig->import(SetList::PHP_53); + $rectorConfig->sets([SetList::PHP_53]); }; diff --git a/e2e/parse-php8-code/rector.php b/e2e/parse-php8-code/rector.php index 1ce2e5b5e1c..11af563f5c7 100644 --- a/e2e/parse-php8-code/rector.php +++ b/e2e/parse-php8-code/rector.php @@ -8,5 +8,5 @@ use Rector\Set\ValueObject\SetList; return static function (RectorConfig $rectorConfig): void { $rectorConfig->paths([__DIR__.'/src']); - $rectorConfig->import(SetList::PHP_53); + $rectorConfig->sets([SetList::PHP_53]); }; diff --git a/packages/Config/RectorConfig.php b/packages/Config/RectorConfig.php index 90454e25065..68e7bb3048f 100644 --- a/packages/Config/RectorConfig.php +++ b/packages/Config/RectorConfig.php @@ -177,14 +177,7 @@ final class RectorConfig extends Container } public function import(string $filePath) : void { - $paths = [$filePath]; - if (\strpos($filePath, '*') !== \false) { - $filesystemTweaker = new FilesystemTweaker(); - $paths = $filesystemTweaker->resolveWithFnmatch($paths); - } - foreach ($paths as $path) { - $this->importFile($path); - } + $this->importFile($filePath); } /** * @param array> $rectorClasses diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 57f7c369918..a7c7f48c923 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 = '0.18.3'; + public const PACKAGE_VERSION = '01c0ea9420b424bf1484c99dbb1185a0cd1c3e61'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-09-12 22:14:26'; + public const RELEASE_DATE = '2023-09-13 01:01:45'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index c5c12650631..caa21365159 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit74b494968d871723f2b2948ff265d302::getLoader(); +return ComposerAutoloaderInitd2c3d8ff3dd641afd1f799a5d931ddd5::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 5b485ec88c8..59220ad06cb 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit74b494968d871723f2b2948ff265d302 +class ComposerAutoloaderInitd2c3d8ff3dd641afd1f799a5d931ddd5 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit74b494968d871723f2b2948ff265d302 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit74b494968d871723f2b2948ff265d302', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd2c3d8ff3dd641afd1f799a5d931ddd5', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit74b494968d871723f2b2948ff265d302', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd2c3d8ff3dd641afd1f799a5d931ddd5', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit74b494968d871723f2b2948ff265d302::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd2c3d8ff3dd641afd1f799a5d931ddd5::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit74b494968d871723f2b2948ff265d302::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitd2c3d8ff3dd641afd1f799a5d931ddd5::$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 409f6549050..3f8c213631d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit74b494968d871723f2b2948ff265d302 +class ComposerStaticInitd2c3d8ff3dd641afd1f799a5d931ddd5 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2593,9 +2593,9 @@ class ComposerStaticInit74b494968d871723f2b2948ff265d302 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit74b494968d871723f2b2948ff265d302::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit74b494968d871723f2b2948ff265d302::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit74b494968d871723f2b2948ff265d302::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitd2c3d8ff3dd641afd1f799a5d931ddd5::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitd2c3d8ff3dd641afd1f799a5d931ddd5::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitd2c3d8ff3dd641afd1f799a5d931ddd5::$classMap; }, null, ClassLoader::class); }