Merge pull request #2862 from dunglas/improve-mongodb-config

Improve MongoDB Bundle detection
api-platform · Jun 15, 2019 · 08bb437 · 08bb437
2 parents 020bbc7 + 3557fd8
commit 08bb437
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,6 @@ jobs:
           composer remove --dev --no-progress --no-update --ansi \
             doctrine/mongodb-odm \
             doctrine/mongodb-odm-bundle \
-        - sed -i '33,39d' tests/Fixtures/app/config/config_common.yml
         - *update-project-dependencies
       before_script:
         - *clear-test-app-cache

diff --git a/tests/Fixtures/app/AppKernel.php b/tests/Fixtures/app/AppKernel.php
@@ -137,6 +137,19 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
         $c->loadFromExtension('security', $securityConfig);
 
+        if (class_exists(DoctrineMongoDBBundle::class)) {
+            $c->loadFromExtension('doctrine_mongodb', [
+                'connections' => [
+                    'default' => null,
+                ],
+                'document_managers' => [
+                    'default' => [
+                        'auto_mapping' => true,
+                    ],
+                ],
+            ]);
+        }
+
         if ($_SERVER['LEGACY'] ?? true) {
             $c->loadFromExtension('nelmio_api_doc', [
                 'sandbox' => [

diff --git a/tests/Fixtures/app/config/config_common.yml b/tests/Fixtures/app/config/config_common.yml
@@ -30,13 +30,6 @@ doctrine:
         auto_generate_proxy_classes:   '%kernel.debug%'
         auto_mapping:                  true
 
-doctrine_mongodb:
-    connections:
-        default: ~
-    document_managers:
-        default:
-            auto_mapping: true
-
 twig:
     strict_variables: '%kernel.debug%'