[Encryption] Fix format of encryptedFieldsMaps in the autoEncryption configuration

src/Command/DumpEncryptedFieldsMapCommand.php

@@ -6,7 +6,7 @@
 
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
-use Doctrine\ODM\MongoDB\Utility\EncryptedFieldsMapGenerator;
+use MongoDB\BSON\PackedArray;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -16,10 +16,8 @@
 use Symfony\Component\Yaml\Dumper;
 use Symfony\Contracts\Service\ServiceCollectionInterface;
 
-use function array_combine;
-use function array_keys;
-use function array_map;
-use function array_values;
+use function assert;
+use function json_decode;
 use function json_encode;
 use function sprintf;
 use function var_export;
@@ -63,24 +61,27 @@
         $dumper = new Dumper();
 
         foreach ($this->documentManagers as $name => $documentManager) {
-            $generator          = new EncryptedFieldsMapGenerator($documentManager->getMetadataFactory());
-            $encryptedFieldsMap = $generator->getEncryptedFieldsMap();
+            assert($documentManager instanceof DocumentManager);
+
+            $encryptedFieldsMap = [];
+            foreach ($documentManager->getMetadataFactory()->getAllMetadata() as $metadata) {
+                $database               =  $documentManager->getDocumentDatabase($metadata->getName());
+                $collectionInfoIterator = $database->listCollections(['filter' => ['name' => $metadata->getCollection()]]);
+
+                foreach ($collectionInfoIterator as $collectionInfo) {
+                    if ($collectionInfo['options']['encryptedFields'] ?? null) {
+                        $encryptedFieldsMap[$this->getDocumentNamespace($metadata, $database->getDatabaseName())] = $collectionInfo['options']['encryptedFields'];
+                    }
+                }
+            }
 
             if (empty($encryptedFieldsMap)) {
                 continue;
             }
 
-            $encryptedFieldsMap = array_combine(
-                // Convert class names in keys to their full namespaces
-                array_map(
-                    fn (string $fqcn): string => $this->getDocumentNamespace(
-                        $documentManager->getClassMetadata($fqcn),
-                        $documentManager->getConfiguration()->getDefaultDB(),
-                    ),
-                    array_keys($encryptedFieldsMap),
-                ),
-                array_values($encryptedFieldsMap),
-            );
+            foreach ($encryptedFieldsMap as $ns => $encryptedFields) {
+                $encryptedFieldsMap[$ns] = json_decode(PackedArray::fromPHP($encryptedFields['fields'])->toRelaxedExtendedJSON(), true);
+            }
 
             $io->section(sprintf('Dumping encrypted fields map for document manager "%s"', $name));
             switch ($format) {

src/DependencyInjection/Configuration.php

@@ -424,13 +424,16 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode): void
                                                 ->children()
                                                     ->scalarNode('path')->isRequired()->cannotBeEmpty()->end()
                                                     ->scalarNode('bsonType')->isRequired()->cannotBeEmpty()->end()
+                                                    ->variableNode('keyId')->defaultNull()->end()
                                                     ->arrayNode('queries')
                                                         ->children()
                                                             ->scalarNode('queryType')->isRequired()->cannotBeEmpty()->end()
-                                                            ->integerNode('min')->end()
-                                                            ->integerNode('max')->end()
+                                                            ->variableNode('min')->end()
+                                                            ->variableNode('max')->end()
                                                             ->integerNode('sparsity')->end()
+                                                            ->integerNode('precision')->end()
                                                             ->integerNode('trimFactor')->end()
+                                                            ->integerNode('contention')->end()
                                                         ->end()
                                                     ->end()
                                                 ->end()

src/DependencyInjection/DoctrineMongoDBExtension.php

@@ -27,6 +27,7 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\Persistence\Proxy;
 use InvalidArgumentException;
+use MongoDB\BSON\Document as BsonDocument;
 use MongoDB\Client;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
@@ -55,6 +56,7 @@
 use function in_array;
 use function interface_exists;
 use function is_dir;
+use function json_encode;
 use function method_exists;
 use function sprintf;
 
@@ -538,6 +540,13 @@ private function normalizeAutoEncryption(array $autoEncryption, string $defaultD
 
         $autoEncryption['keyVaultNamespace'] ??= $defaultDB . '.datakeys';
 
+        if (isset($autoEncryption['encryptedFieldsMap'])) {
+            foreach ($autoEncryption['encryptedFieldsMap'] as &$value) {
+                //$value = ['fields' => $value];
+                $value = (new Definition(BsonDocument::class))->setFactory([BsonDocument::class, 'fromJSON'])->setArguments([json_encode(['fields' => $value])]);
+            }
+        }
+
         return $autoEncryption;
     }