Favour bool and int over boolean and integer

UPGRADE-2.1.md

@@ -5,3 +5,6 @@ the `Doctrine\ODM\MongoDB\Id\IdGenerator` interface.
 
 The `Doctrine\ODM\MongoDB\Mapping\ClassMetadata` class has been marked final. The class will no longer be extendable 
 in ODM 3.0.
+
+The `boolean` and `integer` mapping types have been deprecated. Use their shorthand counterparts: `bool` and `int` 
+respectively.

docs/en/cookbook/blending-orm-and-mongodb-odm.rst

@@ -61,7 +61,7 @@ Next create the ``Order`` entity that has a ``$product`` and ``$productId`` prop
     class Order
     {
         /**
-         * @Id @Column(type="integer")
+         * @Id @Column(type="int")
          * @GeneratedValue(strategy="AUTO")
          */
         private $id;

docs/en/cookbook/mapping-classes-to-orm-and-odm.rst

@@ -52,7 +52,7 @@ First define the mapping for the ORM:
         /** @Entity(repositoryClass=BlogPostRepository::class) */
         class BlogPost
         {
-            /** @Id @Column(type="integer") */
+            /** @Id @Column(type="int") */
             private $id;
 
             /** @Column(type="string") */
@@ -73,7 +73,7 @@ First define the mapping for the ORM:
                                   http://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
             <entity name="Documents\Blog\BlogPost" repository-class="Documents\Blog\Repository\ORM\BlogPostRepository">
-                <id name="id" type="integer" />
+                <id name="id" type="int" />
                 <field name="name" type="string" />
                 <field name="email" type="text" />
             </entity>

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

@@ -36,6 +36,7 @@
 use function sprintf;
 use function strtolower;
 use function strtoupper;
+use function trigger_error;
 
 /**
  * A <tt>ClassMetadata</tt> instance holds all the object-document mapping metadata
@@ -1983,6 +1984,18 @@ public function mapField(array $mapping) : array
         $this->checkDuplicateMapping($mapping);
         $this->typeRequirementsAreMet($mapping);
 
+        $deprecatedTypes = [
+            Type::BOOLEAN => Type::BOOL,
+            Type::INTEGER => Type::INT,
+        ];
+        if (isset($deprecatedTypes[$mapping['type']])) {
+            @trigger_error(sprintf(
+                '"%s" type was deprecated in doctrine/mongodb-odm 2.1 and will be removed in 3.0. Use "%s" instead.',
+                $mapping['type'],
+                $deprecatedTypes[$mapping['type']]
+            ));
+        }
+
         $this->fieldMappings[$mapping['fieldName']] = $mapping;
         if (isset($mapping['association'])) {
             $this->associationMappings[$mapping['fieldName']] = $mapping;

lib/Doctrine/ODM/MongoDB/Types/Type.php

@@ -23,12 +23,14 @@
  */
 abstract class Type
 {
-    public const ID                 = 'id';
-    public const INTID              = 'int_id';
-    public const CUSTOMID           = 'custom_id';
-    public const BOOL               = 'bool';
-    public const BOOLEAN            = 'boolean';
-    public const INT                = 'int';
+    public const ID       = 'id';
+    public const INTID    = 'int_id';
+    public const CUSTOMID = 'custom_id';
+    public const BOOL     = 'bool';
+    /** @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';
+    public const INT     = 'int';
+    /** @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';
     public const FLOAT              = 'float';
     public const STRING             = 'string';

tests/Doctrine/ODM/MongoDB/Tests/Functional/IndexesTest.php

@@ -268,7 +268,7 @@ class PartialIndexOnDocumentTest
     /** @ODM\Field(type="string") */
     public $email;
 
-    /** @ODM\Field(type="integer") */
+    /** @ODM\Field(type="int") */
     public $counter;
 }
 

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

@@ -281,7 +281,7 @@ public function testDriver()
         $this->assertEquals([
             'fieldName' => 'count',
             'name' => 'count',
-            'type' => 'integer',
+            'type' => 'int',
             'isCascadeDetach' => false,
             'isCascadeMerge' => false,
             'isCascadePersist' => false,

tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures/xml/TestDocuments.QueryResultDocument.dcm.xml

@@ -7,7 +7,7 @@
 
     <query-result-document name="TestDocuments\QueryResultDocument">
         <field name="name" type="string" />
-        <field name="count" type="integer" />
+        <field name="count" type="int" />
     </query-result-document>
 
 </doctrine-mongo-mapping>

tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures/xml/TestDocuments.View.dcm.xml

@@ -7,7 +7,7 @@
 
     <view name="TestDocuments\View">
         <field name="name" type="string" />
-        <field name="count" type="integer" />
+        <field name="count" type="int" />
     </view>
 
 </doctrine-mongo-mapping>

tests/Doctrine/ODM/MongoDB/Tests/Mapping/xml/Doctrine.ODM.MongoDB.Tests.Mapping.AbstractMappingDriverUser.dcm.xml

@@ -25,7 +25,7 @@
         <field field-name="lock" lock="true" type="int" />
         <field field-name="name" name="username" type="string" />
         <field field-name="email" type="string" unique="true" drop-dups="true" order="desc" />
-        <field field-name="mysqlProfileId" type="integer" unique="true" drop-dups="true" order="desc" />
+        <field field-name="mysqlProfileId" type="int" unique="true" drop-dups="true" order="desc" />
         <field field-name="createdAt" type="date" />
         <field field-name="roles" type="collection" />
         <indexes>

tests/Doctrine/ODM/MongoDB/Tests/Persisters/DocumentPersisterGetShardKeyQueryTest.php

@@ -117,7 +117,7 @@ class ShardedByScalars
     /** @ODM\Field(type="string") */
     public $string;
 
-    /** @ODM\Field(type="boolean") */
+    /** @ODM\Field(type="bool") */
     public $bool;
 
     /** @ODM\Field(type="float") */