use isSuperOf instead of instanceof checks for storage types

Author: mglaman

src/Type/DrupalStaticEntityQueryDynamicReturnTypeExtension.php

@@ -2,12 +2,12 @@
 
 namespace mglaman\PHPStanDrupal\Type;
 
+use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
+use Drupal\Core\Entity\ContentEntityStorageInterface;
 use mglaman\PHPStanDrupal\Drupal\EntityDataRepository;
 use mglaman\PHPStanDrupal\Type\EntityQuery\ConfigEntityQueryType;
 use mglaman\PHPStanDrupal\Type\EntityQuery\ContentEntityQueryType;
 use mglaman\PHPStanDrupal\Type\EntityQuery\EntityQueryType;
-use mglaman\PHPStanDrupal\Type\EntityStorage\ConfigEntityStorageType;
-use mglaman\PHPStanDrupal\Type\EntityStorage\ContentEntityStorageType;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
@@ -70,14 +70,14 @@ public function getTypeFromStaticMethodCall(
             return $returnType;
         }
 
-        if ($entityStorageType instanceof ContentEntityStorageType) {
+        if ((new ObjectType(ContentEntityStorageInterface::class))->isSuperTypeOf($entityStorageType)->yes()) {
             return new ContentEntityQueryType(
                 $returnType->getClassName(),
                 $returnType->getSubtractedType(),
                 $returnType->getClassReflection()
             );
         }
-        if ($entityStorageType instanceof ConfigEntityStorageType) {
+        if ((new ObjectType(ConfigEntityStorageInterface::class))->isSuperTypeOf($entityStorageType)->yes()) {
             return new ConfigEntityQueryType(
                 $returnType->getClassName(),
                 $returnType->getSubtractedType(),

src/Type/EntityStorage/EntityStorageDynamicReturnTypeExtension.php

@@ -2,6 +2,7 @@
 
 namespace mglaman\PHPStanDrupal\Type\EntityStorage;
 
+use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use mglaman\PHPStanDrupal\Drupal\EntityDataRepository;
 use PhpParser\Node\Expr\MethodCall;
@@ -76,7 +77,7 @@ public function getTypeFromMethodCall(
         }
 
         if (\in_array($methodReflection->getName(), ['loadMultiple', 'loadByProperties'], true)) {
-            if ($callerType instanceof ConfigEntityStorageType) {
+            if ((new ObjectType(ConfigEntityStorageInterface::class))->isSuperTypeOf($callerType)->yes()) {
                 return new ArrayType(new StringType(), $type);
             }
 

tests/src/Type/EntityQuery/EntityQueryDynamicReturnTypeExtensionTest.php

@@ -13,8 +13,10 @@ final class EntityQueryDynamicReturnTypeExtensionTest extends TypeInferenceTestC
 
     public function dataFileAsserts(): iterable
     {
-        yield from $this->gatherAssertTypes(__DIR__ . '/../data/entity-query-execute.php');
-        yield from $this->gatherAssertTypes(__DIR__ . '/../data/bug-355-entity-query.php');
+        yield from self::gatherAssertTypes(__DIR__ . '/../data/entity-query-execute.php');
+        yield from self::gatherAssertTypes(__DIR__ . '/../data/bug-355-entity-query.php');
+        yield from self::gatherAssertTypes(__DIR__ . '/../data/bug-522.php');
+
     }
 
     /**

tests/src/Type/data/bug-522.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Bug522;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\user\RoleInterface;
+use function PHPStan\Testing\assertType;
+
+class Foo {
+    /**
+     * The role storage used when changing the admin role.
+     *
+     * @var \Drupal\user\RoleStorageInterface
+     */
+    protected $roleStorage;
+
+    public function __construct(EntityTypeManagerInterface $entityTypeManager)
+    {
+        $this->roleStorage = $entityTypeManager->getStorage('user_role');
+    }
+
+    public function foo()
+    {
+        $roles = $this->roleStorage->loadMultiple();
+        assertType('array<string, Drupal\user\Entity\Role>', $roles);
+        unset($roles[RoleInterface::ANONYMOUS_ID]);
+    }
+}