Support filter parameter configuration in XML

Update XSD for filter parameter syntax, and allow non-scalar parameter values (i.e. arrays and objects) to be defined with JSON.

Author: jmikola

DependencyInjection/Configuration.php

@@ -100,6 +100,7 @@ private function addDocumentManagersSection(ArrayNodeDefinition $rootNode)
                             ->arrayNode('filters')
                                 ->useAttributeAsKey('name')
                                 ->prototype('array')
+                                    ->fixXmlConfig('parameter')
                                     ->beforeNormalization()
                                         ->ifString()
                                         ->then(function($v) { return array('class' => $v); })
@@ -119,7 +120,14 @@ private function addDocumentManagersSection(ArrayNodeDefinition $rootNode)
                                         ->booleanNode('enabled')->defaultFalse()->end()
                                         ->arrayNode('parameters')
                                             ->treatNullLike(array())
-                                            ->prototype('scalar')
+                                            ->useAttributeAsKey('name')
+                                            ->prototype('variable')
+                                                ->beforeNormalization()
+                                                    // Detect JSON object and array syntax (for XML)
+                                                    ->ifTrue(function($v) { return is_string($v) && (preg_match('/\[.*\]/', $v) || preg_match('/\{.*\}/', $v)); })
+                                                    // Decode objects to associative arrays for consistency with YAML
+                                                    ->then(function($v) { return json_decode($v, true); })
+                                                ->end()
                                             ->end()
                                         ->end()
                                     ->end()

Resources/config/schema/mongodb-1.0.xsd

@@ -123,11 +123,22 @@
   </xsd:complexType>
 
   <xsd:complexType name="filter">
+    <xsd:sequence>
+      <xsd:element name="parameter" type="filter-parameter" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
     <xsd:attribute name="name" type="xsd:string" use="required" />
     <xsd:attribute name="class" type="xsd:string" use="required" />
     <xsd:attribute name="enabled" type="xsd:boolean" />
   </xsd:complexType>
 
+  <xsd:complexType name="filter-parameter">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
   <xsd:complexType name="mapping">
     <xsd:attribute name="name" type="xsd:string" use="required" />
     <xsd:attribute name="alias" type="xsd:string" />