Leverage convertToDatabaseValue

Author: GromNaN

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

@@ -4,7 +4,6 @@
 
 namespace Doctrine\ODM\MongoDB\Mapping\Driver;
 
-use DateTimeImmutable;
 use Doctrine\ODM\MongoDB\Mapping\Annotations\TimeSeries;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
@@ -15,9 +14,7 @@
 use DOMDocument;
 use InvalidArgumentException;
 use LibXMLError;
-use MongoDB\BSON\Decimal128;
 use MongoDB\BSON\Document;
-use MongoDB\BSON\UTCDateTime;
 use MongoDB\Driver\Exception\UnexpectedValueException;
 use SimpleXMLElement;
 
@@ -319,13 +316,7 @@ public function loadMetadataForClass($className, \Doctrine\Persistence\Mapping\C
                     foreach ($field->encrypt->attributes() as $encryptKey => $encryptValue) {
                         $mapping['encrypt'][$encryptKey] = match ($encryptKey) {
                             'queryType' => (string) $encryptValue,
-                            'min', 'max' => match ($mapping['type']) {
-                                Type::INT, Type::INTEGER => (int) $encryptValue,
-                                Type::FLOAT => (float) $encryptValue,
-                                Type::DECIMAL128 => new Decimal128((string) $encryptValue),
-                                Type::DATE, Type::DATE_IMMUTABLE => new UTCDateTime(new DateTimeImmutable((string) $encryptValue)),
-                                default => null, // Invalid
-                            },
+                            'min', 'max' => Type::getType($mapping['type'])->convertToDatabaseValue((string) $encryptValue),
                             'sparsity', 'precision', 'trimFactor', 'contention' => (int) $encryptValue,
                         };
                     }

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

@@ -111,13 +111,17 @@ private function createEncryptedFieldsMapForClass(
             $field = [
                 'path' => $path . $mapping['name'],
                 'bsonType' => match ($mapping['type']) {
-                    ClassMetadata::ONE => 'object',
-                    ClassMetadata::MANY => 'array',
-                    Type::STRING => 'string',
+                    ClassMetadata::ONE, Type::HASH => 'object',
+                    ClassMetadata::MANY, Type::COLLECTION => 'array',
                     Type::INT, Type::INTEGER => 'int',
                     Type::FLOAT => 'double',
                     Type::DECIMAL128 => 'decimal',
                     Type::DATE, Type::DATE_IMMUTABLE => 'date',
+                    Type::TIMESTAMP => 'timestamp',
+                    Type::OBJECTID => 'objectId',
+                    Type::STRING => 'string',
+                    Type::BINDATA, Type::BINDATABYTEARRAY, Type::BINDATAFUNC, Type::BINDATACUSTOM, Type::BINDATAUUID, Type::BINDATAMD5, Type::BINDATAUUIDRFC4122 => 'binData',
+                    // Type BOOL is not supported in encrypted fields map
                     default => throw new LogicException(sprintf('Type "%s" is not supported in encrypted fields map.', $mapping['type'])),
                 },
                 'keyId' => null, // Generate the key automatically

phpstan-baseline.neon

@@ -961,7 +961,7 @@ parameters:
 			path: lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
 
 		-
-			message: '#^Parameter \#2 \$mapping of method Doctrine\\ODM\\MongoDB\\Mapping\\Driver\\XmlDriver\:\:addFieldMapping\(\) expects array\{type\?\: string, fieldName\?\: string, name\?\: string, strategy\?\: string, association\?\: int, id\?\: bool, isOwningSide\?\: bool, collectionClass\?\: class\-string, \.\.\.\}, array\<string, array\<int\<0, max\>\|string, float\|int\|MongoDB\\BSON\\Decimal128\|MongoDB\\BSON\\UTCDateTime\|string\|null\>\|bool\|string\> given\.$#'
+			message: '#^Parameter \#2 \$mapping of method Doctrine\\ODM\\MongoDB\\Mapping\\Driver\\XmlDriver\:\:addFieldMapping\(\) expects array\{type\?\: string, fieldName\?\: string, name\?\: string, strategy\?\: string, association\?\: int, id\?\: bool, isOwningSide\?\: bool, collectionClass\?\: class\-string, \.\.\.\}, array\<string, array\<int\<0, max\>\|string, mixed\>\|bool\|string\> given\.$#'
 			identifier: argument.type
 			count: 1
 			path: lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php