diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php index d4204125141..06d84a756d1 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php @@ -101,7 +101,7 @@ CODE_SAMPLE return null; } $parentClassMethodReturnType = $this->getReturnTypeRecursive($node); - if ($parentClassMethodReturnType === null) { + if (!$parentClassMethodReturnType instanceof Type) { return null; } return $this->processClassMethodReturnType($node, $parentClassMethodReturnType); @@ -115,7 +115,10 @@ CODE_SAMPLE return null; } $parentClassMethod = $this->astResolver->resolveClassMethodFromMethodReflection($parentMethodReflection); - if (!$parentClassMethod instanceof ClassMethod || $parentClassMethod->isPrivate()) { + if (!$parentClassMethod instanceof ClassMethod) { + return null; + } + if ($parentClassMethod->isPrivate()) { return null; } return $this->getReturnTypeRecursive($parentClassMethod); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index f8bab2fa3f5..f3f3df571cb 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 = '033b0c2bf86dc2f7cd3c6d6183ddc5ad1a3ab390'; + public const PACKAGE_VERSION = '88a1434ef75fa9fb83524e3db1824cd8e961bc85'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-01-31 00:47:45'; + public const RELEASE_DATE = '2023-01-31 10:04:55'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 1c3b2ad157b..842c991f1ac 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 ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca::getLoader(); +return ComposerAutoloaderInit1521cb9b402900dfded1d46b9fa4f8f9::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 049472034ee..ef79328883d 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca +class ComposerAutoloaderInit1521cb9b402900dfded1d46b9fa4f8f9 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit1521cb9b402900dfded1d46b9fa4f8f9', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit3e49df11e5e7a9c3c313caa0abd511ca', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit1521cb9b402900dfded1d46b9fa4f8f9', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit1521cb9b402900dfded1d46b9fa4f8f9::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit1521cb9b402900dfded1d46b9fa4f8f9::$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 88a28b0ac00..24405f45ee9 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca +class ComposerStaticInit1521cb9b402900dfded1d46b9fa4f8f9 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3082,9 +3082,9 @@ class ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit3e49df11e5e7a9c3c313caa0abd511ca::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit1521cb9b402900dfded1d46b9fa4f8f9::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit1521cb9b402900dfded1d46b9fa4f8f9::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit1521cb9b402900dfded1d46b9fa4f8f9::$classMap; }, null, ClassLoader::class); }