Fix ORM driver with generic entity repository

Author: loic425

src/Bundle/DependencyInjection/Driver/Doctrine/DoctrineORMDriver.php

@@ -59,27 +59,22 @@ protected function addRepository(ContainerBuilder $container, MetadataInterface
         $definition = new Definition($repositoryClass);
         $definition->setPublic(true);
         $definition->addTag('sylius.repository');
+        $container->setDefinition($serviceId, $definition);
 
         if ($repositoryClass === EntityRepository::class) {
             /** @var string $entityClass */
             $entityClass = $metadata->getClass('model');
 
-            $definition->setFactory([$managerReference, 'getRepository']);
-            $definition->setArguments([$entityClass]);
-
-            $container->setDefinition($serviceId, $definition);
+            $definition->setArguments([$managerReference, $this->getClassMetadataDefinition($metadata)]);
 
             $genericEntities[] = $entityClass;
         } else {
             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);
-
             $doctrineDefinition = new Definition($repositoryClass);
             $doctrineDefinition->addTag(ServiceRepositoryCompilerPass::REPOSITORY_SERVICE_TAG);
             $doctrineDefinition->setFactory([new Reference('service_container'), 'get']);