From 1847abc218b8ab5ab7eb05d97065748ee03f38d4 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 12 Dec 2021 07:12:02 +0000 Subject: [PATCH] Updated Rector to commit 70f4535cd336702571e5af138d0ee5ca38d8fff6 https://github.com/rectorphp/rector-src/commit/70f4535cd336702571e5af138d0ee5ca38d8fff6 [TypeDeclaration] Handle inner ClassMethod on ReturnTypeFromStrictTypedPropertyRector (#1470) --- .../ReturnTypeFromStrictTypedPropertyRector.php | 2 +- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php index 797f416bd3b..87002de7631 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php @@ -105,7 +105,7 @@ CODE_SAMPLE private function resolveReturnPropertyType(\PhpParser\Node\Stmt\ClassMethod $classMethod) : array { /** @var Return_[] $returns */ - $returns = $this->betterNodeFinder->findInstanceOf($classMethod, \PhpParser\Node\Stmt\Return_::class); + $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($classMethod, \PhpParser\Node\Stmt\Return_::class); $propertyTypes = []; foreach ($returns as $return) { if ($return->expr === null) { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 2efe743a2b8..915cd23a422 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'e4f3f5c831a12a290f1d359ab6fd0d7e97243872'; + public const PACKAGE_VERSION = '70f4535cd336702571e5af138d0ee5ca38d8fff6'; /** * @var string */ - public const RELEASE_DATE = '2021-12-12 00:20:08'; + public const RELEASE_DATE = '2021-12-12 07:56:32'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20211212\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index b47e2ff0c92..14757c25b11 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18::getLoader(); +return ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index c0663242ff4..413e785bdd9 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18 +class ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitf1756ae73ceed448421152a4ed2d4f18::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit69f2a7813102d5bb4a982edd31d09f55::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitf1756ae73ceed448421152a4ed2d4f18::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit69f2a7813102d5bb4a982edd31d09f55::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiref1756ae73ceed448421152a4ed2d4f18($fileIdentifier, $file); + composerRequire69f2a7813102d5bb4a982edd31d09f55($fileIdentifier, $file); } return $loader; } } -function composerRequiref1756ae73ceed448421152a4ed2d4f18($fileIdentifier, $file) +function composerRequire69f2a7813102d5bb4a982edd31d09f55($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 04141461be4..7c668eea9a9 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitf1756ae73ceed448421152a4ed2d4f18 +class ComposerStaticInit69f2a7813102d5bb4a982edd31d09f55 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -3822,9 +3822,9 @@ class ComposerStaticInitf1756ae73ceed448421152a4ed2d4f18 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitf1756ae73ceed448421152a4ed2d4f18::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitf1756ae73ceed448421152a4ed2d4f18::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitf1756ae73ceed448421152a4ed2d4f18::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit69f2a7813102d5bb4a982edd31d09f55::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit69f2a7813102d5bb4a982edd31d09f55::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit69f2a7813102d5bb4a982edd31d09f55::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index cc81dc7eddb..99811127369 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) { spl_autoload_call('RectorPrefix20211212\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18', false) && !interface_exists('ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18', false) && !trait_exists('ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18', false)) { - spl_autoload_call('RectorPrefix20211212\ComposerAutoloaderInitf1756ae73ceed448421152a4ed2d4f18'); +if (!class_exists('ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55', false) && !interface_exists('ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55', false) && !trait_exists('ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55', false)) { + spl_autoload_call('RectorPrefix20211212\ComposerAutoloaderInit69f2a7813102d5bb4a982edd31d09f55'); } if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) { spl_autoload_call('RectorPrefix20211212\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -81,9 +81,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20211212\print_node(...func_get_args()); } } -if (!function_exists('composerRequiref1756ae73ceed448421152a4ed2d4f18')) { - function composerRequiref1756ae73ceed448421152a4ed2d4f18() { - return \RectorPrefix20211212\composerRequiref1756ae73ceed448421152a4ed2d4f18(...func_get_args()); +if (!function_exists('composerRequire69f2a7813102d5bb4a982edd31d09f55')) { + function composerRequire69f2a7813102d5bb4a982edd31d09f55() { + return \RectorPrefix20211212\composerRequire69f2a7813102d5bb4a982edd31d09f55(...func_get_args()); } } if (!function_exists('scanPath')) {