Remove increment type

doctrine · Jul 30, 2016 · 97dce7e · 97dce7e
1 parent c515e77
commit 97dce7e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 69 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
@@ -1260,9 +1260,6 @@ public function mapField(array $mapping)
         if (isset($mapping['type']) && $mapping['type'] === 'file') {
             $mapping['file'] = true;
         }
-        if (isset($mapping['type']) && $mapping['type'] === 'increment') {
-            $mapping['strategy'] = self::STORAGE_STRATEGY_INCREMENT;
-        }
         if (isset($mapping['file']) && $mapping['file'] === true) {
             $this->file = $mapping['fieldName'];
             $mapping['name'] = 'file';
@@ -1395,7 +1392,6 @@ private function applyStorageStrategy(array &$mapping)
         switch (true) {
             case $mapping['type'] == 'int':
             case $mapping['type'] == 'float':
-            case $mapping['type'] == 'increment':
                 $defaultStrategy = self::STORAGE_STRATEGY_SET;
                 $allowedStrategies = [self::STORAGE_STRATEGY_SET, self::STORAGE_STRATEGY_INCREMENT];
                 break;

diff --git a/lib/Doctrine/ODM/MongoDB/Types/IncrementType.php b/lib/Doctrine/ODM/MongoDB/Types/IncrementType.php
diff --git a/lib/Doctrine/ODM/MongoDB/Types/Type.php b/lib/Doctrine/ODM/MongoDB/Types/Type.php
@@ -51,7 +51,6 @@ abstract class Type
     const FILE = 'file';
     const HASH = 'hash';
     const COLLECTION = 'collection';
-    const INCREMENT = 'increment';
     const OBJECTID = 'object_id';
     const RAW = 'raw';
 
@@ -82,7 +81,6 @@ abstract class Type
         self::FILE => Types\FileType::class,
         self::HASH => Types\HashType::class,
         self::COLLECTION => Types\CollectionType::class,
-        self::INCREMENT => Types\IncrementType::class,
         self::OBJECTID => Types\ObjectIdType::class,
         self::RAW => Types\RawType::class,
     );

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataInfoTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataInfoTest.php
@@ -361,18 +361,6 @@ public function testReferenceManySortMustNotBeUsedWithNonSetCollectionStrategy()
         ));
     }
 
-    public function testIncrementTypeAutomaticallyAssumesIncrementStrategy()
-    {
-        $cm = new ClassMetadataInfo('stdClass');
-        $cm->mapField([
-            'fieldName' => 'incrementField',
-            'type' => 'increment',
-        ]);
-
-        $mapping = $cm->fieldMappings['incrementField'];
-        $this->assertSame(ClassMetadataInfo::STORAGE_STRATEGY_INCREMENT, $mapping['strategy']);
-    }
-
     public function testSetShardKeyForClassWithoutInheritance()
     {
         $cm = new ClassMetadataInfo('stdClass');

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Types/TypeTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Types/TypeTest.php
@@ -42,8 +42,6 @@ public function provideTypes()
             array(Type::getType(Type::FILE), new GridFSFile()),
             array(Type::getType(Type::HASH), array('foo' => 'bar')),
             array(Type::getType(Type::COLLECTION), array('foo', 'bar')),
-            array(Type::getType(Type::INCREMENT), 1),
-            array(Type::getType(Type::INCREMENT), 1.1),
             array(Type::getType(Type::OBJECTID), "507f1f77bcf86cd799439011"),
             array(Type::getType(Type::RAW), (object) array('foo' => 'bar')),
        );