diff --git a/rules/Renaming/NodeManipulator/ClassRenamer.php b/rules/Renaming/NodeManipulator/ClassRenamer.php index b0ee1005a51..d4f10597dcb 100644 --- a/rules/Renaming/NodeManipulator/ClassRenamer.php +++ b/rules/Renaming/NodeManipulator/ClassRenamer.php @@ -15,6 +15,7 @@ use PHPStan\Analyser\Scope; use PHPStan\Reflection\ClassReflection; use PHPStan\Reflection\ReflectionProvider; use PHPStan\Type\ObjectType; +use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocClassRenamer; use Rector\BetterPhpDocParser\ValueObject\NodeTypes; @@ -107,17 +108,17 @@ final class ClassRenamer public function renameNode(Node $node, array $oldToNewClasses, ?Scope $scope) : ?Node { $oldToNewTypes = $this->createOldToNewTypes($node, $oldToNewClasses); - $this->refactorPhpDoc($node, $oldToNewTypes, $oldToNewClasses); if ($node instanceof Name) { return $this->refactorName($node, $oldToNewClasses); } + $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node); + $this->refactorPhpDoc($node, $oldToNewTypes, $oldToNewClasses, $phpDocInfo); if ($node instanceof Namespace_) { return $this->refactorNamespace($node, $oldToNewClasses); } if ($node instanceof ClassLike) { return $this->refactorClassLike($node, $oldToNewClasses, $scope); } - $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node); if ($phpDocInfo->hasChanged()) { return $node; } @@ -127,9 +128,8 @@ final class ClassRenamer * @param OldToNewType[] $oldToNewTypes * @param array $oldToNewClasses */ - private function refactorPhpDoc(Node $node, array $oldToNewTypes, array $oldToNewClasses) : void + private function refactorPhpDoc(Node $node, array $oldToNewTypes, array $oldToNewClasses, PhpDocInfo $phpDocInfo) : void { - $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node); if (!$phpDocInfo->hasByTypes(NodeTypes::TYPE_AWARE_NODES) && !$phpDocInfo->hasByAnnotationClasses(NodeTypes::TYPE_AWARE_DOCTRINE_ANNOTATION_CLASSES)) { return; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 975ff361e11..ae0f3218dbe 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 = '2faa19f25fc05b98515b280d38241d688909511b'; + public const PACKAGE_VERSION = '8a000b797953910b2312c1ebacaf42db024bc1ef'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-07-21 15:35:03'; + public const RELEASE_DATE = '2023-07-21 16:57:56'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index c8fa847112e..60acefebb9c 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 ComposerAutoloaderInit540b41eb7793f9c7f18371f7ddc5b364::getLoader(); +return ComposerAutoloaderInitf6430b3e6ad00e02155a738779b37c39::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 3146795b8d4..06bbe582a54 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit540b41eb7793f9c7f18371f7ddc5b364 +class ComposerAutoloaderInitf6430b3e6ad00e02155a738779b37c39 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit540b41eb7793f9c7f18371f7ddc5b364 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit540b41eb7793f9c7f18371f7ddc5b364', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitf6430b3e6ad00e02155a738779b37c39', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit540b41eb7793f9c7f18371f7ddc5b364', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitf6430b3e6ad00e02155a738779b37c39', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit540b41eb7793f9c7f18371f7ddc5b364::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitf6430b3e6ad00e02155a738779b37c39::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit540b41eb7793f9c7f18371f7ddc5b364::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitf6430b3e6ad00e02155a738779b37c39::$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 b6d3f2a780d..835c1997e15 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit540b41eb7793f9c7f18371f7ddc5b364 +class ComposerStaticInitf6430b3e6ad00e02155a738779b37c39 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3023,9 +3023,9 @@ class ComposerStaticInit540b41eb7793f9c7f18371f7ddc5b364 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit540b41eb7793f9c7f18371f7ddc5b364::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit540b41eb7793f9c7f18371f7ddc5b364::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit540b41eb7793f9c7f18371f7ddc5b364::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitf6430b3e6ad00e02155a738779b37c39::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitf6430b3e6ad00e02155a738779b37c39::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitf6430b3e6ad00e02155a738779b37c39::$classMap; }, null, ClassLoader::class); }