From b6483cd8b43de8c4f1e37bf8c99ee323d80362c4 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 5 Jun 2023 09:55:14 +0000 Subject: [PATCH] Updated Rector to commit dab448289eef1d79fe75e61f8fda1da1b7f9eaab https://github.com/rectorphp/rector-src/commit/dab448289eef1d79fe75e61f8fda1da1b7f9eaab [NodeTypeResolver] Handle crash after next exit() on no namespaced code after removal next attribute (#4074) --- .../PHPStan/Scope/PHPStanNodeScopeResolver.php | 16 +++++++++++++++- src/Application/VersionResolver.php | 4 ++-- src/Kernel/RectorKernel.php | 2 +- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php index 7ba6f930b7c..254a443d3a8 100644 --- a/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php +++ b/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php @@ -47,6 +47,8 @@ use Rector\Caching\FileSystem\DependencyResolver; use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface; use Rector\Core\Exception\ShouldNotHappenException; use Rector\Core\NodeAnalyzer\ClassAnalyzer; +use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace; +use Rector\Core\PhpParser\NodeTraverser\FileWithoutNamespaceNodeTraverser; use Rector\Core\Util\Reflection\PrivatesAccessor; use Rector\NodeNameResolver\NodeNameResolver; use Rector\NodeTypeResolver\Node\AttributeKey; @@ -107,10 +109,15 @@ final class PHPStanNodeScopeResolver * @var \Rector\Core\NodeAnalyzer\ClassAnalyzer */ private $classAnalyzer; + /** + * @readonly + * @var \Rector\Core\PhpParser\NodeTraverser\FileWithoutNamespaceNodeTraverser + */ + private $fileWithoutNamespaceNodeTraverser; /** * @param ScopeResolverNodeVisitorInterface[] $nodeVisitors */ - public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, array $nodeVisitors, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, NodeNameResolver $nodeNameResolver, ClassAnalyzer $classAnalyzer) + public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, array $nodeVisitors, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, NodeNameResolver $nodeNameResolver, ClassAnalyzer $classAnalyzer, FileWithoutNamespaceNodeTraverser $fileWithoutNamespaceNodeTraverser) { $this->changedFilesDetector = $changedFilesDetector; $this->dependencyResolver = $dependencyResolver; @@ -120,6 +127,7 @@ final class PHPStanNodeScopeResolver $this->privatesAccessor = $privatesAccessor; $this->nodeNameResolver = $nodeNameResolver; $this->classAnalyzer = $classAnalyzer; + $this->fileWithoutNamespaceNodeTraverser = $fileWithoutNamespaceNodeTraverser; $this->nodeTraverser = new NodeTraverser(); foreach ($nodeVisitors as $nodeVisitor) { $this->nodeTraverser->addVisitor($nodeVisitor); @@ -138,6 +146,12 @@ final class PHPStanNodeScopeResolver */ Assert::allIsInstanceOf($stmts, Stmt::class); $this->nodeTraverser->traverse($stmts); + if (!$isScopeRefreshing) { + $stmts = $this->fileWithoutNamespaceNodeTraverser->traverse($stmts); + if (\count($stmts) === 1 && $stmts[0] instanceof FileWithoutNamespace) { + $stmts = $stmts[0]->stmts; + } + } $scope = $formerMutatingScope ?? $this->scopeFactory->createFromFile($filePath); // skip chain method calls, performance issue: https://github.com/phpstan/phpstan/issues/254 $nodeCallback = function (Node $node, MutatingScope $mutatingScope) use(&$nodeCallback, $isScopeRefreshing, $filePath) : void { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 2f21727dbed..4caa3894066 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 = '8e80c7a5489a096b707281aded4ff4976bbb10b1'; + public const PACKAGE_VERSION = 'dab448289eef1d79fe75e61f8fda1da1b7f9eaab'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-06-05 10:49:57'; + public const RELEASE_DATE = '2023-06-05 10:50:29'; /** * @var int */ diff --git a/src/Kernel/RectorKernel.php b/src/Kernel/RectorKernel.php index 5932c3f5b30..0791304ca54 100644 --- a/src/Kernel/RectorKernel.php +++ b/src/Kernel/RectorKernel.php @@ -15,7 +15,7 @@ final class RectorKernel /** * @var string */ - private const CACHE_KEY = 'v54'; + private const CACHE_KEY = 'v55'; /** * @var \Symfony\Component\DependencyInjection\ContainerInterface|null */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 57e48995f9c..752603cf30c 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 ComposerAutoloaderInit77ef013e162cb5c783ba586a3f91e2b1::getLoader(); +return ComposerAutoloaderInitb45a5dba47c8232c7008da5e7771254b::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a64cadced91..3e25a9a807c 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit77ef013e162cb5c783ba586a3f91e2b1 +class ComposerAutoloaderInitb45a5dba47c8232c7008da5e7771254b { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit77ef013e162cb5c783ba586a3f91e2b1 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit77ef013e162cb5c783ba586a3f91e2b1', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb45a5dba47c8232c7008da5e7771254b', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit77ef013e162cb5c783ba586a3f91e2b1', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb45a5dba47c8232c7008da5e7771254b', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit77ef013e162cb5c783ba586a3f91e2b1::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb45a5dba47c8232c7008da5e7771254b::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit77ef013e162cb5c783ba586a3f91e2b1::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitb45a5dba47c8232c7008da5e7771254b::$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 74d7e783f2f..1bcdcfbed90 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit77ef013e162cb5c783ba586a3f91e2b1 +class ComposerStaticInitb45a5dba47c8232c7008da5e7771254b { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3051,9 +3051,9 @@ class ComposerStaticInit77ef013e162cb5c783ba586a3f91e2b1 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit77ef013e162cb5c783ba586a3f91e2b1::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit77ef013e162cb5c783ba586a3f91e2b1::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit77ef013e162cb5c783ba586a3f91e2b1::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb45a5dba47c8232c7008da5e7771254b::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb45a5dba47c8232c7008da5e7771254b::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb45a5dba47c8232c7008da5e7771254b::$classMap; }, null, ClassLoader::class); }