Escape mongocryptd path before calling it

Author: GromNaN

src/DataCollector/EncryptionDiagnostic.php

@@ -7,6 +7,7 @@
 use Composer\InstalledVersions;
 use ReflectionExtension;
 
+use function escapeshellarg;
 use function exec;
 use function explode;
 use function extension_loaded;
@@ -71,7 +72,7 @@ private function getMongocryptdVersion(?string $mongocryptdPath): ?string
         }
 
         $output = [];
-        exec($mongocryptdPath . ' --version', $output);
+        exec(escapeshellarg($mongocryptdPath) . ' --version', $output);
 
         if (isset($output[0])) {
             return trim($output[0]);

src/DependencyInjection/DoctrineMongoDBExtension.php

@@ -542,6 +542,8 @@ private function normalizeAutoEncryption(array $autoEncryption, string $defaultD
 
         if (isset($autoEncryption['encryptedFieldsMap'])) {
             foreach ($autoEncryption['encryptedFieldsMap'] as &$value) {
+                // Wrap the encrypted fields in a 'fields' key as required the encryptedFieldsMap structure.
+                // Some values can be BSON binary, date or numbers, the extended JSON format is used to convert them BSON document.
                 $value = (new Definition(BsonDocument::class))->setFactory([BsonDocument::class, 'fromJSON'])->setArguments([json_encode(['fields' => $value])]);
             }
         }