mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-03-22 00:09:54 +01:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit 0f15b99a2c4b942273a848947ea342c4651e12bf

Browse Source 
0f15b99a2c [StaticTypeMapper] Reduce autowire() parameter on NameScopeFactory (#4692)
This commit is contained in:
Tomas Votruba 2023-08-07 04:18:10 +00:00
parent 08df49faa5
commit 50dd6616d2
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/StaticTypeMapper/Naming/NameScopeFactory.php
View File

@ -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
{

4
src/Application/VersionResolver.php
View File

@ -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
*/

3
src/DependencyInjection/LazyContainerFactory.php
View File

@ -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));

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit719e8af4bf9129bc0edde855082220e3::getLoader();
return ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -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;

8
vendor/composer/autoload_static.php vendored
View File

@ -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);
}