Convert min/max options in the metadata class

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php

@@ -2386,6 +2386,16 @@ public function mapField(array $mapping): array
             $mapping['nullable'] = false;
         }
 
+        if (isset($mapping['encrypt']['queryType'])) {
+            // The encrypted range query options min and max must be converted to the database type
+            $type = Type::getType($mapping['type']);
+            foreach (['min', 'max'] as $option) {
+                if (isset($mapping['encrypt'][$option])) {
+                    $mapping['encrypt'][$option] = $type->convertToDatabaseValue($mapping['encrypt'][$option]);
+                }
+            }
+        }
+
         if (
             isset($mapping['reference'])
             && isset($mapping['storeAs'])

lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php

@@ -940,7 +940,7 @@ private function addEncryptionMapping(SimpleXMLElement $encrypt, string $type):
         foreach ($encrypt->attributes() as $key => $value) {
             $encryptMapping[$key] = match ($key) {
                 'queryType' => EncryptQuery::from((string) $value),
-                'min', 'max' => $value,
+                'min', 'max' => (string) $value,
                 'sparsity', 'precision', 'trimFactor', 'contention' => (int) $value,
             };
         }

lib/Doctrine/ODM/MongoDB/Utility/EncryptedFieldsMapGenerator.php

@@ -140,12 +140,6 @@ private function createEncryptedFieldsMapForClass(
             if (isset($mapping['encrypt']['queryType'])) {
                 $field['queries']              = array_filter($mapping['encrypt'], static fn ($v) => $v !== null);
                 $field['queries']['queryType'] = $field['queries']['queryType']->value;
-
-                foreach (['min', 'max'] as $option) {
-                    if (isset($field['queries'][$option])) {
-                        $field['queries'][$option] = Type::getType($mapping['type'])->convertToDatabaseValue($field['queries'][$option]);
-                    }
-                }
             }
 
             yield $field;

tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/AbstractDriverTestCase.php

@@ -17,6 +17,7 @@
 use Documents\Phonenumber;
 use Documents\Profile;
 use MongoDB\BSON\Decimal128;
+use MongoDB\BSON\Int64;
 use MongoDB\BSON\UTCDateTime;
 use PHPUnit\Framework\TestCase;
 use TestDocuments\EmbeddedDocument;
@@ -26,6 +27,8 @@
 use TestDocuments\QueryResultDocument;
 use TestDocuments\User;
 
+use const PHP_INT_MAX;
+
 abstract class AbstractDriverTestCase extends TestCase
 {
     protected MappingDriver|null $driver;
@@ -573,6 +576,12 @@ public function testEncryptQueryRangeTypes(): void
             'max' => 10,
         ], $classMetadata->fieldMappings['intField']['encrypt']);
 
+        self::assertEquals([
+            'queryType' => EncryptQuery::Range,
+            'min' => new Int64(5),
+            'max' => new Int64(PHP_INT_MAX - 5),
+        ], $classMetadata->fieldMappings['int64Field']['encrypt']);
+
         self::assertEquals([
             'queryType' => EncryptQuery::Range,
             'min' => 5.5,

tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures/xml/Documents.Encryption.RangeTypes.dcm.xml

@@ -10,6 +10,9 @@
         <field name="intField" type="int">
             <encrypt queryType="range" min="5" max="10"/>
         </field>
+        <field name="int64Field" type="int64">
+            <encrypt queryType="range" min="5" max="9223372036854775802"/>
+        </field>
         <field name="floatField" type="float">
             <encrypt queryType="range" min="5.5" max="10.5"/>
         </field>