From 50dd6616d284750d8ef95579ae11248c0aca714a Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 7 Aug 2023 04:18:10 +0000 Subject: [PATCH] Updated Rector to commit 0f15b99a2c4b942273a848947ea342c4651e12bf https://github.com/rectorphp/rector-src/commit/0f15b99a2c4b942273a848947ea342c4651e12bf [StaticTypeMapper] Reduce autowire() parameter on NameScopeFactory (#4692) --- .../StaticTypeMapper/Naming/NameScopeFactory.php | 15 ++++++++------- src/Application/VersionResolver.php | 4 ++-- src/DependencyInjection/LazyContainerFactory.php | 3 +-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/StaticTypeMapper/Naming/NameScopeFactory.php b/packages/StaticTypeMapper/Naming/NameScopeFactory.php index cb361358594..21822fcd9b8 100644 --- a/packages/StaticTypeMapper/Naming/NameScopeFactory.php +++ b/packages/StaticTypeMapper/Naming/NameScopeFactory.php @@ -35,6 +35,11 @@ final class NameScopeFactory * @var \Rector\Core\PhpParser\AstResolver */ private $astResolver; + /** + * @readonly + * @var \Rector\Core\Reflection\ReflectionResolver + */ + private $reflectionResolver; /** * @var \Rector\StaticTypeMapper\StaticTypeMapper */ @@ -43,24 +48,20 @@ final class NameScopeFactory * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory */ private $phpDocInfoFactory; - /** - * @var \Rector\Core\Reflection\ReflectionResolver - */ - private $reflectionResolver; - public function __construct(UseImportsResolver $useImportsResolver, AstResolver $astResolver) + public function __construct(UseImportsResolver $useImportsResolver, AstResolver $astResolver, ReflectionResolver $reflectionResolver) { $this->useImportsResolver = $useImportsResolver; $this->astResolver = $astResolver; + $this->reflectionResolver = $reflectionResolver; } // This is needed to avoid circular references /** * @required */ - public function autowire(PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, ReflectionResolver $reflectionResolver) : void + public function autowire(PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper) : void { $this->phpDocInfoFactory = $phpDocInfoFactory; $this->staticTypeMapper = $staticTypeMapper; - $this->reflectionResolver = $reflectionResolver; } public function createNameScopeFromNodeWithoutTemplateTypes(Node $node) : NameScope { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 055d5c313a6..9108a3f3bae 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 = '033289a3b207c6a1cd9cba0cd027a16c45356aa8'; + public const PACKAGE_VERSION = '0f15b99a2c4b942273a848947ea342c4651e12bf'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-07 11:04:51'; + public const RELEASE_DATE = '2023-08-07 11:13:22'; /** * @var int */ diff --git a/src/DependencyInjection/LazyContainerFactory.php b/src/DependencyInjection/LazyContainerFactory.php index 530c9c00c7d..ef2fe5d0980 100644 --- a/src/DependencyInjection/LazyContainerFactory.php +++ b/src/DependencyInjection/LazyContainerFactory.php @@ -28,7 +28,6 @@ use Rector\Caching\Cache; use Rector\Caching\CacheFactory; use Rector\Core\Configuration\Option; use Rector\Core\Configuration\Parameter\SimpleParameterProvider; -use Rector\Core\Reflection\ReflectionResolver; use Rector\Core\Util\Reflection\PrivatesAccessor; use Rector\NodeNameResolver\Contract\NodeNameResolverInterface; use Rector\NodeNameResolver\NodeNameResolver; @@ -230,7 +229,7 @@ final class LazyContainerFactory $arrayItemNodeAnnotationToAttributeMapper->autowire($annotationToAttributeMapper); }); $container->afterResolving(NameScopeFactory::class, static function (NameScopeFactory $nameScopeFactory, Container $container) : void { - $nameScopeFactory->autowire($container->make(PhpDocInfoFactory::class), $container->make(StaticTypeMapper::class), $container->make(ReflectionResolver::class)); + $nameScopeFactory->autowire($container->make(PhpDocInfoFactory::class), $container->make(StaticTypeMapper::class)); }); $container->afterResolving(ArrayTypeMapper::class, static function (ArrayTypeMapper $arrayTypeMapper, Container $container) : void { $arrayTypeMapper->autowire($container->make(PHPStanStaticTypeMapper::class), $container->make(UnionTypeCommonTypeNarrower::class), $container->make(ReflectionProvider::class), $container->make(GenericClassStringTypeNormalizer::class), $container->make(DetailedTypeAnalyzer::class)); diff --git a/vendor/autoload.php b/vendor/autoload.php index 78a74fb0e06..6c39b439004 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 ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3::getLoader(); +return ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index fc8c6102fc8..6d7fb1437fb 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3 +class ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit719e8af4bf9129bc0edde855082220e3::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$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 020010e6d21..c69d0b6df76 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit719e8af4bf9129bc0edde855082220e3 +class ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3010,9 +3010,9 @@ class ComposerStaticInit719e8af4bf9129bc0edde855082220e3 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$classMap; }, null, ClassLoader::class); }