Convert extra-options to sub-elements to allow multiple mongocryptdSpawnArgs

Author: GromNaN

config/schema/mongodb-1.0.xsd

@@ -191,12 +191,14 @@
   </xsd:complexType>
 
   <xsd:complexType name="extra-options">
-    <xsd:attribute name="mongocryptdURI" type="xsd:string" />
-    <xsd:attribute name="mongocryptdBypassSpawn" type="xsd:boolean" />
-    <xsd:attribute name="mongocryptdSpawnPath" type="xsd:string" />
-    <xsd:attribute name="mongocryptdSpawnArgs" type="xsd:string" />
-    <xsd:attribute name="cryptSharedLibPath" type="xsd:string" />
-    <xsd:attribute name="cryptSharedLibRequired" type="xsd:boolean" />
+    <xsd:sequence>
+      <xsd:element name="mongocryptdURI" type="xsd:string" minOccurs="0" />
+      <xsd:element name="mongocryptdBypassSpawn" type="xsd:boolean" minOccurs="0" />
+      <xsd:element name="mongocryptdSpawnPath" type="xsd:string" minOccurs="0" />
+      <xsd:element name="mongocryptdSpawnArgs" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="cryptSharedLibPath" type="xsd:string" minOccurs="0" />
+      <xsd:element name="cryptSharedLibRequired" type="xsd:boolean" minOccurs="0" />
+    </xsd:sequence>
   </xsd:complexType>
 
   <xsd:complexType name="document-manager">

src/DependencyInjection/Configuration.php

@@ -440,7 +440,7 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode): void
                                             ->arrayNode('mongocryptdSpawnArgs')
                                                 ->beforeNormalization()
                                                     ->ifString()
-                                                    ->then(static fn ($v) => explode(' ', $v))
+                                                    ->then(static fn ($v) => [$v])
                                                 ->end()
                                                 ->prototype('scalar')->cannotBeEmpty()->end()
                                             ->end()

tests/DependencyInjection/Fixtures/config/xml/full.xml

@@ -184,14 +184,15 @@
                     }
                     ]]>
                 </doctrine:encryptedFieldsMap>
-                <doctrine:extraOptions
-                    mongocryptdURI="mongodb://localhost:27020"
-                    mongocryptdBypassSpawn="true"
-                    mongocryptdSpawnPath="%kernel.project_dir%/bin/mongocryptd"
-                    mongocryptdSpawnArgs="--pidfilepath=%kernel.project_dir%/var/mongocryptd.pid --idleShutdownTimeoutSecs=60"
-                    cryptSharedLibPath="%kernel.project_dir%/bin/mongo_crypt_v1.dylib"
-                    cryptSharedLibRequired="true"
-                />
+                <doctrine:extraOptions>
+                    <doctrine:mongocryptdURI>mongodb://localhost:27020</doctrine:mongocryptdURI>
+                    <doctrine:mongocryptdBypassSpawn>true</doctrine:mongocryptdBypassSpawn>
+                    <doctrine:mongocryptdSpawnPath>%kernel.project_dir%/bin/mongocryptd</doctrine:mongocryptdSpawnPath>
+                    <doctrine:mongocryptdSpawnArgs>--pidfilepath=%kernel.project_dir%/var/mongocryptd.pid</doctrine:mongocryptdSpawnArgs>
+                    <doctrine:mongocryptdSpawnArgs>--idleShutdownTimeoutSecs=60</doctrine:mongocryptdSpawnArgs>
+                    <doctrine:cryptSharedLibPath>%kernel.project_dir%/bin/mongo_crypt_v1.dylib</doctrine:cryptSharedLibPath>
+                    <doctrine:cryptSharedLibRequired>true</doctrine:cryptSharedLibRequired>
+                </doctrine:extraOptions>
             </doctrine:autoEncryption>
         </doctrine:connection>