From e6e6042119b2dd03f44e89a3ba4b01e0468a0f5d Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Wed, 6 Sep 2023 16:03:21 +0000 Subject: [PATCH] Updated Rector to commit 10eb09f02d825d01caf92e2c45c73dddf6aa3430 https://github.com/rectorphp/rector-src/commit/10eb09f02d825d01caf92e2c45c73dddf6aa3430 [cleanup] Remove deprecated NonPhpRectorInterface, PseudoNamespaceToNamespaceRector and mysql to mysqli sets (#4927) --- config/set/mysql-to-mysqli.php | 9 --- packages/Config/RectorConfig.php | 16 +---- packages/Set/ValueObject/SetList.php | 5 -- .../PseudoNamespaceToNamespaceRector.php | 58 ------------------- .../PseudoNamespaceToNamespace.php | 40 ------------- src/Application/VersionResolver.php | 4 +- src/Contract/Rector/NonPhpRectorInterface.php | 12 ---- .../LazyContainerFactory.php | 2 - src/NodeManipulator/IfManipulator.php | 7 --- vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 3 - vendor/composer/autoload_real.php | 10 ++-- vendor/composer/autoload_static.php | 11 ++-- 13 files changed, 14 insertions(+), 165 deletions(-) delete mode 100644 config/set/mysql-to-mysqli.php delete mode 100644 rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php delete mode 100644 rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php delete mode 100644 src/Contract/Rector/NonPhpRectorInterface.php diff --git a/config/set/mysql-to-mysqli.php b/config/set/mysql-to-mysqli.php deleted file mode 100644 index 1bc598a82a0..00000000000 --- a/config/set/mysql-to-mysqli.php +++ /dev/null @@ -1,9 +0,0 @@ -ruleConfigurations[$rectorClass] = \array_merge($this->ruleConfigurations[$rectorClass] ?? [], $configuration); $this->singleton($rectorClass); - $this->tagRectorService($rectorClass); + $this->tag($rectorClass, RectorInterface::class); $this->afterResolving($rectorClass, function (ConfigurableRectorInterface $configurableRector) use($rectorClass) : void { $ruleConfiguration = $this->ruleConfigurations[$rectorClass]; $configurableRector->configure($ruleConfiguration); @@ -163,7 +162,7 @@ final class RectorConfig extends Container Assert::classExists($rectorClass); Assert::isAOf($rectorClass, RectorInterface::class); $this->singleton($rectorClass); - $this->tagRectorService($rectorClass); + $this->tag($rectorClass, RectorInterface::class); if (\is_a($rectorClass, AbstractScopeAwareRector::class, \true)) { $this->extend($rectorClass, static function (AbstractScopeAwareRector $scopeAwareRector, Container $container) : AbstractScopeAwareRector { $scopeAnalyzer = $container->make(ScopeAnalyzer::class); @@ -305,17 +304,6 @@ final class RectorConfig extends Container } return \array_unique($duplicates); } - /** - * @param class-string $rectorClass - */ - private function tagRectorService(string $rectorClass) : void - { - $this->tag($rectorClass, RectorInterface::class); - if (\is_a($rectorClass, NonPhpRectorInterface::class, \true)) { - \trigger_error(\sprintf('The "%s" interface of "%s" rule is deprecated. Rector will process only PHP code, as designed to with AST. For another file format, use custom tooling.', NonPhpRectorInterface::class, $rectorClass)); - exit; - } - } /** * @param string[] $rectorClasses */ diff --git a/packages/Set/ValueObject/SetList.php b/packages/Set/ValueObject/SetList.php index 1522a0be1d5..0e3a9be33a0 100644 --- a/packages/Set/ValueObject/SetList.php +++ b/packages/Set/ValueObject/SetList.php @@ -29,11 +29,6 @@ final class SetList implements SetListInterface * @var string */ public const GMAGICK_TO_IMAGICK = __DIR__ . '/../../../config/set/gmagick-to-imagick.php'; - /** - * @deprecated Handle manually with explicit refactoring instead. - * @var string - */ - public const MYSQL_TO_MYSQLI = __DIR__ . '/../../../config/set/mysql-to-mysqli.php'; /** * @var string */ diff --git a/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php b/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php deleted file mode 100644 index b3c69f0f3db..00000000000 --- a/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php +++ /dev/null @@ -1,58 +0,0 @@ -> - */ - public function getNodeTypes() : array - { - // property, method - return [FileWithoutNamespace::class, Namespace_::class]; - } - /** - * @param Namespace_|FileWithoutNamespace $node - */ - public function refactor(Node $node) : ?Node - { - $errorMessage = \sprintf('Rule "%s" is deprecated, as unreliable and too dynamic. Use more robuts RenameClassRector instead.', self::class); - \trigger_error($errorMessage, \E_USER_WARNING); - \sleep(3); - return null; - } - /** - * @param mixed[] $configuration - */ - public function configure(array $configuration) : void - { - // for BC - } -} diff --git a/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php b/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php deleted file mode 100644 index 5f9f17e6925..00000000000 --- a/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php +++ /dev/null @@ -1,40 +0,0 @@ -namespacePrefix = $namespacePrefix; - $this->excludedClasses = $excludedClasses; - } - public function getNamespacePrefix() : string - { - return $this->namespacePrefix; - } - /** - * @return string[] - */ - public function getExcludedClasses() : array - { - return $this->excludedClasses; - } -} diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 7d87469c479..9667d3ef401 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 = 'd3719c2e953f3be1b5b1e0a2eb7ba992b65a8e6d'; + public const PACKAGE_VERSION = '10eb09f02d825d01caf92e2c45c73dddf6aa3430'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-09-06 14:53:10'; + public const RELEASE_DATE = '2023-09-06 18:00:33'; /** * @var int */ diff --git a/src/Contract/Rector/NonPhpRectorInterface.php b/src/Contract/Rector/NonPhpRectorInterface.php deleted file mode 100644 index d100bf97b29..00000000000 --- a/src/Contract/Rector/NonPhpRectorInterface.php +++ /dev/null @@ -1,12 +0,0 @@ -when(PHPStanNodeScopeResolver::class)->needs('$nodeVisitors')->giveTagged(ScopeResolverNodeVisitorInterface::class); $this->registerTagged($rectorConfig, self::SCOPE_RESOLVER_NODE_VISITOR_CLASSES, ScopeResolverNodeVisitorInterface::class); - // phpstan factory $this->createPHPStanServices($rectorConfig); - // @todo add base node visitors $rectorConfig->when(PhpDocNodeMapper::class)->needs('$phpDocNodeVisitors')->giveTagged(BasePhpDocNodeVisitorInterface::class); /** @param mixed $parameters */ $hasForgotten = \false; diff --git a/src/NodeManipulator/IfManipulator.php b/src/NodeManipulator/IfManipulator.php index 8dc23e88839..da9ca2d123b 100644 --- a/src/NodeManipulator/IfManipulator.php +++ b/src/NodeManipulator/IfManipulator.php @@ -168,13 +168,6 @@ final class IfManipulator } return $if->elseifs === []; } - /** - * @deprecated Create If_ directly, this is simple new with no added value - */ - public function createIfStmt(Expr $condExpr, Stmt $stmt) : If_ - { - return new If_($condExpr, ['stmts' => [$stmt]]); - } private function matchComparedAndReturnedNode(NotIdentical $notIdentical, Return_ $return) : ?Expr { if ($this->nodeComparator->areNodesEqual($notIdentical->left, $return->expr) && $this->valueResolver->isNull($notIdentical->right)) { diff --git a/vendor/autoload.php b/vendor/autoload.php index 892d7328252..73c827de85a 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 ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382::getLoader(); +return ComposerAutoloaderInit9248641f2e4b94b552e9ef0a05e9df45::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 861bcfe27a3..f17690a67e1 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1179,7 +1179,6 @@ return array( 'Rector\\Core\\Contract\\DependencyInjection\\ResetableInterface' => $baseDir . '/src/Contract/DependencyInjection/ResetableInterface.php', 'Rector\\Core\\Contract\\PhpParser\\Node\\StmtsAwareInterface' => $baseDir . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php', 'Rector\\Core\\Contract\\Rector\\ConfigurableRectorInterface' => $baseDir . '/src/Contract/Rector/ConfigurableRectorInterface.php', - 'Rector\\Core\\Contract\\Rector\\NonPhpRectorInterface' => $baseDir . '/src/Contract/Rector/NonPhpRectorInterface.php', 'Rector\\Core\\Contract\\Rector\\RectorInterface' => $baseDir . '/src/Contract/Rector/RectorInterface.php', 'Rector\\Core\\Contract\\Rector\\ScopeAwareRectorInterface' => $baseDir . '/src/Contract/Rector/ScopeAwareRectorInterface.php', 'Rector\\Core\\DependencyInjection\\Laravel\\ContainerMemento' => $baseDir . '/src/DependencyInjection/Laravel/ContainerMemento.php', @@ -1977,7 +1976,6 @@ return array( 'Rector\\Renaming\\Rector\\ClassConstFetch\\RenameClassConstFetchRector' => $baseDir . '/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php', 'Rector\\Renaming\\Rector\\ClassMethod\\RenameAnnotationRector' => $baseDir . '/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php', 'Rector\\Renaming\\Rector\\ConstFetch\\RenameConstantRector' => $baseDir . '/rules/Renaming/Rector/ConstFetch/RenameConstantRector.php', - 'Rector\\Renaming\\Rector\\FileWithoutNamespace\\PseudoNamespaceToNamespaceRector' => $baseDir . '/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php', 'Rector\\Renaming\\Rector\\FuncCall\\RenameFunctionRector' => $baseDir . '/rules/Renaming/Rector/FuncCall/RenameFunctionRector.php', 'Rector\\Renaming\\Rector\\MethodCall\\RenameMethodRector' => $baseDir . '/rules/Renaming/Rector/MethodCall/RenameMethodRector.php', 'Rector\\Renaming\\Rector\\Name\\RenameClassRector' => $baseDir . '/rules/Renaming/Rector/Name/RenameClassRector.php', @@ -1986,7 +1984,6 @@ return array( 'Rector\\Renaming\\Rector\\String_\\RenameStringRector' => $baseDir . '/rules/Renaming/Rector/String_/RenameStringRector.php', 'Rector\\Renaming\\ValueObject\\MethodCallRename' => $baseDir . '/rules/Renaming/ValueObject/MethodCallRename.php', 'Rector\\Renaming\\ValueObject\\MethodCallRenameWithArrayKey' => $baseDir . '/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php', - 'Rector\\Renaming\\ValueObject\\PseudoNamespaceToNamespace' => $baseDir . '/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php', 'Rector\\Renaming\\ValueObject\\RenameAnnotation' => $baseDir . '/rules/Renaming/ValueObject/RenameAnnotation.php', 'Rector\\Renaming\\ValueObject\\RenameAnnotationByType' => $baseDir . '/rules/Renaming/ValueObject/RenameAnnotationByType.php', 'Rector\\Renaming\\ValueObject\\RenameClassAndConstFetch' => $baseDir . '/rules/Renaming/ValueObject/RenameClassAndConstFetch.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 1d389dc4336..b54bb01b53c 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382 +class ComposerAutoloaderInit9248641f2e4b94b552e9ef0a05e9df45 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit9248641f2e4b94b552e9ef0a05e9df45', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit9248641f2e4b94b552e9ef0a05e9df45', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$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 5411f646968..9a40e38525e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382 +class ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -1399,7 +1399,6 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382 'Rector\\Core\\Contract\\DependencyInjection\\ResetableInterface' => __DIR__ . '/../..' . '/src/Contract/DependencyInjection/ResetableInterface.php', 'Rector\\Core\\Contract\\PhpParser\\Node\\StmtsAwareInterface' => __DIR__ . '/../..' . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php', 'Rector\\Core\\Contract\\Rector\\ConfigurableRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/ConfigurableRectorInterface.php', - 'Rector\\Core\\Contract\\Rector\\NonPhpRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/NonPhpRectorInterface.php', 'Rector\\Core\\Contract\\Rector\\RectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/RectorInterface.php', 'Rector\\Core\\Contract\\Rector\\ScopeAwareRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/ScopeAwareRectorInterface.php', 'Rector\\Core\\DependencyInjection\\Laravel\\ContainerMemento' => __DIR__ . '/../..' . '/src/DependencyInjection/Laravel/ContainerMemento.php', @@ -2197,7 +2196,6 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382 'Rector\\Renaming\\Rector\\ClassConstFetch\\RenameClassConstFetchRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php', 'Rector\\Renaming\\Rector\\ClassMethod\\RenameAnnotationRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php', 'Rector\\Renaming\\Rector\\ConstFetch\\RenameConstantRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/ConstFetch/RenameConstantRector.php', - 'Rector\\Renaming\\Rector\\FileWithoutNamespace\\PseudoNamespaceToNamespaceRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php', 'Rector\\Renaming\\Rector\\FuncCall\\RenameFunctionRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/FuncCall/RenameFunctionRector.php', 'Rector\\Renaming\\Rector\\MethodCall\\RenameMethodRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/MethodCall/RenameMethodRector.php', 'Rector\\Renaming\\Rector\\Name\\RenameClassRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/Name/RenameClassRector.php', @@ -2206,7 +2204,6 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382 'Rector\\Renaming\\Rector\\String_\\RenameStringRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/String_/RenameStringRector.php', 'Rector\\Renaming\\ValueObject\\MethodCallRename' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/MethodCallRename.php', 'Rector\\Renaming\\ValueObject\\MethodCallRenameWithArrayKey' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php', - 'Rector\\Renaming\\ValueObject\\PseudoNamespaceToNamespace' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php', 'Rector\\Renaming\\ValueObject\\RenameAnnotation' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/RenameAnnotation.php', 'Rector\\Renaming\\ValueObject\\RenameAnnotationByType' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/RenameAnnotationByType.php', 'Rector\\Renaming\\ValueObject\\RenameClassAndConstFetch' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/RenameClassAndConstFetch.php', @@ -2606,9 +2603,9 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$classMap; }, null, ClassLoader::class); }