octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 8550c092de01d1167d95922a77490c282f3154d5 

8550c092de [Ast] Use ClassLikeAstResolver directly when possible (#4262)
This commit is contained in:
Tomas Votruba 2023-06-17 19:37:05 +00:00
parent ab1ff8301f
commit a0d8cc6508
8 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rules/Php71/NodeAnalyzer/CountableAnalyzer.php
View File

@ -19,7 +19,7 @@ use PHPStan\Type\Type;
use PHPStan\Type\TypeWithClassName;
use PHPStan\Type\UnionType;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\ClassLikeAstResolver;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\NodeTypeResolver;
@ -58,10 +58,10 @@ final class CountableAnalyzer
private $reflectionResolver;
/**
* @readonly
* @var \Rector\Core\PhpParser\AstResolver
* @var \Rector\Core\PhpParser\ClassLikeAstResolver
*/
private $astResolver;
public function __construct(NodeTypeResolver $nodeTypeResolver, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider, PropertyFetchAnalyzer $propertyFetchAnalyzer, ConstructorAssignDetector $constructorAssignDetector, ReflectionResolver $reflectionResolver, AstResolver $astResolver)
private $classLikeAstResolver;
public function __construct(NodeTypeResolver $nodeTypeResolver, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider, PropertyFetchAnalyzer $propertyFetchAnalyzer, ConstructorAssignDetector $constructorAssignDetector, ReflectionResolver $reflectionResolver, ClassLikeAstResolver $classLikeAstResolver)
{
$this->nodeTypeResolver = $nodeTypeResolver;
$this->nodeNameResolver = $nodeNameResolver;
@ -69,7 +69,7 @@ final class CountableAnalyzer
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->constructorAssignDetector = $constructorAssignDetector;
$this->reflectionResolver = $reflectionResolver;
$this->astResolver = $astResolver;
$this->classLikeAstResolver = $classLikeAstResolver;
}
public function isCastableArrayType(Expr $expr, ArrayType $arrayType, Scope $scope) : bool
{
@ -134,7 +134,7 @@ final class CountableAnalyzer
if (!$classReflection instanceof ClassReflection) {
return \false;
}
$classLike = $this->astResolver->resolveClassFromName($classReflection->getName());
$classLike = $this->classLikeAstResolver->resolveClassFromClassReflection($classReflection);
if (!$classLike instanceof ClassLike) {
return \false;
}

13
rules/Php80/NodeAnalyzer/PhpAttributeAnalyzer.php
View File

@ -14,16 +14,16 @@ use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Property;
use PHPStan\Reflection\ReflectionProvider;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\ClassLikeAstResolver;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\PhpAttribute\Enum\DocTagNodeState;
final class PhpAttributeAnalyzer
{
/**
* @readonly
* @var \Rector\Core\PhpParser\AstResolver
* @var \Rector\Core\PhpParser\ClassLikeAstResolver
*/
private $astResolver;
private $classLikeAstResolver;
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
@ -34,9 +34,9 @@ final class PhpAttributeAnalyzer
* @var \PHPStan\Reflection\ReflectionProvider
*/
private $reflectionProvider;
public function __construct(AstResolver $astResolver, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider)
public function __construct(ClassLikeAstResolver $classLikeAstResolver, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider)
{
$this->astResolver = $astResolver;
$this->classLikeAstResolver = $classLikeAstResolver;
$this->nodeNameResolver = $nodeNameResolver;
$this->reflectionProvider = $reflectionProvider;
}
@ -64,8 +64,7 @@ final class PhpAttributeAnalyzer
$classReflection = $this->reflectionProvider->getClass($className);
$ancestorClassReflections = \array_merge($classReflection->getParents(), $classReflection->getInterfaces());
foreach ($ancestorClassReflections as $ancestorClassReflection) {
$ancestorClassName = $ancestorClassReflection->getName();
$resolvedClass = $this->astResolver->resolveClassFromName($ancestorClassName);
$resolvedClass = $this->classLikeAstResolver->resolveClassFromClassReflection($ancestorClassReflection);
if (!$resolvedClass instanceof Class_) {
continue;
}

12
rules/Privatization/Guard/ParentPropertyLookupGuard.php
View File

@ -14,7 +14,7 @@ use PHPStan\Reflection\ClassReflection;
use Rector\Core\Enum\ObjectReference;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\NodeManipulator\PropertyManipulator;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\ClassLikeAstResolver;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use Rector\NodeNameResolver\NodeNameResolver;
@ -37,9 +37,9 @@ final class ParentPropertyLookupGuard
private $propertyFetchAnalyzer;
/**
* @readonly
* @var \Rector\Core\PhpParser\AstResolver
* @var \Rector\Core\PhpParser\ClassLikeAstResolver
*/
private $astResolver;
private $classLikeAstResolver;
/**
* @readonly
* @var \Rector\Core\NodeManipulator\PropertyManipulator
@ -50,12 +50,12 @@ final class ParentPropertyLookupGuard
* @var \Rector\Core\Util\Reflection\PrivatesAccessor
*/
private $privatesAccessor;
public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, AstResolver $astResolver, PropertyManipulator $propertyManipulator, PrivatesAccessor $privatesAccessor)
public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, ClassLikeAstResolver $classLikeAstResolver, PropertyManipulator $propertyManipulator, PrivatesAccessor $privatesAccessor)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeNameResolver = $nodeNameResolver;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->astResolver = $astResolver;
$this->classLikeAstResolver = $classLikeAstResolver;
$this->propertyManipulator = $propertyManipulator;
$this->privatesAccessor = $privatesAccessor;
}
@ -87,7 +87,7 @@ final class ParentPropertyLookupGuard
}
private function isFoundInParentClassMethods(ClassReflection $parentClassReflection, string $propertyName, string $className) : bool
{
$classLike = $this->astResolver->resolveClassFromName($parentClassReflection->getName());
$classLike = $this->classLikeAstResolver->resolveClassFromClassReflection($parentClassReflection);
if (!$classLike instanceof Class_) {
return \false;
}

4
src/Application/VersionResolver.php
View File

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

12
src/NodeManipulator/PropertyManipulator.php
View File

@ -27,7 +27,7 @@ use PHPStan\Type\ObjectType;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\ClassLikeAstResolver;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder;
use Rector\Core\Reflection\ReflectionResolver;
@ -110,9 +110,9 @@ final class PropertyManipulator
private $constructorAssignDetector;
/**
* @readonly
* @var \Rector\Core\PhpParser\AstResolver
* @var \Rector\Core\PhpParser\ClassLikeAstResolver
*/
private $astResolver;
private $classLikeAstResolver;
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
@ -127,7 +127,7 @@ final class PropertyManipulator
* @var string[]|class-string<Table>[]
*/
private const ALLOWED_NOT_READONLY_ANNOTATION_CLASS_OR_ATTRIBUTES = ['Doctrine\\ORM\\Mapping\\Entity', 'Doctrine\\ORM\\Mapping\\Table', 'Doctrine\\ORM\\Mapping\\MappedSuperclass'];
public function __construct(\Rector\Core\NodeManipulator\AssignManipulator $assignManipulator, BetterNodeFinder $betterNodeFinder, VariableToConstantGuard $variableToConstantGuard, ReadWritePropertyAnalyzer $readWritePropertyAnalyzer, PhpDocInfoFactory $phpDocInfoFactory, PropertyFetchFinder $propertyFetchFinder, ReflectionResolver $reflectionResolver, NodeNameResolver $nodeNameResolver, PhpAttributeAnalyzer $phpAttributeAnalyzer, NodeTypeResolver $nodeTypeResolver, PromotedPropertyResolver $promotedPropertyResolver, ConstructorAssignDetector $constructorAssignDetector, AstResolver $astResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, MultiInstanceofChecker $multiInstanceofChecker)
public function __construct(\Rector\Core\NodeManipulator\AssignManipulator $assignManipulator, BetterNodeFinder $betterNodeFinder, VariableToConstantGuard $variableToConstantGuard, ReadWritePropertyAnalyzer $readWritePropertyAnalyzer, PhpDocInfoFactory $phpDocInfoFactory, PropertyFetchFinder $propertyFetchFinder, ReflectionResolver $reflectionResolver, NodeNameResolver $nodeNameResolver, PhpAttributeAnalyzer $phpAttributeAnalyzer, NodeTypeResolver $nodeTypeResolver, PromotedPropertyResolver $promotedPropertyResolver, ConstructorAssignDetector $constructorAssignDetector, ClassLikeAstResolver $classLikeAstResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, MultiInstanceofChecker $multiInstanceofChecker)
{
$this->assignManipulator = $assignManipulator;
$this->betterNodeFinder = $betterNodeFinder;
@ -141,7 +141,7 @@ final class PropertyManipulator
$this->nodeTypeResolver = $nodeTypeResolver;
$this->promotedPropertyResolver = $promotedPropertyResolver;
$this->constructorAssignDetector = $constructorAssignDetector;
$this->astResolver = $astResolver;
$this->classLikeAstResolver = $classLikeAstResolver;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->multiInstanceofChecker = $multiInstanceofChecker;
}
@ -200,7 +200,7 @@ final class PropertyManipulator
public function isUsedByTrait(ClassReflection $classReflection, string $propertyName) : bool
{
foreach ($classReflection->getTraits() as $traitUse) {
$trait = $this->astResolver->resolveClassFromName($traitUse->getName());
$trait = $this->classLikeAstResolver->resolveClassFromClassReflection($traitUse);
if (!$trait instanceof Trait_) {
continue;
}

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit45ad86eb8329557aaaa52a427f6e2496
class ComposerAutoloaderInit080ef22abaeaf79a5fc0600bde4b5ee7
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit45ad86eb8329557aaaa52a427f6e2496
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit45ad86eb8329557aaaa52a427f6e2496', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit080ef22abaeaf79a5fc0600bde4b5ee7', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit45ad86eb8329557aaaa52a427f6e2496', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit080ef22abaeaf79a5fc0600bde4b5ee7', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit080ef22abaeaf79a5fc0600bde4b5ee7::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit080ef22abaeaf79a5fc0600bde4b5ee7::$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 ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496
class ComposerStaticInit080ef22abaeaf79a5fc0600bde4b5ee7
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3094,9 +3094,9 @@ class ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit45ad86eb8329557aaaa52a427f6e2496::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit080ef22abaeaf79a5fc0600bde4b5ee7::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit080ef22abaeaf79a5fc0600bde4b5ee7::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit080ef22abaeaf79a5fc0600bde4b5ee7::$classMap;
}, null, ClassLoader::class);
}