Add test data for #377

Author: mglaman

composer.json

@@ -46,7 +46,10 @@
     "autoload-dev": {
         "psr-4": {
             "mglaman\\PHPStanDrupal\\Tests\\": "tests/src/"
-        }
+        },
+        "classmap": [
+            "tests/src/Type/data"
+        ]
     },
     "extra": {
         "branch-alias": {

tests/src/Type/EntityTypeManagerGetStorageDynamicReturnTypeExtensionTest.php

@@ -21,6 +21,7 @@ final class EntityTypeManagerGetStorageDynamicReturnTypeExtensionTest extends Ty
     public function dataFileAsserts(): iterable
     {
         yield from $this->gatherAssertTypes(__DIR__ . '/data/entity-type-manager.php');
+        yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-377.php');
     }
 
     /**

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace bug377;
+
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use function PHPStan\Testing\assertType;
+
+class Foo {
+    private EntityTypeManagerInterface $entityTypeManager;
+    private EntityStorageInterface $myEntityStorage;
+
+    public function __construct(EntityTypeManagerInterface $entityTypeManager)
+    {
+        $this->entityTypeManager = $entityTypeManager;
+        $this->myEntityStorage = $entityTypeManager->getStorage('node');
+    }
+
+    public function storageType() {
+        // @todo property typing overrides our internal typing to determine entity storage type.
+        assertType('Drupal\Core\Entity\EntityStorageInterface', $this->myEntityStorage);
+        assertType('Drupal\node\NodeStorage', $this->entityTypeManager->getStorage('node'));
+    }
+
+    public function entityType() {
+        $entity = $this->myEntityStorage->load('123');
+        assertType('Drupal\Core\Entity\EntityInterface|null', $entity);
+    }
+
+}

tests/src/Type/data/entity-type-manager.php

@@ -3,7 +3,6 @@
 namespace EntityTypeManagerGetStorage;
 
 use function PHPStan\Testing\assertType;
-use function PHPUnit\Framework\assertInstanceOf;
 
 $etm = \Drupal::entityTypeManager();