From 1463cdd31a00d891d04ab87f57f4b68a6d10b118 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 13 Jul 2023 16:34:50 +0000 Subject: [PATCH] Updated Rector to commit d64a761597a5e2f8b9158c770dcad5de08286f69 https://github.com/rectorphp/rector-src/commit/d64a761597a5e2f8b9158c770dcad5de08286f69 [Php70] Remove $scope->isInClass on Php4ConstructorRector (#4507) --- .../Php70/Rector/ClassMethod/Php4ConstructorRector.php | 6 +++--- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php b/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php index b97ba1b4342..1108e9dcde8 100644 --- a/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php +++ b/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php @@ -86,9 +86,6 @@ CODE_SAMPLE if (!\is_string($className)) { return null; } - if (!$scope->isInClass()) { - return null; - } $psr4ConstructorMethod = $node->getMethod(\lcfirst($className)) ?? $node->getMethod($className); if (!$psr4ConstructorMethod instanceof ClassMethod) { return null; @@ -97,6 +94,9 @@ CODE_SAMPLE return null; } $classReflection = $scope->getClassReflection(); + if (!$classReflection instanceof ClassReflection) { + return null; + } // process parent call references first $this->processClassMethodStatementsForParentConstructorCalls($psr4ConstructorMethod, $scope); // does it already have a __construct method? diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 27f3a7ade1e..9acf351900f 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 = '8537bbd52a5b9d8aa619326b750df6dcb1b30f32'; + public const PACKAGE_VERSION = 'd64a761597a5e2f8b9158c770dcad5de08286f69'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-07-13 22:32:27'; + public const RELEASE_DATE = '2023-07-13 16:30:57'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 7138c72109f..2fcc23e46f0 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 ComposerAutoloaderInita0fc3bee25f0e3ca207bc6ec0fa01e46::getLoader(); +return ComposerAutoloaderInita93e87870da4c374cdbaadf7564e5543::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index d6d37abb5fa..ada299c9651 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInita0fc3bee25f0e3ca207bc6ec0fa01e46 +class ComposerAutoloaderInita93e87870da4c374cdbaadf7564e5543 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInita0fc3bee25f0e3ca207bc6ec0fa01e46 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInita0fc3bee25f0e3ca207bc6ec0fa01e46', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInita93e87870da4c374cdbaadf7564e5543', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInita0fc3bee25f0e3ca207bc6ec0fa01e46', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInita93e87870da4c374cdbaadf7564e5543', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInita0fc3bee25f0e3ca207bc6ec0fa01e46::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInita93e87870da4c374cdbaadf7564e5543::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInita0fc3bee25f0e3ca207bc6ec0fa01e46::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInita93e87870da4c374cdbaadf7564e5543::$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 bf0faef68df..95a64994619 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInita0fc3bee25f0e3ca207bc6ec0fa01e46 +class ComposerStaticInita93e87870da4c374cdbaadf7564e5543 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3037,9 +3037,9 @@ class ComposerStaticInita0fc3bee25f0e3ca207bc6ec0fa01e46 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInita0fc3bee25f0e3ca207bc6ec0fa01e46::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInita0fc3bee25f0e3ca207bc6ec0fa01e46::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInita0fc3bee25f0e3ca207bc6ec0fa01e46::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInita93e87870da4c374cdbaadf7564e5543::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInita93e87870da4c374cdbaadf7564e5543::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInita93e87870da4c374cdbaadf7564e5543::$classMap; }, null, ClassLoader::class); }