From 92a790ae25d87e27ce2f70ec2469b010d3227c7e Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Wed, 5 Jul 2023 17:31:36 +0000 Subject: [PATCH] Updated Rector to commit a4ef13b30cfd2ee5a02f547256673064d648c558 https://github.com/rectorphp/rector-src/commit/a4ef13b30cfd2ee5a02f547256673064d648c558 [NodeAnalyzer] Check statementDepth on Stmt, and expressionDepth on Expr on ScopeAnalyzer (#4425) --- src/Application/VersionResolver.php | 4 ++-- src/NodeAnalyzer/ScopeAnalyzer.php | 8 ++++++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index de167155211..cce46c12cb8 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 = '9df1445de8c8cb5eed5a85446628226f9b03ed76'; + public const PACKAGE_VERSION = 'a4ef13b30cfd2ee5a02f547256673064d648c558'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-07-05 16:27:26'; + public const RELEASE_DATE = '2023-07-06 00:27:20'; /** * @var int */ diff --git a/src/NodeAnalyzer/ScopeAnalyzer.php b/src/NodeAnalyzer/ScopeAnalyzer.php index 5232d2518bd..794d3f47b0a 100644 --- a/src/NodeAnalyzer/ScopeAnalyzer.php +++ b/src/NodeAnalyzer/ScopeAnalyzer.php @@ -5,9 +5,11 @@ namespace Rector\Core\NodeAnalyzer; use PhpParser\Node; use PhpParser\Node\Arg; +use PhpParser\Node\Expr; use PhpParser\Node\Identifier; use PhpParser\Node\Name; use PhpParser\Node\Param; +use PhpParser\Node\Stmt; use PHPStan\Analyser\MutatingScope; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory; @@ -40,10 +42,12 @@ final class ScopeAnalyzer if ($mutatingScope instanceof MutatingScope) { return $mutatingScope; } - if ($node->getAttribute(AttributeKey::STATEMENT_DEPTH) === 0) { + // on File level + if ($node instanceof Stmt && $node->getAttribute(AttributeKey::STATEMENT_DEPTH) === 0) { return $this->scopeFactory->createFromFile($filePath); } - if ($node->getAttribute(AttributeKey::EXPRESSION_DEPTH) >= 2) { + // too deep Expr, eg: $$param = $$bar = self::decodeValue($result->getItem()->getTextContent()); + if ($node instanceof Expr && $node->getAttribute(AttributeKey::EXPRESSION_DEPTH) >= 2) { return $this->scopeFactory->createFromFile($filePath); } /** diff --git a/vendor/autoload.php b/vendor/autoload.php index eef25ffdf9b..9de12697939 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 ComposerAutoloaderInit47398a985bdc9009b693bfff9f0eb9a1::getLoader(); +return ComposerAutoloaderInit379cd13fc8585b7fb40b9fa0503d618c::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index e8900e2c1ab..05c25cf4efb 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit47398a985bdc9009b693bfff9f0eb9a1 +class ComposerAutoloaderInit379cd13fc8585b7fb40b9fa0503d618c { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit47398a985bdc9009b693bfff9f0eb9a1 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit47398a985bdc9009b693bfff9f0eb9a1', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit379cd13fc8585b7fb40b9fa0503d618c', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit47398a985bdc9009b693bfff9f0eb9a1', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit379cd13fc8585b7fb40b9fa0503d618c', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit47398a985bdc9009b693bfff9f0eb9a1::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit379cd13fc8585b7fb40b9fa0503d618c::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit47398a985bdc9009b693bfff9f0eb9a1::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit379cd13fc8585b7fb40b9fa0503d618c::$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 0d8d76388cf..91b4a64135c 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit47398a985bdc9009b693bfff9f0eb9a1 +class ComposerStaticInit379cd13fc8585b7fb40b9fa0503d618c { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3098,9 +3098,9 @@ class ComposerStaticInit47398a985bdc9009b693bfff9f0eb9a1 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit47398a985bdc9009b693bfff9f0eb9a1::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit47398a985bdc9009b693bfff9f0eb9a1::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit47398a985bdc9009b693bfff9f0eb9a1::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit379cd13fc8585b7fb40b9fa0503d618c::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit379cd13fc8585b7fb40b9fa0503d618c::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit379cd13fc8585b7fb40b9fa0503d618c::$classMap; }, null, ClassLoader::class); }