bug #510 Fix declaring repository on resource when it is a service en…

…tity repository (loic425) This PR was merged into the 1.10 branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no --> | Related tickets | | License | MIT It fixes this issue https://github.com/Sylius/SyliusResourceBundle/actions/runs/3575281362/jobs/6011624266#step:11:27 Commits ------- aa1fdd6 Reproducing the current issue b0ddbd2 Fix declaring a repository when it is a service entity repository
Sylius · Dec 8, 2022 · f85f132 · f85f132
2 parents 77f7a68 + b0ddbd2
commit f85f132
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/Bundle/DependencyInjection/Driver/Doctrine/DoctrineORMDriver.php b/src/Bundle/DependencyInjection/Driver/Doctrine/DoctrineORMDriver.php
@@ -14,6 +14,7 @@
 namespace Sylius\Bundle\ResourceBundle\DependencyInjection\Driver\Doctrine;
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Common\Persistence\ObjectManager as DeprecatedObjectManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -56,7 +57,6 @@ protected function addRepository(ContainerBuilder $container, MetadataInterface
         $managerReference = new Reference($metadata->getServiceId('manager'));
         $definition = new Definition($repositoryClass);
         $definition->setPublic(true);
-
         if ($repositoryClass === EntityRepository::class) {
             /** @var string $entityClass */
             $entityClass = $metadata->getClass('model');
@@ -68,7 +68,12 @@ protected function addRepository(ContainerBuilder $container, MetadataInterface
 
             $genericEntities[] = $entityClass;
         } else {
-            $definition->setArguments([$managerReference, $this->getClassMetadataDefinition($metadata)]);
+            if (is_a($repositoryClass, ServiceEntityRepository::class, true)) {
+                $definition->setArguments([new Reference('doctrine')]);
+                $container->setDefinition($serviceId, $definition);
+            } else {
+                $definition->setArguments([$managerReference, $this->getClassMetadataDefinition($metadata)]);
+            }
 
             $container->setDefinition($serviceId, $definition);
 

diff --git a/src/Bundle/test/src/Repository/BookRepository.php b/src/Bundle/test/src/Repository/BookRepository.php
@@ -13,8 +13,17 @@
 
 namespace App\Repository;
 
-use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use App\Entity\Book;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+use Sylius\Bundle\ResourceBundle\Doctrine\ORM\ResourceRepositoryTrait;
 
-final class BookRepository extends EntityRepository implements BookRepositoryInterface
+final class BookRepository extends ServiceEntityRepository implements BookRepositoryInterface
 {
+    use ResourceRepositoryTrait;
+
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Book::class);
+    }
 }