diff --git a/src/EntityPreloader.php b/src/EntityPreloader.php index 6aba2ea..8e51767 100644 --- a/src/EntityPreloader.php +++ b/src/EntityPreloader.php @@ -20,9 +20,6 @@ use function is_a; use function method_exists; -/** - * @template E of object - */ class EntityPreloader { @@ -36,12 +33,10 @@ public function __construct( } /** - * @param list $sourceEntities + * @param list $sourceEntities * @param positive-int|null $batchSize * @param non-negative-int|null $maxFetchJoinSameFieldCount - * @return list - * - * @template S of E + * @return list */ public function preload( array $sourceEntities, @@ -59,7 +54,7 @@ public function preload( $sourceClassMetadata = $this->entityManager->getClassMetadata($sourceEntitiesCommonAncestor); $associationMapping = $sourceClassMetadata->getAssociationMapping($sourcePropertyName); - /** @var ClassMetadata $targetClassMetadata */ + /** @var ClassMetadata $targetClassMetadata */ $targetClassMetadata = $this->entityManager->getClassMetadata($associationMapping['targetEntity']); if (isset($associationMapping['indexBy'])) { @@ -79,10 +74,8 @@ public function preload( } /** - * @param list $entities - * @return class-string|null - * - * @template S of E + * @param list $entities + * @return class-string|null */ private function getCommonAncestor(array $entities): ?string { @@ -97,7 +90,6 @@ private function getCommonAncestor(array $entities): ?string } while (!is_a($entityClassName, $commonAncestor, true)) { - /** @var class-string|false $commonAncestor */ $commonAncestor = get_parent_class($commonAncestor); if ($commonAncestor === false) { @@ -110,13 +102,11 @@ private function getCommonAncestor(array $entities): ?string } /** - * @param ClassMetadata $classMetadata - * @param list $entities + * @param ClassMetadata $classMetadata + * @param list $entities * @param positive-int $batchSize * @param non-negative-int $maxFetchJoinSameFieldCount - * @return list - * - * @template T of E + * @return list */ private function loadProxies( ClassMetadata $classMetadata, @@ -153,15 +143,12 @@ private function loadProxies( } /** - * @param list $sourceEntities - * @param ClassMetadata $sourceClassMetadata - * @param ClassMetadata $targetClassMetadata + * @param list $sourceEntities + * @param ClassMetadata $sourceClassMetadata + * @param ClassMetadata $targetClassMetadata * @param positive-int|null $batchSize * @param non-negative-int $maxFetchJoinSameFieldCount - * @return list - * - * @template S of E - * @template T of E + * @return list */ private function preloadToMany( array $sourceEntities, @@ -242,15 +229,12 @@ private function preloadToMany( /** * @param array|ArrayAccess $associationMapping - * @param ClassMetadata $sourceClassMetadata - * @param ClassMetadata $targetClassMetadata + * @param ClassMetadata $sourceClassMetadata + * @param ClassMetadata $targetClassMetadata * @param list $uninitializedSourceEntityIdsChunk - * @param array> $uninitializedCollections + * @param array> $uninitializedCollections * @param non-negative-int $maxFetchJoinSameFieldCount - * @return array - * - * @template S of E - * @template T of E + * @return array */ private function preloadOneToManyInner( array|ArrayAccess $associationMapping, @@ -295,15 +279,12 @@ private function preloadOneToManyInner( /** * @param array|ArrayAccess $associationMapping - * @param ClassMetadata $sourceClassMetadata - * @param ClassMetadata $targetClassMetadata + * @param ClassMetadata $sourceClassMetadata + * @param ClassMetadata $targetClassMetadata * @param list $uninitializedSourceEntityIdsChunk - * @param array> $uninitializedCollections + * @param array> $uninitializedCollections * @param non-negative-int $maxFetchJoinSameFieldCount - * @return array - * - * @template S of E - * @template T of E + * @return array */ private function preloadManyToManyInner( array|ArrayAccess $associationMapping, @@ -346,7 +327,7 @@ private function preloadManyToManyInner( $targetEntityId = $manyToManyRow['targetId']; $targetEntityKey = (string) $targetEntityId; - /** @var T|false $targetEntity */ + /** @var object|false $targetEntity */ $targetEntity = $this->entityManager->getUnitOfWork()->tryGetById($targetEntityId, $targetClassMetadata->getName()); if ($targetEntity !== false && !$this->entityManager->isUninitializedObject($targetEntity)) { @@ -372,15 +353,12 @@ private function preloadManyToManyInner( } /** - * @param list $sourceEntities - * @param ClassMetadata $sourceClassMetadata - * @param ClassMetadata $targetClassMetadata + * @param list $sourceEntities + * @param ClassMetadata $sourceClassMetadata + * @param ClassMetadata $targetClassMetadata * @param positive-int|null $batchSize * @param non-negative-int $maxFetchJoinSameFieldCount - * @return list - * - * @template S of E - * @template T of E + * @return list */ private function preloadToOne( array $sourceEntities, @@ -414,15 +392,12 @@ private function preloadToOne( } /** - * @param ClassMetadata $targetClassMetadata + * @param ClassMetadata $targetClassMetadata * @param list $fieldValues - * @param ClassMetadata $referencedClassMetadata + * @param ClassMetadata $referencedClassMetadata * @param non-negative-int $maxFetchJoinSameFieldCount * @param array $orderBy - * @return list - * - * @template T of E - * @template R of E + * @return list */ private function loadEntitiesBy( ClassMetadata $targetClassMetadata, @@ -491,9 +466,7 @@ private function convertFieldValuesToDatabaseValues( } /** - * @param ClassMetadata $classMetadata - * - * @template C of E + * @param ClassMetadata $classMetadata */ private function getIdentifierFieldType(ClassMetadata $classMetadata): Type { @@ -508,10 +481,8 @@ private function getIdentifierFieldType(ClassMetadata $classMetadata): Type } /** - * @param ClassMetadata $sourceClassMetadata + * @param ClassMetadata $sourceClassMetadata * @param array> $alreadyPreloadedJoins - * - * @template S of E */ private function addFetchJoinsToPreventFetchDuringHydration( string $alias, @@ -530,7 +501,7 @@ private function addFetchJoinsToPreventFetchDuringHydration( continue; } - /** @var ClassMetadata $targetClassMetadata */ + /** @var ClassMetadata $targetClassMetadata */ $targetClassMetadata = $this->entityManager->getClassMetadata($associationMapping['targetEntity']); $isToOne = ($associationMapping['type'] & ClassMetadata::TO_ONE) !== 0; diff --git a/tests/Lib/TestCase.php b/tests/Lib/TestCase.php index df0c3c1..ca88702 100644 --- a/tests/Lib/TestCase.php +++ b/tests/Lib/TestCase.php @@ -43,9 +43,6 @@ abstract class TestCase extends PhpUnitTestCase private ?EntityManagerInterface $entityManager = null; - /** - * @var EntityPreloader|null - */ private ?EntityPreloader $entityPreloader = null; /** @@ -221,9 +218,6 @@ protected function getEntityManager(): EntityManagerInterface return $this->entityManager; } - /** - * @return EntityPreloader - */ protected function getEntityPreloader(): EntityPreloader { return $this->entityPreloader ??= $this->createEntityPreloader($this->getEntityManager()); @@ -271,9 +265,6 @@ private function createEntityManager( return $entityManager; } - /** - * @return EntityPreloader - */ private function createEntityPreloader(EntityManagerInterface $entityManager): EntityPreloader { return new EntityPreloader($entityManager);