Allow setting driver options for connections

Author: alcaeus

DependencyInjection/Configuration.php

@@ -300,6 +300,12 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode)
                                     })
                                 ->end()
                             ->end()
+                            ->arrayNode('driverOptions')
+                                ->performNoDeepMerging()
+                                ->children()
+                                    ->scalarNode('context')->defaultNull()->end()
+                                ->end()
+                            ->end()
                         ->end()
                     ->end()
                 ->end()

DependencyInjection/DoctrineMongoDBExtension.php

@@ -293,6 +293,7 @@ protected function loadConnections(array $connections, ContainerBuilder $contain
                 isset($connection['options']) ? $connection['options'] : [],
                 new Reference(sprintf('doctrine_mongodb.odm.%s_configuration', $name)),
                 new Reference($eventManagerId),
+                $this->normalizeDriverOptions($connection),
             ];
             $odmConnDef = new Definition('%doctrine_mongodb.odm.connection.class%', $odmConnArgs);
             $id = sprintf('doctrine_mongodb.odm.%s_connection', $name);
@@ -302,6 +303,26 @@ protected function loadConnections(array $connections, ContainerBuilder $contain
         $container->setParameter('doctrine_mongodb.odm.connections', $cons);
     }
 
+    /**
+     * Normalizes the driver options array
+     *
+     * @param array $connection
+     *
+     * @return array|null
+     */
+    private function normalizeDriverOptions(array $connection)
+    {
+        if (! isset($connection['driverOptions'])) {
+            return null;
+        }
+
+        if (isset($connection['driverOptions']['context'])) {
+            $connection['driverOptions']['context'] = new Reference($connection['driverOptions']['context']);
+        }
+
+        return $connection['driverOptions'];
+    }
+
     /**
      * Loads an ODM document managers bundle mapping information.
      *

Resources/config/schema/mongodb-1.0.xsd

@@ -49,6 +49,7 @@
   <xsd:complexType name="connection">
     <xsd:sequence>
       <xsd:element name="options" type="connection-options" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="driverOptions" type="connection-driver-options" minOccurs="0" maxOccurs="1" />
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:string" use="required" />
     <xsd:attribute name="server" type="xsd:string" />
@@ -78,6 +79,10 @@
     <xsd:attribute name="wTimeout" type="xsd:integer" />
   </xsd:complexType>
 
+  <xsd:complexType name="connection-driver-options">
+    <xsd:attribute name="context" type="xsd:string" />
+  </xsd:complexType>
+
   <xsd:simpleType name="auth-mechanism">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="SCRAM-SHA-1" />

Tests/DependencyInjection/ConfigurationTest.php

@@ -106,6 +106,9 @@ public function testFullConfiguration($config)
                         'w'                 => 'majority',
                         'wTimeoutMS'        => 1000,
                     ],
+                    'driverOptions' => [
+                        'context' => 'conn1_context_service',
+                    ],
                 ],
                 'conn2' => [
                     'server'  => 'mongodb://otherhost',

Tests/DependencyInjection/Fixtures/config/xml/full.xml

@@ -57,6 +57,9 @@
                 </doctrine:readPreferenceTags>
                 <doctrine:readPreferenceTags />
             </doctrine:options>
+            <doctrine:driverOptions
+                context="conn1_context_service"
+            />
         </doctrine:connection>
 
         <doctrine:connection id="conn2" server="mongodb://otherhost" />

Tests/DependencyInjection/Fixtures/config/yml/full.yml

@@ -46,6 +46,8 @@ doctrine_mongodb:
                 username:         username_val
                 w:                majority
                 wTimeoutMS:       1000
+            driverOptions:
+                context:          conn1_context_service
         conn2:
             server: mongodb://otherhost