mirror of
https://github.com/rectorphp/rector.git
synced 2024-06-13 06:32:22 +00:00
Updated Rector to commit 64156d1395bc8fe6985c8b75f6d3bc447776acdd
64156d1395
[TypeDeclaration] Remove parent lookup on ReturnTypeInferer (#4172)
This commit is contained in:
parent
ca8754469c
commit
67f69787ca
|
@ -9,7 +9,6 @@ use PhpParser\Node\Expr\ArrowFunction;
|
|||
use PhpParser\Node\Expr\Closure;
|
||||
use PhpParser\Node\Expr\Yield_;
|
||||
use PhpParser\Node\FunctionLike;
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PhpParser\Node\Stmt\Function_;
|
||||
use PhpParser\Node\Stmt\Return_;
|
||||
|
@ -25,8 +24,8 @@ use Rector\Core\Enum\ObjectReference;
|
|||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\Core\Php\PhpVersionProvider;
|
||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Rector\Core\ValueObject\PhpVersionFeature;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
|
||||
use Rector\TypeDeclaration\TypeAnalyzer\GenericClassStringTypeNormalizer;
|
||||
|
@ -62,6 +61,11 @@ final class ReturnTypeInferer
|
|||
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
|
||||
*/
|
||||
private $betterNodeFinder;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\Reflection\ReflectionResolver
|
||||
*/
|
||||
private $reflectionResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PHPStan\Reflection\ReflectionProvider
|
||||
|
@ -72,21 +76,16 @@ final class ReturnTypeInferer
|
|||
* @var \Rector\NodeTypeResolver\NodeTypeResolver
|
||||
*/
|
||||
private $nodeTypeResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\NodeNameResolver\NodeNameResolver
|
||||
*/
|
||||
private $nodeNameResolver;
|
||||
public function __construct(TypeNormalizer $typeNormalizer, ReturnedNodesReturnTypeInfererTypeInferer $returnedNodesReturnTypeInfererTypeInferer, GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, PhpVersionProvider $phpVersionProvider, BetterNodeFinder $betterNodeFinder, ReflectionProvider $reflectionProvider, NodeTypeResolver $nodeTypeResolver, NodeNameResolver $nodeNameResolver)
|
||||
public function __construct(TypeNormalizer $typeNormalizer, ReturnedNodesReturnTypeInfererTypeInferer $returnedNodesReturnTypeInfererTypeInferer, GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, PhpVersionProvider $phpVersionProvider, BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, ReflectionProvider $reflectionProvider, NodeTypeResolver $nodeTypeResolver)
|
||||
{
|
||||
$this->typeNormalizer = $typeNormalizer;
|
||||
$this->returnedNodesReturnTypeInfererTypeInferer = $returnedNodesReturnTypeInfererTypeInferer;
|
||||
$this->genericClassStringTypeNormalizer = $genericClassStringTypeNormalizer;
|
||||
$this->phpVersionProvider = $phpVersionProvider;
|
||||
$this->betterNodeFinder = $betterNodeFinder;
|
||||
$this->reflectionResolver = $reflectionResolver;
|
||||
$this->reflectionProvider = $reflectionProvider;
|
||||
$this->nodeTypeResolver = $nodeTypeResolver;
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
}
|
||||
/**
|
||||
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure|\PhpParser\Node\Expr\ArrowFunction $functionLike
|
||||
|
@ -128,13 +127,13 @@ final class ReturnTypeInferer
|
|||
if (!$type instanceof ThisType) {
|
||||
return $type;
|
||||
}
|
||||
$class = $this->betterNodeFinder->findParentType($functionLike, Class_::class);
|
||||
$classReflection = $this->reflectionResolver->resolveClassReflection($functionLike);
|
||||
$objectType = $type->getStaticObjectType();
|
||||
$objectTypeClassName = $objectType->getClassName();
|
||||
if (!$class instanceof Class_) {
|
||||
if (!$classReflection instanceof ClassReflection || !$classReflection->isClass()) {
|
||||
return $type;
|
||||
}
|
||||
if ($this->nodeNameResolver->isName($class, $objectTypeClassName)) {
|
||||
if ($classReflection->getName() === $objectTypeClassName) {
|
||||
return $type;
|
||||
}
|
||||
return new MixedType();
|
||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '424b874e8cbfde95c46e1bba12ffe6931c375197';
|
||||
public const PACKAGE_VERSION = '64156d1395bc8fe6985c8b75f6d3bc447776acdd';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-06-11 12:50:49';
|
||||
public const RELEASE_DATE = '2023-06-11 13:20:01';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
|
@ -15,7 +15,7 @@ final class RectorKernel
|
|||
/**
|
||||
* @var string
|
||||
*/
|
||||
private const CACHE_KEY = 'v91';
|
||||
private const CACHE_KEY = 'v92';
|
||||
/**
|
||||
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
|
||||
*/
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit2378f77656410cec75dca53cf234ebb4::getLoader();
|
||||
return ComposerAutoloaderInit76565ad9fbfba24958235025a652c118::getLoader();
|
||||
|
|
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit2378f77656410cec75dca53cf234ebb4
|
||||
class ComposerAutoloaderInit76565ad9fbfba24958235025a652c118
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInit2378f77656410cec75dca53cf234ebb4
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit2378f77656410cec75dca53cf234ebb4', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit76565ad9fbfba24958235025a652c118', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit2378f77656410cec75dca53cf234ebb4', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit76565ad9fbfba24958235025a652c118', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit2378f77656410cec75dca53cf234ebb4::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit76565ad9fbfba24958235025a652c118::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit2378f77656410cec75dca53cf234ebb4::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit76565ad9fbfba24958235025a652c118::$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
8
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit2378f77656410cec75dca53cf234ebb4
|
||||
class ComposerStaticInit76565ad9fbfba24958235025a652c118
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -3127,9 +3127,9 @@ class ComposerStaticInit2378f77656410cec75dca53cf234ebb4
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit2378f77656410cec75dca53cf234ebb4::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit2378f77656410cec75dca53cf234ebb4::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit2378f77656410cec75dca53cf234ebb4::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit76565ad9fbfba24958235025a652c118::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit76565ad9fbfba24958235025a652c118::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit76565ad9fbfba24958235025a652c118::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user