[Php80] Handle crash Property ReflectionEnum::$betterReflectionClass …

…does not exist on AddParamBasedOnParentClassMethodRector on Enum usage (#4758) * [Php80] Handle crash Property ReflectionEnum::$betterReflectionClass does not exist on AddParamBasedOnParentClassMethodRector on Enum usage * Fixed 🎉 * Fixed 🎉 * [ci-review] Rector Rectify * [ci-review] Rector Rectify * clean up comment --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Aug 10, 2023 · 0bdace5 · 0bdace5
1 parent e9ff73f
commit 0bdace5
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 36 deletions.
diff --git a/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php b/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php
@@ -5,12 +5,11 @@
 namespace Rector\VendorLocker;
 
 use PhpParser\Node\Stmt\ClassMethod;
-use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\Type;
+use Rector\Core\Reflection\ClassReflectionAnalyzer;
 use Rector\Core\Reflection\ReflectionResolver;
-use Rector\Core\Util\Reflection\PrivatesAccessor;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -23,7 +22,7 @@ public function __construct(
         private readonly ReflectionResolver $reflectionResolver,
         private readonly TypeComparator $typeComparator,
         private readonly StaticTypeMapper $staticTypeMapper,
-        private readonly PrivatesAccessor $privatesAccessor,
+        private readonly ClassReflectionAnalyzer $classReflectionAnalyzer
     ) {
     }
 
@@ -102,14 +101,6 @@ private function resolveParentClassMethod(ClassMethod $classMethod): ?MethodRefl
 
     private function hasClassParent(ClassReflection $classReflection): bool
     {
-        // XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
-        $nativeReflection = $classReflection->getNativeReflection();
-        $betterReflectionClass = $this->privatesAccessor->getPrivateProperty(
-            $nativeReflection,
-            'betterReflectionClass'
-        );
-        /** @var ReflectionClass $betterReflectionClass */
-        $parentClassName = $betterReflectionClass->getParentClassName();
-        return $parentClassName !== null;
+        return $this->classReflectionAnalyzer->resolveParentClassName($classReflection) !== null;
     }
 }
diff --git a/...Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector/Fixture/skip_enum.php.inc b/...Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector/Fixture/skip_enum.php.inc
@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector\Fixture;
+
+enum SkipEnum: string
+{
+	case EN = 'en';
+
+	public static function ui(): array
+	{
+		return [
+			self::EN,
+		];
+	}
+
+	public static function dynamicContent(): array
+	{
+		return self::cases();
+	}
+}
diff --git a/rules/Privatization/Guard/ParentPropertyLookupGuard.php b/rules/Privatization/Guard/ParentPropertyLookupGuard.php
@@ -11,14 +11,13 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
-use PHPStan\BetterReflection\Reflection\ReflectionClass;
 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\Node\BetterNodeFinder;
-use Rector\Core\Util\Reflection\PrivatesAccessor;
+use Rector\Core\Reflection\ClassReflectionAnalyzer;
 use Rector\NodeNameResolver\NodeNameResolver;
 
 final class ParentPropertyLookupGuard
@@ -29,7 +28,7 @@ public function __construct(
         private readonly PropertyFetchAnalyzer $propertyFetchAnalyzer,
         private readonly AstResolver $astResolver,
         private readonly PropertyManipulator $propertyManipulator,
-        private readonly PrivatesAccessor $privatesAccessor
+        private readonly ClassReflectionAnalyzer $classReflectionAnalyzer
     ) {
     }
 
@@ -48,15 +47,7 @@ public function isLegal(Property $property, ?ClassReflection $classReflection):
             return false;
         }
 
-        // XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
-        $nativeReflection = $classReflection->getNativeReflection();
-        $betterReflectionClass = $this->privatesAccessor->getPrivateProperty(
-            $nativeReflection,
-            'betterReflectionClass'
-        );
-        /** @var ReflectionClass $betterReflectionClass */
-        $parentClassName = $betterReflectionClass->getParentClassName();
-
+        $parentClassName = $this->classReflectionAnalyzer->resolveParentClassName($classReflection);
         if ($parentClassName === null) {
             return true;
         }

diff --git a/src/PhpParser/Node/Value/ValueResolver.php b/src/PhpParser/Node/Value/ValueResolver.php
@@ -14,7 +14,6 @@
 use PhpParser\Node\Scalar\MagicConst\Dir;
 use PhpParser\Node\Scalar\MagicConst\File;
 use PHPStan\Analyser\Scope;
-use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Constant\ConstantArrayType;
@@ -24,8 +23,8 @@
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\NodeAnalyzer\ConstFetchAnalyzer;
 use Rector\Core\Provider\CurrentFileProvider;
+use Rector\Core\Reflection\ClassReflectionAnalyzer;
 use Rector\Core\Reflection\ReflectionResolver;
-use Rector\Core\Util\Reflection\PrivatesAccessor;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;
@@ -46,7 +45,7 @@ public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
         private readonly CurrentFileProvider $currentFileProvider,
         private readonly ReflectionResolver $reflectionResolver,
-        private readonly PrivatesAccessor $privatesAccessor
+        private readonly ClassReflectionAnalyzer $classReflectionAnalyzer
     ) {
     }
 
@@ -334,16 +333,8 @@ private function resolveClassFromSelfStaticParent(ClassConstFetch $classConstFet
             );
         }
 
-        // XXX rework this hack, after https://github.com/phpstan/phpstan-src/pull/2563 landed
         // ensure parent class name still resolved even not autoloaded
-        $nativeReflection = $classReflection->getNativeReflection();
-        $betterReflectionClass = $this->privatesAccessor->getPrivateProperty(
-            $nativeReflection,
-            'betterReflectionClass'
-        );
-        /** @var ReflectionClass $betterReflectionClass */
-        $parentClassName = $betterReflectionClass->getParentClassName();
-
+        $parentClassName = $this->classReflectionAnalyzer->resolveParentClassName($classReflection);
         if ($parentClassName === null) {
             throw new ShouldNotHappenException();
         }

diff --git a/src/Reflection/ClassReflectionAnalyzer.php b/src/Reflection/ClassReflectionAnalyzer.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Reflection;
+
+use ReflectionEnum;
+use PHPStan\Reflection\ClassReflection;
+use Rector\Core\Util\Reflection\PrivatesAccessor;
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
+
+final class ClassReflectionAnalyzer
+{
+    public function __construct(private readonly PrivatesAccessor $privatesAccessor)
+    {
+    }
+
+    public function resolveParentClassName(ClassReflection $classReflection): ?string
+    {
+        $nativeReflection = $classReflection->getNativeReflection();
+        if ($nativeReflection instanceof ReflectionEnum) {
+            return null;
+        }
+
+        $betterReflectionClass = $this->privatesAccessor->getPrivateProperty(
+            $nativeReflection,
+            'betterReflectionClass'
+        );
+        /** @var ReflectionClass $betterReflectionClass */
+        return $betterReflectionClass->getParentClassName();
+    }
+}