fix(doctrine): autoconfigure EntityManagerHandler only when orm is av…

…ailable in symfony's container (#274)
k911 · Jul 14, 2020 · 87ede15 · 87ede15
1 parent b9df907
commit 87ede15
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php b/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php
@@ -293,7 +293,9 @@ private function registerHttpServerServices(array $config, ContainerBuilder $con
             ;
         }
 
-        if ($config['entity_manager_handler'] || (null === $config['entity_manager_handler'] && \interface_exists(EntityManagerInterface::class) && $this->isBundleLoaded($container, 'doctrine'))) {
+        if ($config['entity_manager_handler'] || (
+            null === $config['entity_manager_handler'] && $this->isDoctrineEntityManagerConfigured($container)
+        )) {
             $container->register(EntityManagerHandler::class)
                 ->addArgument(new Reference(EntityManagerHandler::class.'.inner'))
                 ->setAutowired(true)
@@ -385,6 +387,13 @@ private function isBundleLoaded(ContainerBuilder $container, string $bundleName)
         return isset($bundles[$fullBundleName]);
     }
 
+    private function isDoctrineEntityManagerConfigured(ContainerBuilder $container): bool
+    {
+        return \interface_exists(EntityManagerInterface::class) &&
+            $this->isBundleLoaded($container, 'doctrine') &&
+            $container->has(EntityManagerInterface::class);
+    }
+
     private function isProd(ContainerBuilder $container): bool
     {
         return 'prod' === $container->getParameter('kernel.environment');