ClassReflection deprecation fix (#829)

* ClassReflection deprecation fix

* phpcs

Author: mglaman

src/Reflection/EntityFieldReflection.php

@@ -2,8 +2,13 @@
 
 namespace mglaman\PHPStanDrupal\Reflection;
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Field\FieldItemListInterface;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertyReflection;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
@@ -23,50 +28,63 @@ class EntityFieldReflection implements PropertyReflection
   /** @var string */
     private $propertyName;
 
-    public function __construct(ClassReflection $declaringClass, string $propertyName)
+    private ReflectionProvider $reflectionProvider;
+
+    public function __construct(ClassReflection $declaringClass, string $propertyName, ReflectionProvider $reflectionProvider)
     {
         $this->declaringClass = $declaringClass;
         $this->propertyName = $propertyName;
+        $this->reflectionProvider = $reflectionProvider;
     }
 
     public function getReadableType(): Type
     {
         if ($this->propertyName === 'original') {
-            if ($this->declaringClass->isSubclassOf('Drupal\Core\Entity\ContentEntityInterface')) {
-                $objectType = 'Drupal\Core\Entity\ContentEntityInterface';
-            } elseif ($this->declaringClass->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
-                $objectType = 'Drupal\Core\Config\Entity\ConfigEntityInterface';
+            if ($this->isContentEntityType()) {
+                $objectType = ContentEntityInterface::class;
+            } elseif ($this->isConfigEntityType()) {
+                $objectType = ConfigEntityInterface::class;
             } else {
-                $objectType = 'Drupal\Core\Entity\EntityInterface';
+                $objectType = EntityInterface::class;
             }
             return new ObjectType($objectType);
         }
 
-        if ($this->declaringClass->isSubclassOf('Drupal\Core\Entity\ContentEntityInterface')) {
+        if ($this->isContentEntityType()) {
             // Assume the property is a field.
-            return new ObjectType('Drupal\Core\Field\FieldItemListInterface');
+            return new ObjectType(FieldItemListInterface::class);
         }
 
         return new MixedType();
     }
 
+    private function isContentEntityType(): bool
+    {
+        return $this->declaringClass->isSubclassOfClass($this->reflectionProvider->getClass(ContentEntityInterface::class));
+    }
+
+    private function isConfigEntityType(): bool
+    {
+        return $this->declaringClass->isSubclassOfClass($this->reflectionProvider->getClass(ConfigEntityInterface::class));
+    }
+
     public function getWritableType(): Type
     {
         if ($this->propertyName === 'original') {
-            if ($this->declaringClass->isSubclassOf('Drupal\Core\Entity\ContentEntityInterface')) {
-                $objectType = 'Drupal\Core\Entity\ContentEntityInterface';
-            } elseif ($this->declaringClass->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
-                $objectType = 'Drupal\Core\Config\Entity\ConfigEntityInterface';
+            if ($this->isContentEntityType()) {
+                $objectType = ContentEntityInterface::class;
+            } elseif ($this->isConfigEntityType()) {
+                $objectType = ConfigEntityInterface::class;
             } else {
-                $objectType = 'Drupal\Core\Entity\EntityInterface';
+                $objectType = EntityInterface::class;
             }
             return new ObjectType($objectType);
         }
 
         // @todo Drupal allows $entity->field_myfield = 'string'; does this break that?
-        if ($this->declaringClass->isSubclassOf('Drupal\Core\Entity\ContentEntityInterface')) {
+        if ($this->isContentEntityType()) {
             // Assume the property is a field.
-            return new ObjectType('Drupal\Core\Field\FieldItemListInterface');
+            return new ObjectType(FieldItemListInterface::class);
         }
 
         return new MixedType();

src/Reflection/EntityFieldsViaMagicReflectionExtension.php

@@ -6,6 +6,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\ObjectType;
 use function array_key_exists;
@@ -20,6 +21,13 @@
 class EntityFieldsViaMagicReflectionExtension implements PropertiesClassReflectionExtension
 {
 
+    private ReflectionProvider $reflectionProvider;
+
+    public function __construct(ReflectionProvider $reflectionProvider)
+    {
+        $this->reflectionProvider = $reflectionProvider;
+    }
+
     public function hasProperty(ClassReflection $classReflection, string $propertyName): bool
     {
         // @todo Have this run after PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension
@@ -54,7 +62,7 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
     public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
     {
         if ($classReflection->implementsInterface('Drupal\Core\Entity\EntityInterface')) {
-            return new EntityFieldReflection($classReflection, $propertyName);
+            return new EntityFieldReflection($classReflection, $propertyName, $this->reflectionProvider);
         }
         if (self::classObjectIsSuperOfInterface($classReflection->getName(), self::getFieldItemListInterfaceObject())->yes()) {
             return new FieldItemListPropertyReflection($classReflection, $propertyName);

tests/src/Reflection/EntityFieldsViaMagicReflectionExtensionTest.php

@@ -26,7 +26,7 @@ final class EntityFieldsViaMagicReflectionExtensionTest extends PHPStanTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->extension = new EntityFieldsViaMagicReflectionExtension();
+        $this->extension = new EntityFieldsViaMagicReflectionExtension(self::createReflectionProvider());
     }
 
     /**