Validate extraOptions configuration (#913)

Author: GromNaN

src/DependencyInjection/Configuration.php

@@ -12,6 +12,7 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 use function count;
+use function explode;
 use function in_array;
 use function is_array;
 use function is_string;
@@ -432,7 +433,20 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode): void
                                         ->end()
                                     ->end()
                                     ->arrayNode('extraOptions')
-                                        ->prototype('variable')->end()
+                                        ->children()
+                                            ->scalarNode('mongocryptdURI')->end()
+                                            ->booleanNode('mongocryptdBypassSpawn')->end()
+                                            ->scalarNode('mongocryptdSpawnPath')->end()
+                                            ->arrayNode('mongocryptdSpawnArgs')
+                                                ->beforeNormalization()
+                                                    ->ifString()
+                                                    ->then(static fn ($v) => explode(' ', $v))
+                                                ->end()
+                                                ->prototype('scalar')->cannotBeEmpty()->end()
+                                            ->end()
+                                            ->scalarNode('cryptSharedLibPath')->end()
+                                            ->booleanNode('cryptSharedLibRequired')->end()
+                                        ->end()
                                     ->end()
                                     ->booleanNode('bypassQueryAnalysis')->end()
                                     ->arrayNode('tlsOptions')

tests/DependencyInjection/ConfigurationTest.php

@@ -263,7 +263,7 @@ public function testFullConfiguration(array $config): void
                             'mongocryptdURI' => 'mongodb://localhost:27020',
                             'mongocryptdBypassSpawn' => true,
                             'mongocryptdSpawnPath' => '%kernel.project_dir%/bin/mongocryptd',
-                            'mongocryptdSpawnArgs' => '--pidfilepath=%kernel.project_dir%/var/mongocryptd.pid --idleShutdownTimeoutSecs=60',
+                            'mongocryptdSpawnArgs' => ['--pidfilepath=%kernel.project_dir%/var/mongocryptd.pid', '--idleShutdownTimeoutSecs=60'],
                             'cryptSharedLibPath' => '%kernel.project_dir%/bin/mongo_crypt_v1.dylib',
                             'cryptSharedLibRequired' => true,
                         ],

tests/DependencyInjection/Fixtures/config/yml/full.yml

@@ -133,7 +133,9 @@ doctrine_mongodb:
                     mongocryptdURI: 'mongodb://localhost:27020'
                     mongocryptdBypassSpawn: true
                     mongocryptdSpawnPath: '%kernel.project_dir%/bin/mongocryptd'
-                    mongocryptdSpawnArgs: '--pidfilepath=%kernel.project_dir%/var/mongocryptd.pid --idleShutdownTimeoutSecs=60'
+                    mongocryptdSpawnArgs:
+                        - '--pidfilepath=%kernel.project_dir%/var/mongocryptd.pid'
+                        - '--idleShutdownTimeoutSecs=60'
                     cryptSharedLibPath: '%kernel.project_dir%/bin/mongo_crypt_v1.dylib'
                     cryptSharedLibRequired: true