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

Updated Rector to commit 8585ff77542ad3ff7cd55226e23378ee866865aa

Browse Source 
8585ff7754 [NodeTypeResolver] Remove parent lookup on ArrayTypeAnalyzer (#4261)
This commit is contained in:
Tomas Votruba 2023-06-17 19:21:37 +00:00
parent 084bcaaa18
commit ab1ff8301f
5 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php
View File

@ -10,6 +10,7 @@ use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Stmt\ClassLike; use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Property; use PhpParser\Node\Stmt\Property;
use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode; use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\Php\PhpPropertyReflection; use PHPStan\Reflection\Php\PhpPropertyReflection;
use PHPStan\Type\Accessory\HasOffsetType; use PHPStan\Type\Accessory\HasOffsetType;
use PHPStan\Type\Accessory\NonEmptyArrayType; use PHPStan\Type\Accessory\NonEmptyArrayType;
@ -20,7 +21,7 @@ use PHPStan\Type\MixedType;
use PHPStan\Type\Type; use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Core\PhpParser\Node\BetterNodeFinder; use Rector\Core\PhpParser\ClassLikeAstResolver;
use Rector\Core\Reflection\ReflectionResolver; use Rector\Core\Reflection\ReflectionResolver;
use Rector\NodeNameResolver\NodeNameResolver; use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\NodeTypeResolver; use Rector\NodeTypeResolver\NodeTypeResolver;
@ -36,11 +37,6 @@ final class ArrayTypeAnalyzer
* @var \Rector\NodeTypeResolver\NodeTypeResolver * @var \Rector\NodeTypeResolver\NodeTypeResolver
*/ */
private $nodeTypeResolver; private $nodeTypeResolver;
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/** /**
* @readonly * @readonly
* @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
@ -51,13 +47,18 @@ final class ArrayTypeAnalyzer
* @var \Rector\Core\Reflection\ReflectionResolver * @var \Rector\Core\Reflection\ReflectionResolver
*/ */
private $reflectionResolver; private $reflectionResolver;
public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, BetterNodeFinder $betterNodeFinder, PhpDocInfoFactory $phpDocInfoFactory, ReflectionResolver $reflectionResolver) /**
* @readonly
* @var \Rector\Core\PhpParser\ClassLikeAstResolver
*/
private $classLikeAstResolver;
public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, PhpDocInfoFactory $phpDocInfoFactory, ReflectionResolver $reflectionResolver, ClassLikeAstResolver $classLikeAstResolver)
{ {
$this->nodeNameResolver = $nodeNameResolver; $this->nodeNameResolver = $nodeNameResolver;
$this->nodeTypeResolver = $nodeTypeResolver; $this->nodeTypeResolver = $nodeTypeResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->phpDocInfoFactory = $phpDocInfoFactory; $this->phpDocInfoFactory = $phpDocInfoFactory;
$this->reflectionResolver = $reflectionResolver; $this->reflectionResolver = $reflectionResolver;
$this->classLikeAstResolver = $classLikeAstResolver;
} }
public function isArrayType(Expr $expr) : bool public function isArrayType(Expr $expr) : bool
{ {
@ -108,14 +109,16 @@ final class ArrayTypeAnalyzer
if (!$expr instanceof PropertyFetch && !$expr instanceof StaticPropertyFetch) { if (!$expr instanceof PropertyFetch && !$expr instanceof StaticPropertyFetch) {
return \false; return \false;
} }
$classLike = $this->betterNodeFinder->findParentType($expr, ClassLike::class); $classReflection = $this->reflectionResolver->resolveClassReflection($expr);
if (!$classLike instanceof ClassLike) { if (!$classReflection instanceof ClassReflection) {
return \false; return \false;
} }
$propertyName = $this->nodeNameResolver->getName($expr->name); $propertyName = $this->nodeNameResolver->getName($expr->name);
if ($propertyName === null) { if ($propertyName === null) {
return \false; return \false;
} }
/** @var ClassLike $classLike */
$classLike = $this->classLikeAstResolver->resolveClassFromClassReflection($classReflection);
$property = $classLike->getProperty($propertyName); $property = $classLike->getProperty($propertyName);
if (!$property instanceof Property) { if (!$property instanceof Property) {
return \false; return \false;
@ -139,10 +142,12 @@ final class ArrayTypeAnalyzer
if (!$expr instanceof PropertyFetch && !$expr instanceof StaticPropertyFetch) { if (!$expr instanceof PropertyFetch && !$expr instanceof StaticPropertyFetch) {
return \false; return \false;
} }
$classLike = $this->betterNodeFinder->findParentType($expr, ClassLike::class); $classReflection = $this->reflectionResolver->resolveClassReflection($expr);
if (!$classLike instanceof ClassLike) { if (!$classReflection instanceof ClassReflection) {
return \false; return \false;
} }
/** @var ClassLike $classLike */
$classLike = $this->classLikeAstResolver->resolveClassFromClassReflection($classReflection);
$propertyName = $this->nodeNameResolver->getName($expr->name); $propertyName = $this->nodeNameResolver->getName($expr->name);
if ($propertyName === null) { if ($propertyName === null) {
return \false; return \false;

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api * @api
* @var string * @var string
*/ */
public const PACKAGE_VERSION = 'ad65e0445c0a68393d7031067f095ea9f8b1cbde'; public const PACKAGE_VERSION = '8585ff77542ad3ff7cd55226e23378ee866865aa';
/** /**
* @api * @api
* @var string * @var string
*/ */
public const RELEASE_DATE = '2023-06-18 01:20:01'; public const RELEASE_DATE = '2023-06-18 02:16:03';
/** /**
* @var int * @var int
*/ */

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInitacb289715da70e548cc7249242948952 class ComposerAutoloaderInit45ad86eb8329557aaaa52a427f6e2496
{ {
private static $loader; private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitacb289715da70e548cc7249242948952
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInitacb289715da70e548cc7249242948952', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit45ad86eb8329557aaaa52a427f6e2496', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitacb289715da70e548cc7249242948952', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit45ad86eb8329557aaaa52a427f6e2496', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php'; require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitacb289715da70e548cc7249242948952::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::getInitializer($loader));
$loader->setClassMapAuthoritative(true); $loader->setClassMapAuthoritative(true);
$loader->register(true); $loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitacb289715da70e548cc7249242948952::$files; $filesToLoad = \Composer\Autoload\ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) { $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInitacb289715da70e548cc7249242948952 class ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496
{ {
public static $files = array ( public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3094,9 +3094,9 @@ class ComposerStaticInitacb289715da70e548cc7249242948952
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitacb289715da70e548cc7249242948952::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitacb289715da70e548cc7249242948952::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitacb289715da70e548cc7249242948952::$classMap; $loader->classMap = ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }