Merge pull request #300 from dpi/getstorage-with-constant

Calling getStorage with a constant does not resolve entity mapped storage class

Author: mglaman

src/Type/EntityTypeManagerGetStorageDynamicReturnTypeExtension.php

@@ -17,6 +17,7 @@
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
+use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
 
@@ -74,13 +75,15 @@ public function getTypeFromMethodCall(
         if ($arg1 instanceof Concat) {
             return $returnType;
         }
-        if (!$arg1 instanceof String_) {
+
+        $type = $scope->getType($arg1);
+        if ($type instanceof ConstantStringType) {
+            $entityTypeId = $type->getValue();
+        } else {
             // @todo determine what these types are, and try to resolve entity name from.
             return $returnType;
         }
 
-        $entityTypeId = $arg1->value;
-
         $storageType = $this->entityDataRepository->get($entityTypeId)->getStorageType();
         if ($storageType !== null) {
             return $storageType;

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

@@ -16,3 +16,5 @@
 assertType('Drupal\phpstan_fixtures\CustomContentEntityStorage', $etm->getStorage('content_entity_using_custom_storage'));
 assertType('Drupal\Core\Config\Entity\ConfigEntityStorage', $etm->getStorage('config_entity_using_default_storage'));
 assertType('Drupal\phpstan_fixtures\CustomConfigEntityStorage', $etm->getStorage('config_entity_using_custom_storage'));
+const ENTITY_TYPE_ID_NODE = 'node';
+assertType('Drupal\node\NodeStorage', $etm->getStorage(ENTITY_TYPE_ID_NODE));