Preload Autoloader class when the ORM is used

doctrine · May 15, 2020 · 6e4614d · 6e4614d
1 parent 3a9f78c
commit 6e4614d
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -5,6 +5,7 @@
 use Doctrine\Bundle\DoctrineBundle\Dbal\RegexSchemaAssetFilter;
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepositoryInterface;
+use Doctrine\ORM\Proxy\Autoloader;
 use Doctrine\ORM\UnitOfWork;
 use LogicException;
 use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
@@ -349,7 +350,7 @@ protected function ormLoad(array $config, ContainerBuilder $container)
             $container->setParameter('doctrine.orm.' . $key, $config[$key]);
         }
 
-        $container->setAlias('doctrine.orm.entity_manager', sprintf('doctrine.orm.%s_entity_manager', $config['default_entity_manager']));
+        $container->setAlias('doctrine.orm.entity_manager', $defaultEntityManagerDefinitionId = sprintf('doctrine.orm.%s_entity_manager', $config['default_entity_manager']));
         $container->getAlias('doctrine.orm.entity_manager')->setPublic(true);
 
         $config['entity_managers'] = $this->fixManagersAutoMappings($config['entity_managers'], $container->getParameter('kernel.bundles'));
@@ -380,6 +381,14 @@ protected function ormLoad(array $config, ContainerBuilder $container)
 
         $container->registerForAutoconfiguration(ServiceEntityRepositoryInterface::class)
             ->addTag(ServiceRepositoryCompilerPass::REPOSITORY_SERVICE_TAG);
+
+        /**
+         * @see DoctrineBundle::boot()
+         */
+        $container->getDefinition($defaultEntityManagerDefinitionId)
+            ->addTag('container.preload', [
+                'class' => Autoloader::class,
+            ]);
     }
 
     /**