diff --git a/src/Type/EntityStorage/EntityStorageDynamicReturnTypeExtension.php b/src/Type/EntityStorage/EntityStorageDynamicReturnTypeExtension.php index 79ecf605..a389fba9 100644 --- a/src/Type/EntityStorage/EntityStorageDynamicReturnTypeExtension.php +++ b/src/Type/EntityStorage/EntityStorageDynamicReturnTypeExtension.php @@ -47,6 +47,9 @@ public function isMethodSupported(MethodReflection $methodReflection): bool 'loadMultiple', 'loadByProperties', 'loadUnchanged', + 'loadRevision', + 'loadRevisionUnchanged', + 'loadMultipleRevisions', ], true ); @@ -85,6 +88,11 @@ private function resolveForStorage(MethodReflection $methodReflection, Type $sto { if ($storageType instanceof EntityStorageType) { $type = $this->entityDataRepository->get($storageType->getEntityTypeId())->getClassType(); + } elseif (in_array($methodReflection->getName(), ['loadRevision', 'loadRevisionUnchanged', 'loadMultipleRevisions'], true)) { + // Revisions are usually loaded from a storage typed as + // RevisionableStorageInterface, which resolveFromStorage() matches + // to whichever mapped entity type comes first, such as block_content. + return $declaredReturnType; } else { $type = $this->entityDataRepository->resolveFromStorage($storageType)?->getClassType(); } @@ -93,7 +101,7 @@ private function resolveForStorage(MethodReflection $methodReflection, Type $sto } $methodName = $methodReflection->getName(); - if (in_array($methodName, ['load', 'loadUnchanged'], true)) { + if (in_array($methodName, ['load', 'loadUnchanged', 'loadRevision', 'loadRevisionUnchanged'], true)) { return TypeCombinator::addNull($type); } @@ -105,6 +113,10 @@ private function resolveForStorage(MethodReflection $methodReflection, Type $sto return new ArrayType(new IntegerType(), $type); } + if ($methodName === 'loadMultipleRevisions') { + return new ArrayType(new IntegerType(), $type); + } + if ($methodName === 'create') { return $type; } diff --git a/tests/src/Type/data/entity-storage.php b/tests/src/Type/data/entity-storage.php index 8e819962..034a1ae5 100644 --- a/tests/src/Type/data/entity-storage.php +++ b/tests/src/Type/data/entity-storage.php @@ -15,6 +15,10 @@ assertType('array', $nodeStorage->loadMultiple(['42', '29'])); assertType('array', $nodeStorage->loadMultiple(NULL)); assertType('array', $nodeStorage->loadByProperties([])); +assertType('Drupal\node\Entity\Node|null', $nodeStorage->loadRevision(42)); +assertType('Drupal\node\Entity\Node|null', $nodeStorage->loadRevision('42')); +assertType('Drupal\node\Entity\Node|null', $nodeStorage->loadRevisionUnchanged(42)); +assertType('array', $nodeStorage->loadMultipleRevisions([42, 29])); assertType('Drupal\node\Entity\Node', \Drupal::entityTypeManager()->getStorage('node')->create(['type' => 'page', 'title' => 'foo'])); assertType('Drupal\node\Entity\Node|null', \Drupal::entityTypeManager()->getStorage('node')->load(42)); assertType('Drupal\node\Entity\Node|null', \Drupal::entityTypeManager()->getStorage('node')->load('42')); @@ -24,6 +28,10 @@ assertType('array', \Drupal::entityTypeManager()->getStorage('node')->loadMultiple(['42', '29'])); assertType('array', \Drupal::entityTypeManager()->getStorage('node')->loadMultiple(NULL)); assertType('array', \Drupal::entityTypeManager()->getStorage('node')->loadByProperties([])); +assertType('Drupal\node\Entity\Node|null', \Drupal::entityTypeManager()->getStorage('node')->loadRevision(42)); +assertType('Drupal\node\Entity\Node|null', \Drupal::entityTypeManager()->getStorage('node')->loadRevision('42')); +assertType('Drupal\node\Entity\Node|null', \Drupal::entityTypeManager()->getStorage('node')->loadRevisionUnchanged(42)); +assertType('array', \Drupal::entityTypeManager()->getStorage('node')->loadMultipleRevisions([42, 29])); $termStorage = \Drupal::entityTypeManager()->getStorage('taxonomy_term'); assertType('Drupal\taxonomy\Entity\Term', $termStorage->create(['vid' => 'tag', 'name' => 'foo'])); @@ -35,6 +43,10 @@ assertType('array', $termStorage->loadMultiple(['42', '29'])); assertType('array', $termStorage->loadMultiple(NULL)); assertType('array', $termStorage->loadByProperties([])); +assertType('Drupal\taxonomy\Entity\Term|null', $termStorage->loadRevision(42)); +assertType('Drupal\taxonomy\Entity\Term|null', $termStorage->loadRevision('42')); +assertType('Drupal\taxonomy\Entity\Term|null', $termStorage->loadRevisionUnchanged(42)); +assertType('array', $termStorage->loadMultipleRevisions([42, 29])); $userStorage = \Drupal::entityTypeManager()->getStorage('user'); assertType('Drupal\user\Entity\User', $userStorage->create(['name' => 'foo'])); @@ -46,6 +58,10 @@ assertType('array', $userStorage->loadMultiple(['42', '29'])); assertType('array', $userStorage->loadMultiple(NULL)); assertType('array', $userStorage->loadByProperties([])); +assertType('Drupal\user\Entity\User|null', $userStorage->loadRevision(42)); +assertType('Drupal\user\Entity\User|null', $userStorage->loadRevision('42')); +assertType('Drupal\user\Entity\User|null', $userStorage->loadRevisionUnchanged(42)); +assertType('array', $userStorage->loadMultipleRevisions([42, 29])); $defaultStorage = \Drupal::entityTypeManager()->getStorage('content_entity_using_default_storage'); assertType('Drupal\phpstan_fixtures\Entity\ContentEntityUsingDefaultStorage', $defaultStorage->create([ 'title' => 'foo'])); @@ -133,3 +149,10 @@ assertType('array', $storage->loadMultiple(['42', '29'])); assertType('array', $storage->loadMultiple(NULL)); assertType('array', $storage->loadByProperties([])); + +// A storage typed as RevisionableStorageInterface could hold any revisionable entity type. +/** @var \Drupal\Core\Entity\RevisionableStorageInterface $revisionableStorage */ +$revisionableStorage = \Drupal::entityTypeManager()->getStorage('node'); +assertType('Drupal\Core\Entity\RevisionableInterface|null', $revisionableStorage->loadRevision(42)); +assertType('Drupal\Core\Entity\EntityInterface|null', $revisionableStorage->loadRevisionUnchanged(42)); +assertType('array', $revisionableStorage->loadMultipleRevisions([42, 29]));