From 950bd50ad11f41fdeff58acd96643b0535ee152d Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 18 Jun 2023 03:50:55 +0000 Subject: [PATCH] Updated Rector to commit 392898c5de7e25ceeb83072eb951939ddf1c7150 https://github.com/rectorphp/rector-src/commit/392898c5de7e25ceeb83072eb951939ddf1c7150 [Performance] Remove NODES_TO_MATCH constant on RemoveNonExistingVarAnnotationRector (#4267) --- .../RemoveNonExistingVarAnnotationRector.php | 23 +++---------------- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 ++++---- vendor/composer/autoload_static.php | 8 +++---- 5 files changed, 15 insertions(+), 32 deletions(-) diff --git a/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php b/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php index 568da4adbea..164aa8a094e 100644 --- a/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php +++ b/rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php @@ -21,7 +21,6 @@ use PhpParser\Node\Stmt\While_; use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode; use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use Rector\Core\Rector\AbstractRector; -use Rector\Core\Util\MultiInstanceofChecker; use Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -37,19 +36,9 @@ final class RemoveNonExistingVarAnnotationRector extends AbstractRector * @var \Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer */ private $exprUsedInNodeAnalyzer; - /** - * @readonly - * @var \Rector\Core\Util\MultiInstanceofChecker - */ - private $multiInstanceofChecker; - /** - * @var array> - */ - private const NODES_TO_MATCH = [Foreach_::class, Static_::class, Echo_::class, Return_::class, Expression::class, Throw_::class, If_::class, While_::class, Switch_::class, Nop::class]; - public function __construct(ExprUsedInNodeAnalyzer $exprUsedInNodeAnalyzer, MultiInstanceofChecker $multiInstanceofChecker) + public function __construct(ExprUsedInNodeAnalyzer $exprUsedInNodeAnalyzer) { $this->exprUsedInNodeAnalyzer = $exprUsedInNodeAnalyzer; - $this->multiInstanceofChecker = $multiInstanceofChecker; } public function getRuleDefinition() : RuleDefinition { @@ -79,7 +68,7 @@ CODE_SAMPLE */ public function getNodeTypes() : array { - return [Node::class]; + return [Foreach_::class, Static_::class, Echo_::class, Return_::class, Expression::class, Throw_::class, If_::class, While_::class, Switch_::class, Nop::class]; } public function refactor(Node $node) : ?Node { @@ -130,13 +119,7 @@ CODE_SAMPLE } private function shouldSkip(Node $node) : bool { - if (!$node instanceof Nop) { - return !$this->multiInstanceofChecker->isInstanceOf($node, self::NODES_TO_MATCH); - } - if (\count($node->getComments()) <= 1) { - return !$this->multiInstanceofChecker->isInstanceOf($node, self::NODES_TO_MATCH); - } - return \true; + return \count($node->getComments()) !== 1; } private function hasVariableName(Node $node, string $variableName) : bool { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index be355251b8d..afe350a6203 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 = '0d9828f9d90ee0dd4b50f759c150575785cce6b8'; + public const PACKAGE_VERSION = '392898c5de7e25ceeb83072eb951939ddf1c7150'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-06-18 00:30:36'; + public const RELEASE_DATE = '2023-06-18 10:45:19'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 46331787c89..5c5b72471c6 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 ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9::getLoader(); +return ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 5a57c84601e..ada4c23a054 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9 +class ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$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 c46a1de8e74..74fda2cce37 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9 +class ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3094,9 +3094,9 @@ class ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$classMap; }, null, ClassLoader::class); }