Merge pull request doctrine#583 from alcaeus/fix-wrong-driver-options…

…-key Fix wrong driver options key
malarzm · Sep 24, 2019 · c5f9316 · c5f9316
2 parents df2b8a6 + 9df6164
commit c5f9316
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/DependencyInjection/DoctrineMongoDBExtension.php b/DependencyInjection/DoctrineMongoDBExtension.php
@@ -333,7 +333,7 @@ protected function loadConnections(array $connections, ContainerBuilder $contain
      */
     private function normalizeDriverOptions(array $connection)
     {
-        $driverOptions            = $connection['driverOptions'] ?? [];
+        $driverOptions            = $connection['driver_options'] ?? [];
         $driverOptions['typeMap'] = DocumentManager::CLIENT_TYPEMAP;
 
         if (isset($driverOptions['context'])) {

diff --git a/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php b/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
@@ -107,6 +107,7 @@ public function testSingleDocumentManagerConfiguration()
                 'default' => [
                     'server' => 'mongodb://localhost:27017',
                     'options' => [],
+                    'driver_options' => ['context' => 'my_context'],
                 ],
             ],
             'document_managers' => ['default' => []],
@@ -121,6 +122,8 @@ public function testSingleDocumentManagerConfiguration()
         $this->assertEquals([], $arguments[1]);
         $this->assertArrayHasKey('typeMap', $arguments[2]);
         $this->assertSame(['root' => 'array', 'document' => 'array'], $arguments[2]['typeMap']);
+        $this->assertArrayHasKey('context', $arguments[2]);
+        $this->assertEquals(new Reference('my_context'), $arguments[2]['context']);
 
         $definition = $container->getDefinition('doctrine_mongodb.odm.default_document_manager');
         $this->assertEquals('%doctrine_mongodb.odm.document_manager.class%', $definition->getClass());