Merge pull request #244 from eiriksm/fix/fielditemlistinterface-allowed

Allow magic methods for variables of type FieldItemListInterface

Author: mglaman

src/Reflection/EntityFieldsViaMagicReflectionExtension.php

@@ -5,6 +5,8 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
+use PHPStan\TrinaryLogic;
+use PHPStan\Type\ObjectType;
 
 /**
  * Allows field access via magic methods
@@ -32,7 +34,7 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             // Content entities have magical __get... so it is kind of true.
             return true;
         }
-        if ($reflection->implementsInterface('Drupal\Core\Field\FieldItemListInterface')) {
+        if (self::classObjectIsSuperOfFieldItemList($reflection)->yes()) {
             return FieldItemListPropertyReflection::canHandleProperty($classReflection, $propertyName);
         }
 
@@ -45,10 +47,22 @@ public function getProperty(ClassReflection $classReflection, string $propertyNa
         if ($reflection->implementsInterface('Drupal\Core\Entity\EntityInterface')) {
             return new EntityFieldReflection($classReflection, $propertyName);
         }
-        if ($reflection->implementsInterface('Drupal\Core\Field\FieldItemListInterface')) {
+        if (self::classObjectIsSuperOfFieldItemList($reflection)->yes()) {
             return new FieldItemListPropertyReflection($classReflection, $propertyName);
         }
 
         throw new \LogicException($classReflection->getName() . "::$propertyName should be handled earlier.");
     }
+
+    protected static function classObjectIsSuperOfFieldItemList(\ReflectionClass $reflection) : TrinaryLogic
+    {
+        $classObject = new ObjectType($reflection->getName());
+        $interfaceObject = self::getFieldItemListInterfaceObject();
+        return $interfaceObject->isSuperTypeOf($classObject);
+    }
+
+    protected static function getFieldItemListInterfaceObject() : ObjectType
+    {
+        return new ObjectType('Drupal\Core\Field\FieldItemListInterface');
+    }
 }

tests/src/Reflection/EntityFieldsViaMagicReflectionExtensionTest.php

@@ -67,7 +67,12 @@ public function dataHasProperty(): \Generator
         ];
         yield 'field item list: value' => [
             \Drupal\Core\Field\FieldItemList::class,
-            'target_id',
+            'value',
+            true,
+        ];
+        yield 'field item list_interface: value' => [
+            \Drupal\Core\Field\FieldItemListInterface::class,
+            'value',
             true,
         ];
         // @todo support more proeprties.