Revert extraOptions config to attributes for string and boolean options

Author: GromNaN

config/schema/mongodb-1.0.xsd

@@ -192,13 +192,13 @@
 
   <xsd:complexType name="extra-options">
     <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:attribute name="mongocryptdURI" type="xsd:string" />
+    <xsd:attribute name="mongocryptdBypassSpawn" type="xsd:boolean" />
+    <xsd:attribute name="mongocryptdSpawnPath" type="xsd:string" />
+    <xsd:attribute name="cryptSharedLibPath" type="xsd:string" />
+    <xsd:attribute name="cryptSharedLibRequired" type="xsd:boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="document-manager">

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

@@ -184,14 +184,15 @@
                     }
                     ]]>
                 </doctrine:encryptedFieldsMap>
-                <doctrine:extraOptions>
-                    <doctrine:mongocryptdURI>mongodb://localhost:27020</doctrine:mongocryptdURI>
-                    <doctrine:mongocryptdBypassSpawn>true</doctrine:mongocryptdBypassSpawn>
-                    <doctrine:mongocryptdSpawnPath>%kernel.project_dir%/bin/mongocryptd</doctrine:mongocryptdSpawnPath>
+                <doctrine:extraOptions
+                    mongocryptdURI="mongodb://localhost:27020"
+                    mongocryptdBypassSpawn="true"
+                    mongocryptdSpawnPath="%kernel.project_dir%/bin/mongocryptd"
+                    cryptSharedLibPath="%kernel.project_dir%/bin/mongo_crypt_v1.dylib"
+                    cryptSharedLibRequired="true"
+                >
                     <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>