diff --git a/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php b/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php index 96e59d25a604..5b6d0e564b56 100644 --- a/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php +++ b/packages/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php @@ -118,10 +118,10 @@ private function resolveNamespacedName(IdentifierTypeNode $identifierTypeNode, P return $name; } $uses = $this->useImportsResolver->resolve(); - $originalNode = $phpParserNode->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $phpParserNode; - $scope = $originalNode->getAttribute(AttributeKey::SCOPE); + $originalNode = $phpParserNode->getAttribute(AttributeKey::ORIGINAL_NODE); + $scope = $originalNode instanceof PhpParserNode ? $originalNode->getAttribute(AttributeKey::SCOPE) : $phpParserNode->getAttribute(AttributeKey::SCOPE); if (!$scope instanceof Scope) { - if (!$phpParserNode->hasAttribute(AttributeKey::ORIGINAL_NODE)) { + if (!$originalNode instanceof PhpParserNode) { return $this->resolveNamefromUse($uses, $name); } return ''; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index bd64a2188dd7..4e84834d5862 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 = '7fc7034ddd58ff23d19bd2ed956ab93fdacfd153'; + public const PACKAGE_VERSION = 'eac3d467a9ff5ce778bb79b214c39487a6f928f4'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-28 05:44:27'; + public const RELEASE_DATE = '2023-08-28 06:21:14'; /** * @var int */ diff --git a/src/ProcessAnalyzer/RectifiedAnalyzer.php b/src/ProcessAnalyzer/RectifiedAnalyzer.php index 3f04756fe166..35072b27d0aa 100644 --- a/src/ProcessAnalyzer/RectifiedAnalyzer.php +++ b/src/ProcessAnalyzer/RectifiedAnalyzer.php @@ -47,9 +47,6 @@ private function isJustReprintedOverlappedTokenStart(Node $node, ?Node $original if ($originalNode instanceof Node) { return \false; } - if ($node->hasAttribute(AttributeKey::ORIGINAL_NODE)) { - return \false; - } /** * Start token pos must be < 0 to continue, as the node and parent node just re-printed * diff --git a/vendor/autoload.php b/vendor/autoload.php index 4e2ff5553bd0..f6e591a7a806 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit7ee1fa6da95c011b74fbbd8dc3025942::getLoader(); +return ComposerAutoloaderInit4637e7b33fa4f59a81c443a3f4f3b7fa::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index ae33684af644..96334af312c5 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit7ee1fa6da95c011b74fbbd8dc3025942 +class ComposerAutoloaderInit4637e7b33fa4f59a81c443a3f4f3b7fa { private static $loader; @@ -22,17 +22,17 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit7ee1fa6da95c011b74fbbd8dc3025942', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit4637e7b33fa4f59a81c443a3f4f3b7fa', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit7ee1fa6da95c011b74fbbd8dc3025942', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4637e7b33fa4f59a81c443a3f4f3b7fa', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit7ee1fa6da95c011b74fbbd8dc3025942::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit4637e7b33fa4f59a81c443a3f4f3b7fa::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit7ee1fa6da95c011b74fbbd8dc3025942::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit4637e7b33fa4f59a81c443a3f4f3b7fa::$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 aedb790f883c..91ffa09347ec 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit7ee1fa6da95c011b74fbbd8dc3025942 +class ComposerStaticInit4637e7b33fa4f59a81c443a3f4f3b7fa { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2608,9 +2608,9 @@ class ComposerStaticInit7ee1fa6da95c011b74fbbd8dc3025942 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit7ee1fa6da95c011b74fbbd8dc3025942::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit7ee1fa6da95c011b74fbbd8dc3025942::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit7ee1fa6da95c011b74fbbd8dc3025942::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit4637e7b33fa4f59a81c443a3f4f3b7fa::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit4637e7b33fa4f59a81c443a3f4f3b7fa::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit4637e7b33fa4f59a81c443a3f4f3b7fa::$classMap; }, null, ClassLoader::class); }