Reduce private accessor usage on get parent class name not autoload (#…

…4726) * Reduce private accessor usage on get parent class name not autoload * [ci-review] Rector Rectify * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Aug 9, 2023 · ea91c99 · ea91c99
1 parent 662cbb9
commit ea91c99
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php b/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php
@@ -4,6 +4,7 @@
 
 namespace Rector\VendorLocker;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
@@ -107,7 +108,8 @@ private function hasClassParent(ClassReflection $classReflection): bool
             $nativeReflection,
             'betterReflectionClass'
         );
-        $parentClassName = $this->privatesAccessor->getPrivateProperty($betterReflectionClass, 'parentClassName');
+        /** @var ReflectionClass $betterReflectionClass */
+        $parentClassName = $betterReflectionClass->getParentClassName();
         return $parentClassName !== null;
     }
 }
diff --git a/rules/Privatization/Guard/ParentPropertyLookupGuard.php b/rules/Privatization/Guard/ParentPropertyLookupGuard.php
@@ -4,6 +4,7 @@
 
 namespace Rector\Privatization\Guard;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpParser\Node;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
@@ -53,7 +54,8 @@ public function isLegal(Property $property, ?ClassReflection $classReflection):
             $nativeReflection,
             'betterReflectionClass'
         );
-        $parentClassName = $this->privatesAccessor->getPrivateProperty($betterReflectionClass, 'parentClassName');
+        /** @var ReflectionClass $betterReflectionClass */
+        $parentClassName = $betterReflectionClass->getParentClassName();
 
         if ($parentClassName === null) {
             return true;

diff --git a/src/PhpParser/Node/Value/ValueResolver.php b/src/PhpParser/Node/Value/ValueResolver.php
@@ -4,6 +4,7 @@
 
 namespace Rector\Core\PhpParser\Node\Value;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpParser\ConstExprEvaluationException;
 use PhpParser\ConstExprEvaluator;
 use PhpParser\Node\Expr;
@@ -340,7 +341,8 @@ private function resolveClassFromSelfStaticParent(ClassConstFetch $classConstFet
             $nativeReflection,
             'betterReflectionClass'
         );
-        $parentClassName = $this->privatesAccessor->getPrivateProperty($betterReflectionClass, 'parentClassName');
+        /** @var ReflectionClass $betterReflectionClass */
+        $parentClassName = $betterReflectionClass->getParentClassName();
 
         if ($parentClassName === null) {
             throw new ShouldNotHappenException();