From 3557fd8e90022194551ad6b4d5c286e49d2efd83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sat, 15 Jun 2019 12:03:58 +0200
Subject: [PATCH] Improve MongoDB Bundle detection

---
 .travis.yml                                 |  1 -
 tests/Fixtures/app/AppKernel.php            | 13 +++++++++++++
 tests/Fixtures/app/config/config_common.yml |  7 -------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1ecedda73f..9ead294b1bd 100644
--- 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
index b4fbe7cd095..f7e09ae561b 100644
--- 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
index 105c7dcd5f9..79e87740276 100644
--- 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%'