Clean tlsOptions and wrap into an array with the kms provider name as key

Author: GromNaN

src/DependencyInjection/Configuration.php

@@ -438,11 +438,7 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode): void
                                             ->scalarNode('tlsCAFile')->end()
                                             ->scalarNode('tlsCertificateKeyFile')->end()
                                             ->scalarNode('tlsCertificateKeyFilePassword')->end()
-                                            ->booleanNode('tlsAllowInvalidCertificates')->end()
-                                            ->booleanNode('tlsAllowInvalidHostnames')->end()
-                                            ->booleanNode('tlsDisableCertificateRevocationCheck')->end()
                                             ->booleanNode('tlsDisableOCSPEndpointCheck')->end()
-                                            ->booleanNode('tlsInsecure')->end()
                                         ->end()
                                     ->end()
                                 ->end()

src/DependencyInjection/DoctrineMongoDBExtension.php

@@ -528,9 +528,14 @@ private function normalizeAutoEncryption(array $autoEncryption, string $defaultD
             throw new InvalidArgumentException('The "kmsProvider" option must contain a "type" key.');
         }
 
+        $provider                       = $autoEncryption['kmsProvider']['type'];
         $autoEncryption['kmsProviders'] = [
-            $autoEncryption['kmsProvider']['type'] => array_diff_key($autoEncryption['kmsProvider'], ['type' => true]),
+            $provider => array_diff_key($autoEncryption['kmsProvider'], ['type' => true]),
         ];
+        if (isset($autoEncryption['tlsOptions'])) {
+            $autoEncryption['tlsOptions'] = [$provider => $autoEncryption['tlsOptions']];
+        }
+
         unset($autoEncryption['kmsProvider']);
         unset($autoEncryption['masterKey']);