Updated Rector to commit ebe2a37fe2c0c387e655259548ab7a6f76b3f298

ebe2a37fe2 [Php74][Privatization] Refactor ParentPropertyLookupGuard to use ClassReflection to reduce IO (#3993)

rules/Php74/Guard/PropertyTypeChangeGuard.php

@@ -3,12 +3,10 @@
 declare (strict_types=1);
 namespace Rector\Php74\Guard;
 
-use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Reflection\ClassReflection;
 use Rector\Core\NodeAnalyzer\PropertyAnalyzer;
 use Rector\Core\NodeManipulator\PropertyManipulator;
-use Rector\Core\PhpParser\ClassLikeAstResolver;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\Privatization\Guard\ParentPropertyLookupGuard;
@@ -39,19 +37,13 @@ final class PropertyTypeChangeGuard
      * @var \Rector\Core\Reflection\ReflectionResolver
      */
     private $reflectionResolver;
-    /**
-     * @readonly
-     * @var \Rector\Core\PhpParser\ClassLikeAstResolver
-     */
-    private $classLikeAstResolver;
-    public function __construct(NodeNameResolver $nodeNameResolver, PropertyAnalyzer $propertyAnalyzer, PropertyManipulator $propertyManipulator, ParentPropertyLookupGuard $parentPropertyLookupGuard, ReflectionResolver $reflectionResolver, ClassLikeAstResolver $classLikeAstResolver)
+    public function __construct(NodeNameResolver $nodeNameResolver, PropertyAnalyzer $propertyAnalyzer, PropertyManipulator $propertyManipulator, ParentPropertyLookupGuard $parentPropertyLookupGuard, ReflectionResolver $reflectionResolver)
     {
         $this->nodeNameResolver = $nodeNameResolver;
         $this->propertyAnalyzer = $propertyAnalyzer;
         $this->propertyManipulator = $propertyManipulator;
         $this->parentPropertyLookupGuard = $parentPropertyLookupGuard;
         $this->reflectionResolver = $reflectionResolver;
-        $this->classLikeAstResolver = $classLikeAstResolver;
     }
     public function isLegal(Property $property, bool $inlinePublic = \true, bool $isConstructorPromotion = \false) : bool
     {
@@ -92,13 +84,9 @@ final class PropertyTypeChangeGuard
         if (!$property->isProtected()) {
             return \false;
         }
-        $class = $this->classLikeAstResolver->resolveClassFromClassReflection($classReflection);
-        if (!$class instanceof Class_) {
+        if (!$classReflection->isFinalByKeyword()) {
             return \false;
         }
-        if (!$class->isFinal()) {
-            return \false;
-        }
-        return $this->parentPropertyLookupGuard->isLegal($property, $class);
+        return $this->parentPropertyLookupGuard->isLegal($property, $classReflection);
     }
 }

rules/Privatization/Guard/ParentPropertyLookupGuard.php

@@ -7,18 +7,16 @@ use PhpParser\Node;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Variable;
-use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Reflection\ClassReflection;
 use Rector\Core\Enum\ObjectReference;
-use Rector\Core\NodeAnalyzer\ClassAnalyzer;
 use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
 use Rector\Core\NodeManipulator\PropertyManipulator;
 use Rector\Core\PhpParser\AstResolver;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
-use Rector\Core\Reflection\ReflectionResolver;
+use Rector\Core\Util\Reflection\PrivatesAccessor;
 use Rector\NodeNameResolver\NodeNameResolver;
 final class ParentPropertyLookupGuard
 {
@@ -27,11 +25,6 @@ final class ParentPropertyLookupGuard
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
     private $betterNodeFinder;
-    /**
-     * @readonly
-     * @var \Rector\Core\Reflection\ReflectionResolver
-     */
-    private $reflectionResolver;
     /**
      * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
@@ -54,33 +47,34 @@ final class ParentPropertyLookupGuard
     private $propertyManipulator;
     /**
      * @readonly
-     * @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
+     * @var \Rector\Core\Util\Reflection\PrivatesAccessor
      */
-    private $classAnalyzer;
-    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, AstResolver $astResolver, PropertyManipulator $propertyManipulator, ClassAnalyzer $classAnalyzer)
+    private $privatesAccessor;
+    public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, AstResolver $astResolver, PropertyManipulator $propertyManipulator, PrivatesAccessor $privatesAccessor)
     {
         $this->betterNodeFinder = $betterNodeFinder;
-        $this->reflectionResolver = $reflectionResolver;
         $this->nodeNameResolver = $nodeNameResolver;
         $this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
         $this->astResolver = $astResolver;
         $this->propertyManipulator = $propertyManipulator;
-        $this->classAnalyzer = $classAnalyzer;
+        $this->privatesAccessor = $privatesAccessor;
     }
-    public function isLegal(Property $property, Class_ $class) : bool
+    public function isLegal(Property $property, ?ClassReflection $classReflection) : bool
     {
-        if ($this->classAnalyzer->isAnonymousClass($class)) {
+        if (!$classReflection instanceof ClassReflection) {
             return \false;
         }
-        $classReflection = $this->reflectionResolver->resolveClassReflection($class);
-        if (!$classReflection instanceof ClassReflection) {
+        if ($classReflection->isAnonymous()) {
             return \false;
         }
         $propertyName = $this->nodeNameResolver->getName($property);
         if ($this->propertyManipulator->isUsedByTrait($classReflection, $propertyName)) {
             return \false;
         }
-        if (!$class->extends instanceof Name) {
+        $nativeReflection = $classReflection->getNativeReflection();
+        $betterReflectionClass = $this->privatesAccessor->getPrivateProperty($nativeReflection, 'betterReflectionClass');
+        $parentClassName = $this->privatesAccessor->getPrivateProperty($betterReflectionClass, 'parentClassName');
+        if ($parentClassName === null) {
             return \true;
         }
         $className = $classReflection->getName();

rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php

@@ -7,6 +7,7 @@ use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Privatization\Guard\ParentPropertyLookupGuard;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -26,10 +27,16 @@ final class PrivatizeFinalClassPropertyRector extends AbstractRector
      * @var \Rector\Privatization\Guard\ParentPropertyLookupGuard
      */
     private $parentPropertyLookupGuard;
-    public function __construct(VisibilityManipulator $visibilityManipulator, ParentPropertyLookupGuard $parentPropertyLookupGuard)
+    /**
+     * @readonly
+     * @var \Rector\Core\Reflection\ReflectionResolver
+     */
+    private $reflectionResolver;
+    public function __construct(VisibilityManipulator $visibilityManipulator, ParentPropertyLookupGuard $parentPropertyLookupGuard, ReflectionResolver $reflectionResolver)
     {
         $this->visibilityManipulator = $visibilityManipulator;
         $this->parentPropertyLookupGuard = $parentPropertyLookupGuard;
+        $this->reflectionResolver = $reflectionResolver;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -63,11 +70,12 @@ CODE_SAMPLE
             return null;
         }
         $hasChanged = \false;
+        $classReflection = $this->reflectionResolver->resolveClassReflection($node);
         foreach ($node->getProperties() as $property) {
             if ($this->shouldSkipProperty($property)) {
                 continue;
             }
-            if (!$this->parentPropertyLookupGuard->isLegal($property, $node)) {
+            if (!$this->parentPropertyLookupGuard->isLegal($property, $classReflection)) {
                 continue;
             }
             $this->visibilityManipulator->makePrivate($property);

rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector.php

@@ -12,6 +12,7 @@ use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\DeadCode\PhpDoc\TagRemover\VarTagRemover;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
@@ -40,11 +41,17 @@ final class TypedPropertyFromStrictGetterMethodReturnTypeRector extends Abstract
      * @var \Rector\Privatization\Guard\ParentPropertyLookupGuard
      */
     private $parentPropertyLookupGuard;
-    public function __construct(GetterTypeDeclarationPropertyTypeInferer $getterTypeDeclarationPropertyTypeInferer, VarTagRemover $varTagRemover, ParentPropertyLookupGuard $parentPropertyLookupGuard)
+    /**
+     * @readonly
+     * @var \Rector\Core\Reflection\ReflectionResolver
+     */
+    private $reflectionResolver;
+    public function __construct(GetterTypeDeclarationPropertyTypeInferer $getterTypeDeclarationPropertyTypeInferer, VarTagRemover $varTagRemover, ParentPropertyLookupGuard $parentPropertyLookupGuard, ReflectionResolver $reflectionResolver)
     {
         $this->getterTypeDeclarationPropertyTypeInferer = $getterTypeDeclarationPropertyTypeInferer;
         $this->varTagRemover = $varTagRemover;
         $this->parentPropertyLookupGuard = $parentPropertyLookupGuard;
+        $this->reflectionResolver = $reflectionResolver;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -162,6 +169,7 @@ CODE_SAMPLE
             // has too many properties
             return \true;
         }
-        return !$this->parentPropertyLookupGuard->isLegal($property, $class);
+        $classReflection = $this->reflectionResolver->resolveClassReflection($class);
+        return !$this->parentPropertyLookupGuard->isLegal($property, $classReflection);
     }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '754fca568f1d19b792bd5ccd476d10c675ba77f3';
+    public const PACKAGE_VERSION = 'ebe2a37fe2c0c387e655259548ab7a6f76b3f298';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-05-27 19:03:19';
+    public const RELEASE_DATE = '2023-05-27 22:42:18';
     /**
      * @var int
      */

src/Kernel/RectorKernel.php

@@ -15,7 +15,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v38';
+    private const CACHE_KEY = 'v40';
     /**
      * @var \Symfony\Component\DependencyInjection\ContainerInterface|null
      */

vendor/autoload.php

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

vendor/composer/autoload_real.php

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

vendor/composer/autoload_static.php

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