handle doctrine_phpcr in a propper way (#298)

* @see #219 * fix bc-break * fix tests * fix lint * check correct doctrine service id for PHPCR * simulate DoctrinePHPCRBundle is installed in a more saver way (how knows what will come). * fix lint Co-authored-by: Volker von Hoeßlin <volker.hoesslin@swsn.de>
sonata-project · Jun 11, 2021 · a0f08d8 · a0f08d8
1 parent 08020ea
commit a0f08d8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/Bridge/Symfony/DependencyInjection/Compiler/AdapterCompilerPass.php b/src/Bridge/Symfony/DependencyInjection/Compiler/AdapterCompilerPass.php
@@ -36,7 +36,7 @@ public function process(ContainerBuilder $container): void
             $container->removeDefinition('sonata.doctrine.adapter.doctrine_orm');
         }
 
-        if ($container->has('doctrine_phpcr')) {
+        if ($this->isDoctrinePHPCRLoaded($container)) {
             $definition->addMethodCall('addAdapter', [new Reference('sonata.doctrine.adapter.doctrine_phpcr')]);
         } else {
             $container->removeDefinition('sonata.doctrine.adapter.doctrine_phpcr');
@@ -47,4 +47,9 @@ private function isDoctrineOrmLoaded(ContainerBuilder $container): bool
     {
         return $container->has('doctrine') && $container->has('sonata.doctrine.adapter.doctrine_orm');
     }
+
+    private function isDoctrinePHPCRLoaded(ContainerBuilder $container): bool
+    {
+        return $container->has('doctrine_phpcr') && $container->has('sonata.doctrine.adapter.doctrine_phpcr');
+    }
 }
diff --git a/src/Bridge/Symfony/DependencyInjection/SonataDoctrineExtension.php b/src/Bridge/Symfony/DependencyInjection/SonataDoctrineExtension.php
@@ -35,7 +35,8 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('mapper_orm.php');
         }
 
-        if (class_exists(DocumentManager::class)) {
+        $bundles = $container->getParameter('kernel.bundles');
+        if (class_exists(DocumentManager::class) && isset($bundles['DoctrinePHPCRBundle'])) {
             $loader->load('doctrine_phpcr.php');
         }
     }

diff --git a/tests/Bridge/Symfony/DependencyInjection/SonataDoctrineExtensionTest.php b/tests/Bridge/Symfony/DependencyInjection/SonataDoctrineExtensionTest.php
@@ -20,6 +20,14 @@ final class SonataDoctrineExtensionTest extends AbstractExtensionTestCase
 {
     public function testServicesAreLoaded(): void
     {
+        //simulate DoctrinePHPCRBundle is installed
+        $kernelBundles = $this->container->getParameterBag()->has('kernel.bundles') ?
+            (array) $this->container->getParameterBag()->get('kernel.bundles') : [];
+        $this->container->getParameterBag()->set(
+            'kernel.bundles',
+            ['DoctrinePHPCRBundle' => true] + $kernelBundles
+        );
+
         $this->load();
 
         $this->assertContainerBuilderHasService('sonata.doctrine.model.adapter.chain');