Remove deprecated types INTID, INTEGER, BOOLEAN (#2894)

Author: GromNaN

src/Mapping/ClassMetadata.php

@@ -2580,21 +2580,6 @@ public function mapField(array $mapping): array
         $this->checkDuplicateMapping($mapping);
         $this->typeRequirementsAreMet($mapping);
 
-        $deprecatedTypes = [
-            Type::BOOLEAN => Type::BOOL,
-            Type::INTEGER => Type::INT,
-            Type::INTID => Type::INT,
-        ];
-        if (isset($deprecatedTypes[$mapping['type']])) {
-            trigger_deprecation(
-                'doctrine/mongodb-odm',
-                '2.1',
-                'The "%s" mapping type is deprecated. Use "%s" instead.',
-                $mapping['type'],
-                $deprecatedTypes[$mapping['type']],
-            );
-        }
-
         $this->fieldMappings[$mapping['fieldName']] = $mapping;
         if (isset($mapping['association'])) {
             $this->associationMappings[$mapping['fieldName']] = $mapping;

src/Types/IntIdType.php

@@ -49,27 +49,15 @@ abstract class Type
     public const VECTOR_INT8        = 'vector_int8';
     public const VECTOR_PACKED_BIT  = 'vector_packed_bit';
 
-    /** @deprecated const was deprecated in doctrine/mongodb-odm 2.1 and will be removed in 3.0. Use Type::INT instead */
-    public const INTID = 'int_id';
-
-    /** @deprecated const was deprecated in doctrine/mongodb-odm 2.1 and will be removed in 3.0. Use Type::INT instead */
-    public const INTEGER = 'integer';
-
-    /** @deprecated const was deprecated in doctrine/mongodb-odm 2.1 and will be removed in 3.0. Use Type::BOOL instead */
-    public const BOOLEAN = 'boolean';
-
     /** @var Type[] Map of already instantiated type objects. One instance per type (flyweight). */
     private static array $typeObjects = [];
 
     /** @var array<string, class-string> The map of supported doctrine mapping types. */
     private static array $typesMap = [
         self::ID => Types\IdType::class,
-        self::INTID => Types\IntIdType::class,
         self::CUSTOMID => Types\CustomIdType::class,
         self::BOOL => Types\BooleanType::class,
-        self::BOOLEAN => Types\BooleanType::class,
         self::INT => Types\IntType::class,
-        self::INTEGER => Types\IntType::class,
         self::INT64 => Types\Int64Type::class,
         self::FLOAT => Types\FloatType::class,
         self::STRING => Types\StringType::class,

src/Types/Type.php

@@ -121,7 +121,7 @@ private function createEncryptedFieldsForClass(
                 'bsonType' => match ($mapping['type']) {
                     ClassMetadata::ONE, Type::HASH => 'object',
                     ClassMetadata::MANY, Type::COLLECTION => 'array',
-                    Type::INT, Type::INTEGER => 'int',
+                    Type::INT => 'int',
                     Type::INT64 => 'long',
                     Type::FLOAT => 'double',
                     Type::DECIMAL128 => 'decimal',
@@ -130,7 +130,7 @@ private function createEncryptedFieldsForClass(
                     Type::OBJECTID => 'objectId',
                     Type::STRING => 'string',
                     Type::BINDATA, Type::BINDATABYTEARRAY, Type::BINDATAFUNC, Type::BINDATACUSTOM, Type::BINDATAUUID, Type::BINDATAMD5, Type::BINDATAUUIDRFC4122 => 'binData',
-                    Type::BOOL, Type::BOOLEAN => 'bool',
+                    Type::BOOL => 'bool',
                     default => throw new LogicException(sprintf('Type "%s" is not supported in encrypted fields map.', $mapping['type'])),
                 },
                 'keyId' => null, // Generate the key automatically

src/Utility/EncryptedFieldsMapGenerator.php

@@ -46,12 +46,9 @@ public static function provideTypes(): array
     {
         return [
             'id' => [Type::ID, '507f1f77bcf86cd799439011', new ObjectId('507f1f77bcf86cd799439011')],
-            'intId' => [Type::INTID, 1],
             'customId' => [Type::CUSTOMID, (object) ['foo' => 'bar']],
             'bool' => [Type::BOOL, true],
-            'boolean' => [Type::BOOLEAN, false],
             'int' => [Type::INT, 69],
-            'integer' => [Type::INTEGER, 42],
             'int64' => [Type::INT64, 100, new Int64(100)],
             'float' => [Type::FLOAT, 3.14],
             'string' => [Type::STRING, 'ohai'],