Favour int over int_id

doctrine · May 18, 2020 · 9e0b1a1 · 9e0b1a1
1 parent 33bd049
commit 9e0b1a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
@@ -1896,7 +1896,7 @@ public function mapField(array $mapping) : array
                     if (! empty($this->generatorOptions['type'])) {
                         $mapping['type'] = $this->generatorOptions['type'];
                     } elseif (empty($mapping['type'])) {
-                        $mapping['type'] = $this->generatorType === self::GENERATOR_TYPE_INCREMENT ? 'int_id' : 'custom_id';
+                        $mapping['type'] = $this->generatorType === self::GENERATOR_TYPE_INCREMENT ? Type::INT : Type::CUSTOMID;
                     }
             }
             unset($this->generatorOptions['type']);

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php b/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php
@@ -539,7 +539,7 @@ class NotifyChangedDocument implements NotifyPropertyChanged
 {
     private $_listeners = [];
 
-    /** @ODM\Id(type="int_id", strategy="none") */
+    /** @ODM\Id(type="int", strategy="none") */
     private $id;
 
     /** @ODM\Field(type="string") */
@@ -611,7 +611,7 @@ protected function _onPropertyChanged($propName, $oldValue, $newValue)
 /** @ODM\Document */
 class NotifyChangedRelatedItem
 {
-    /** @ODM\Id(type="int_id", strategy="none") */
+    /** @ODM\Id(type="int", strategy="none") */
     private $id;
 
     /** @ODM\ReferenceOne(targetDocument=NotifyChangedDocument::class) */