From ab985638dbb886790b156ccb8f7145672faa0622 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 31 Jan 2023 00:52:02 +0000 Subject: [PATCH] Updated Rector to commit 033b0c2bf86dc2f7cd3c6d6183ddc5ad1a3ab390 https://github.com/rectorphp/rector-src/commit/033b0c2bf86dc2f7cd3c6d6183ddc5ad1a3ab390 Fix nested extends pattern in AddReturnTypeDeclarationBasedOnParentClassMethodRector (#3325) --- ...larationBasedOnParentClassMethodRector.php | 30 +++++++++++-------- src/Application/VersionResolver.php | 4 +-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++---- vendor/composer/autoload_static.php | 8 ++--- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php index d8da91f94e7..d4204125141 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php @@ -100,24 +100,28 @@ CODE_SAMPLE if ($this->nodeNameResolver->isName($node, MethodName::CONSTRUCT)) { return null; } - $parentMethodReflection = $this->parentClassMethodTypeOverrideGuard->getParentClassMethod($node); - if (!$parentMethodReflection instanceof MethodReflection) { - return null; - } - $parentClassMethod = $this->astResolver->resolveClassMethodFromMethodReflection($parentMethodReflection); - if (!$parentClassMethod instanceof ClassMethod) { - return null; - } - if ($parentClassMethod->isPrivate()) { - return null; - } - $parentClassMethodReturnType = $parentClassMethod->getReturnType(); + $parentClassMethodReturnType = $this->getReturnTypeRecursive($node); if ($parentClassMethodReturnType === null) { return null; } - $parentClassMethodReturnType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($parentClassMethodReturnType); return $this->processClassMethodReturnType($node, $parentClassMethodReturnType); } + private function getReturnTypeRecursive(ClassMethod $classMethod) : ?Type + { + $returnType = $classMethod->getReturnType(); + if ($returnType === null) { + $parentMethodReflection = $this->parentClassMethodTypeOverrideGuard->getParentClassMethod($classMethod); + if (!$parentMethodReflection instanceof MethodReflection) { + return null; + } + $parentClassMethod = $this->astResolver->resolveClassMethodFromMethodReflection($parentMethodReflection); + if (!$parentClassMethod instanceof ClassMethod || $parentClassMethod->isPrivate()) { + return null; + } + return $this->getReturnTypeRecursive($parentClassMethod); + } + return $this->staticTypeMapper->mapPhpParserNodePHPStanType($returnType); + } private function processClassMethodReturnType(ClassMethod $classMethod, Type $parentType) : ?ClassMethod { if ($parentType instanceof MixedType) { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 37dfbc0b549..f8bab2fa3f5 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 = '82163244c12ff8d14073bda37f21cfb03e532a6f'; + public const PACKAGE_VERSION = '033b0c2bf86dc2f7cd3c6d6183ddc5ad1a3ab390'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-01-30 16:28:58'; + public const RELEASE_DATE = '2023-01-31 00:47:45'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 6b5f81f237a..1c3b2ad157b 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 ComposerAutoloaderInit644e822f2f9577c954a4348a8f005018::getLoader(); +return ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 7f4ec12ca56..049472034ee 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit644e822f2f9577c954a4348a8f005018 +class ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit644e822f2f9577c954a4348a8f005018 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit644e822f2f9577c954a4348a8f005018', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit644e822f2f9577c954a4348a8f005018', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit644e822f2f9577c954a4348a8f005018::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit644e822f2f9577c954a4348a8f005018::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$files; $requireFile = 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 99e86f6043b..88a28b0ac00 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit644e822f2f9577c954a4348a8f005018 +class ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3082,9 +3082,9 @@ class ComposerStaticInit644e822f2f9577c954a4348a8f005018 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit644e822f2f9577c954a4348a8f005018::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit644e822f2f9577c954a4348a8f005018::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit644e822f2f9577c954a4348a8f005018::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$classMap; }, null, ClassLoader::class); }