diff --git a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php index af58f033f6b..99e7c80ffb4 100644 --- a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php +++ b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php @@ -25,7 +25,6 @@ use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser; use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser; use ReflectionClass; -use RectorPrefix202308\Symfony\Contracts\Service\Attribute\Required; /** * @see \Rector\Tests\CodingStyle\ClassNameImport\ShortNameResolver\ShortNameResolverTest */ @@ -56,6 +55,11 @@ final class ShortNameResolver * @var \Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher */ private $useImportNameMatcher; + /** + * @readonly + * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory + */ + private $phpDocInfoFactory; /** * @var string * @see https://regex101.com/r/KphLd2/1 @@ -65,24 +69,13 @@ final class ShortNameResolver * @var array */ private $shortNamesByFilePath = []; - /** - * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory - */ - private $phpDocInfoFactory; - public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider, BetterNodeFinder $betterNodeFinder, UseImportNameMatcher $useImportNameMatcher) + public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider, BetterNodeFinder $betterNodeFinder, UseImportNameMatcher $useImportNameMatcher, PhpDocInfoFactory $phpDocInfoFactory) { $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser; $this->nodeNameResolver = $nodeNameResolver; $this->reflectionProvider = $reflectionProvider; $this->betterNodeFinder = $betterNodeFinder; $this->useImportNameMatcher = $useImportNameMatcher; - } - // Avoids circular reference - /** - * @required - */ - public function autowire(PhpDocInfoFactory $phpDocInfoFactory) : void - { $this->phpDocInfoFactory = $phpDocInfoFactory; } /** diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index a593b60f773..055d5c313a6 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 = '35a594b090ffd56a8fcb8fc56b9afcd22842655c'; + public const PACKAGE_VERSION = '033289a3b207c6a1cd9cba0cd027a16c45356aa8'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-07 10:49:08'; + public const RELEASE_DATE = '2023-08-07 11:04:51'; /** * @var int */ diff --git a/src/DependencyInjection/LazyContainerFactory.php b/src/DependencyInjection/LazyContainerFactory.php index 7946d745b5b..530c9c00c7d 100644 --- a/src/DependencyInjection/LazyContainerFactory.php +++ b/src/DependencyInjection/LazyContainerFactory.php @@ -26,7 +26,6 @@ use Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\ArrayP use Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\PlainValueParser; use Rector\Caching\Cache; use Rector\Caching\CacheFactory; -use Rector\CodingStyle\ClassNameImport\ShortNameResolver; use Rector\Core\Configuration\Option; use Rector\Core\Configuration\Parameter\SimpleParameterProvider; use Rector\Core\Reflection\ReflectionResolver; @@ -230,10 +229,6 @@ final class LazyContainerFactory $annotationToAttributeMapper = $container->make(AnnotationToAttributeMapper::class); $arrayItemNodeAnnotationToAttributeMapper->autowire($annotationToAttributeMapper); }); - $container->afterResolving(ShortNameResolver::class, static function (ShortNameResolver $shortNameResolver, Container $container) : void { - $phpDocInfoFactory = $container->make(PhpDocInfoFactory::class); - $shortNameResolver->autowire($phpDocInfoFactory); - }); $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)); }); diff --git a/vendor/autoload.php b/vendor/autoload.php index ce219565f96..78a74fb0e06 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 ComposerAutoloaderInit34c98ebdc312d5b454f37578584e9968::getLoader(); +return ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index ca9660e772a..fc8c6102fc8 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit34c98ebdc312d5b454f37578584e9968 +class ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit34c98ebdc312d5b454f37578584e9968 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit34c98ebdc312d5b454f37578584e9968', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit34c98ebdc312d5b454f37578584e9968', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit34c98ebdc312d5b454f37578584e9968::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit719e8af4bf9129bc0edde855082220e3::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit34c98ebdc312d5b454f37578584e9968::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$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 7236c9ed2ed..020010e6d21 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit34c98ebdc312d5b454f37578584e9968 +class ComposerStaticInit719e8af4bf9129bc0edde855082220e3 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3010,9 +3010,9 @@ class ComposerStaticInit34c98ebdc312d5b454f37578584e9968 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit34c98ebdc312d5b454f37578584e9968::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit34c98ebdc312d5b454f37578584e9968::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit34c98ebdc312d5b454f37578584e9968::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit719e8af4bf9129bc0edde855082220e3::$classMap; }, null, ClassLoader::class); }