Merge pull request #1972 from greg0ire/no-lser

Remove unused types

Author: greg0ire

UPGRADE-3.0.md

@@ -24,6 +24,9 @@ available only in `doctrine/orm` 2. It has been removed.
 
 Support for the YML and annotation metadata drivers has been dropped.
 
+`Doctrine\Bundle\DoctrineBundle\Repository\LazyServiceEntityRepository` has
+been removed without replacement.
+
 Commands
 --------
 

phpcs.xml.dist

@@ -27,8 +27,6 @@
 
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
         <exclude-pattern>tests/*</exclude-pattern>
-        <exclude-pattern>src/Repository/RepositoryFactoryCompatibility.php</exclude-pattern>
-        <exclude-pattern>src/Repository/ServiceEntityRepository.php</exclude-pattern>
     </rule>
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">
         <exclude-pattern>tests/*</exclude-pattern>

src/Repository/ContainerRepositoryFactory.php

@@ -23,8 +23,6 @@
  */
 final class ContainerRepositoryFactory implements RepositoryFactory
 {
-    use RepositoryFactoryCompatibility;
-
     /** @var array<string, ObjectRepository> */
     private array $managedRepositories = [];
 
@@ -34,6 +32,20 @@ public function __construct(
     ) {
     }
 
+    /**
+     * Gets the repository for an entity class.
+     *
+     * @param class-string<T> $entityName
+     *
+     * @return EntityRepository<T>
+     *
+     * @template T of object
+     */
+    public function getRepository(EntityManagerInterface $entityManager, string $entityName): EntityRepository
+    {
+        return $this->doGetRepository($entityManager, $entityName, true);
+    }
+
     /**
      * @param class-string<T> $entityName
      *

src/Repository/LazyServiceEntityRepository.php

@@ -1,53 +1,149 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Bundle\DoctrineBundle\Repository;
 
+use Doctrine\Common\Collections\AbstractLazyCollection;
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\Common\Collections\Selectable;
+use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use LogicException;
+use Symfony\Component\VarExporter\LazyObjectInterface;
+
+use function sprintf;
+
+/**
+ * Optional EntityRepository base class with a simplified constructor (for autowiring).
+ *
+ * To use in your class, inject the "registry" service and call
+ * the parent constructor. For example:
+ *
+ * class YourEntityRepository extends ServiceEntityRepository
+ * {
+ *     public function __construct(ManagerRegistry $registry)
+ *     {
+ *         parent::__construct($registry, YourEntity::class);
+ *     }
+ * }
+ *
+ * @template T of object
+ * @template-extends EntityRepository<T>
+ */
+class ServiceEntityRepository extends EntityRepository implements ServiceEntityRepositoryInterface
+{
+    /** @var EntityRepository<T> */
+    private EntityRepository|null $repository = null;
+
+    /** @param class-string<T> $entityClass The class name of the entity this repository manages */
+    public function __construct(
+        private readonly ManagerRegistry $registry,
+        private readonly string $entityClass,
+    ) {
+        if (! $this instanceof LazyObjectInterface) {
+            return;
+        }
+
+        $this->repository = $this->resolveRepository();
+    }
+
+    public function createQueryBuilder(string $alias, string|null $indexBy = null): QueryBuilder
+    {
+        return ($this->repository ??= $this->resolveRepository())
+            ->createQueryBuilder($alias, $indexBy);
+    }
+
+    public function createResultSetMappingBuilder(string $alias): ResultSetMappingBuilder
+    {
+        return ($this->repository ??= $this->resolveRepository())
+            ->createResultSetMappingBuilder($alias);
+    }
 
-use function property_exists;
+    public function find(mixed $id, LockMode|int|null $lockMode = null, int|null $lockVersion = null): object|null
+    {
+        /** @psalm-suppress InvalidReturnStatement This proxy is used only in combination with newer parent class */
+        return ($this->repository ??= $this->resolveRepository())
+            ->find($id, $lockMode, $lockVersion);
+    }
 
-if (property_exists(EntityRepository::class, '_entityName')) {
-    // ORM 2
     /**
-     * Optional EntityRepository base class with a simplified constructor (for autowiring).
+     * {@inheritDoc}
      *
-     * To use in your class, inject the "registry" service and call
-     * the parent constructor. For example:
-     *
-     * class YourEntityRepository extends ServiceEntityRepository
-     * {
-     *     public function __construct(ManagerRegistry $registry)
-     *     {
-     *         parent::__construct($registry, YourEntity::class);
-     *     }
-     * }
-     *
-     * @template T of object
-     * @template-extends LazyServiceEntityRepository<T>
+     * @psalm-suppress InvalidReturnStatement This proxy is used only in combination with newer parent class
+     * @psalm-suppress InvalidReturnType This proxy is used only in combination with newer parent class
      */
-    class ServiceEntityRepository extends LazyServiceEntityRepository
+    public function findBy(array $criteria, array|null $orderBy = null, int|null $limit = null, int|null $offset = null): array
+    {
+        return ($this->repository ??= $this->resolveRepository())
+            ->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    /** {@inheritDoc} */
+    public function findOneBy(array $criteria, array|null $orderBy = null): object|null
+    {
+        /** @psalm-suppress InvalidReturnStatement This proxy is used only in combination with newer parent class */
+        return ($this->repository ??= $this->resolveRepository())
+            ->findOneBy($criteria, $orderBy);
+    }
+
+    /** {@inheritDoc} */
+    public function count(array $criteria = []): int
     {
+        return ($this->repository ??= $this->resolveRepository())->count($criteria);
     }
-} else {
-    // ORM 3
+
     /**
-     * Optional EntityRepository base class with a simplified constructor (for autowiring).
-     *
-     * To use in your class, inject the "registry" service and call
-     * the parent constructor. For example:
-     *
-     * class YourEntityRepository extends ServiceEntityRepository
-     * {
-     *     public function __construct(ManagerRegistry $registry)
-     *     {
-     *         parent::__construct($registry, YourEntity::class);
-     *     }
-     * }
-     *
-     * @template T of object
-     * @template-extends ServiceEntityRepositoryProxy<T>
+     * {@inheritDoc}
      */
-    class ServiceEntityRepository extends ServiceEntityRepositoryProxy
+    public function __call(string $method, array $arguments): mixed
+    {
+        return ($this->repository ??= $this->resolveRepository())->$method(...$arguments);
+    }
+
+    protected function getEntityName(): string
+    {
+        return ($this->repository ??= $this->resolveRepository())->getEntityName();
+    }
+
+    protected function getEntityManager(): EntityManagerInterface
+    {
+        return ($this->repository ??= $this->resolveRepository())->getEntityManager();
+    }
+
+    /** @psalm-suppress InvalidReturnType This proxy is used only in combination with newer parent class */
+    protected function getClassMetadata(): ClassMetadata
+    {
+        /** @psalm-suppress InvalidReturnStatement This proxy is used only in combination with newer parent class */
+        return ($this->repository ??= $this->resolveRepository())->getClassMetadata();
+    }
+
+    /** @phpstan-return AbstractLazyCollection<int, T>&Selectable<int, T> */
+    public function matching(Criteria $criteria): AbstractLazyCollection&Selectable
     {
+        return ($this->repository ??= $this->resolveRepository())->matching($criteria);
+    }
+
+    /** @return EntityRepository<T> */
+    private function resolveRepository(): EntityRepository
+    {
+        $manager = $this->registry->getManagerForClass($this->entityClass);
+
+        if (! $manager instanceof EntityManagerInterface) {
+            throw new LogicException(sprintf(
+                'Could not find the entity manager for class "%s". Check your Doctrine configuration to make sure it is configured to load this entity’s metadata.',
+                $this->entityClass,
+            ));
+        }
+
+        /** @var ClassMetadata<T> $classMetadata */
+        $classMetadata = $manager->getClassMetadata($this->entityClass);
+
+        return new EntityRepository($manager, $classMetadata);
     }
 }