[Privatization] Optimize ParentPropertyLookupGuard, make $class param…

…eter required (#3252) * [Privatization] Optimize ParentPropertyLookupGuard, make $class parameter required * [ci-review] Rector Rectify Co-authored-by: GitHub Action <action@github.com>
rectorphp · Dec 25, 2022 · 55c9472 · 55c9472
1 parent 9a0938d
commit 55c9472
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/rules/Php74/Guard/PropertyTypeChangeGuard.php b/rules/Php74/Guard/PropertyTypeChangeGuard.php
@@ -85,6 +85,6 @@ private function isSafeProtectedProperty(Property $property): bool
             return false;
         }
 
-        return $this->parentPropertyLookupGuard->isLegal($property);
+        return $this->parentPropertyLookupGuard->isLegal($property, $parentNode);
     }
 }
diff --git a/rules/Privatization/Guard/ParentPropertyLookupGuard.php b/rules/Privatization/Guard/ParentPropertyLookupGuard.php
@@ -13,6 +13,7 @@
 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;
@@ -28,21 +29,18 @@ public function __construct(
         private readonly NodeNameResolver $nodeNameResolver,
         private readonly PropertyFetchAnalyzer $propertyFetchAnalyzer,
         private readonly AstResolver $astResolver,
-        private readonly PropertyManipulator $propertyManipulator
+        private readonly PropertyManipulator $propertyManipulator,
+        private readonly ClassAnalyzer $classAnalyzer,
     ) {
     }
 
-    public function isLegal(Property $property, ?Class_ $class = null): bool
+    public function isLegal(Property $property, Class_ $class): bool
     {
-        if (! $class instanceof Class_) {
-            // @todo optimize
-            $class = $this->betterNodeFinder->findParentType($property, Class_::class);
-            if (! $class instanceof Class_) {
-                return false;
-            }
+        if ($this->classAnalyzer->isAnonymousClass($class)) {
+            return false;
         }
 
-        $classReflection = $this->reflectionResolver->resolveClassReflection($property);
+        $classReflection = $this->reflectionResolver->resolveClassReflection($class);
         if (! $classReflection instanceof ClassReflection) {
             return false;
         }

diff --git a/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php b/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php
@@ -68,7 +68,7 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if (! $this->parentPropertyLookupGuard->isLegal($property)) {
+            if (! $this->parentPropertyLookupGuard->isLegal($property, $node)) {
                 continue;
             }
 

diff --git a/...s/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector.php b/...s/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector.php
@@ -110,7 +110,7 @@ public function refactor(Node $node): null|Class_
             }
 
             // include fault value in the type
-            if ($this->isConclictingDefaultExprType($property, $getterReturnType)) {
+            if ($this->isConflictingDefaultExprType($property, $getterReturnType)) {
                 continue;
             }
 
@@ -148,7 +148,7 @@ private function decorateDefaultNull(Type $propertyType, Property $property): vo
         $propertyProperty->default = $this->nodeFactory->createNull();
     }
 
-    private function isConclictingDefaultExprType(Property $property, Type $getterReturnType): bool
+    private function isConflictingDefaultExprType(Property $property, Type $getterReturnType): bool
     {
         $onlyPropertyProperty = $property->props[0];
         if (! $onlyPropertyProperty->default instanceof Expr) {