Remove TABLE and UUID strategies

Author: derrabus

UPGRADE.md

@@ -21,6 +21,14 @@ Signatures of overridden methods should be changed accordingly
 
 Method `Doctrine\ORM\EntityManagerInterface#copy()` never got its implementation and is removed in 3.0.
 
+## BC BREAK: Removed classes related to UUID and TABLE generator strategies
+
+The following classes have been removed:
+- `Doctrine\ORM\Id\TableGenerator`
+- `Doctrine\ORM\Id\UuidGenerator`
+
+Using the `UUID` strategy for generating identifiers is not supported anymore.
+
 # Upgrade to 2.10
 
 ## BC Break: Removed `TABLE` id generator strategy

lib/Doctrine/ORM/Id/TableGenerator.php

@@ -17,10 +17,8 @@
 use Doctrine\ORM\Id\BigIntegerIdentityGenerator;
 use Doctrine\ORM\Id\IdentityGenerator;
 use Doctrine\ORM\Id\SequenceGenerator;
-use Doctrine\ORM\Id\UuidGenerator;
 use Doctrine\ORM\Mapping\Exception\CannotGenerateIds;
 use Doctrine\ORM\Mapping\Exception\InvalidCustomGenerator;
-use Doctrine\ORM\Mapping\Exception\TableGeneratorNotImplementedYet;
 use Doctrine\ORM\Mapping\Exception\UnknownGeneratorType;
 use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory;
 use Doctrine\Persistence\Mapping\ClassMetadata as ClassMetadataInterface;
@@ -617,16 +615,6 @@ private function completeIdGeneratorMapping(ClassMetadataInfo $class): void
                 $class->setIdGenerator(new AssignedGenerator());
                 break;
 
-            case ClassMetadata::GENERATOR_TYPE_UUID:
-                Deprecation::trigger(
-                    'doctrine/orm',
-                    'https://github.com/doctrine/orm/issues/7312',
-                    'Mapping for %s: the "UUID" id generator strategy is deprecated with no replacement',
-                    $class->name
-                );
-                $class->setIdGenerator(new UuidGenerator());
-                break;
-
             case ClassMetadata::GENERATOR_TYPE_CUSTOM:
                 $definition = $class->customGeneratorDefinition;
                 if ($definition === null) {

lib/Doctrine/ORM/Id/UuidGenerator.php

@@ -14,7 +14,6 @@
 use Doctrine\Deprecations\Deprecation;
 use Doctrine\Instantiator\Instantiator;
 use Doctrine\Instantiator\InstantiatorInterface;
-use Doctrine\ORM\Cache\Exception\CacheException;
 use Doctrine\ORM\Cache\Exception\NonCacheableEntityAssociation;
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Doctrine\Persistence\Mapping\ClassMetadata;
@@ -111,15 +110,6 @@ class ClassMetadataInfo implements ClassMetadata
      */
     public const GENERATOR_TYPE_SEQUENCE = 2;
 
-    /**
-     * TABLE means a separate table is used for id generation.
-     * Offers full portability (in that it results in an exception being thrown
-     * no matter the platform).
-     *
-     * @deprecated no replacement planned
-     */
-    public const GENERATOR_TYPE_TABLE = 3;
-
     /**
      * IDENTITY means an identity column is used for id generation. The database
      * will fill in the id column on insertion. Platforms that do not support
@@ -134,14 +124,6 @@ class ClassMetadataInfo implements ClassMetadata
      */
     public const GENERATOR_TYPE_NONE = 5;
 
-    /**
-     * UUID means that a UUID/GUID expression is used for id generation. Full
-     * portability is currently not guaranteed.
-     *
-     * @deprecated use an application-side generator instead
-     */
-    public const GENERATOR_TYPE_UUID = 6;
-
     /**
      * CUSTOM means that customer will use own ID generator that supposedly work
      */
@@ -2231,18 +2213,6 @@ public function isIdGeneratorSequence()
         return $this->generatorType === self::GENERATOR_TYPE_SEQUENCE;
     }
 
-    /**
-     * Checks whether the class uses a table for id generation.
-     *
-     * @deprecated
-     *
-     * @return false
-     */
-    public function isIdGeneratorTable()
-    {
-        return false;
-    }
-
     /**
      * Checks whether the class has a natural identifier/pk (which means it does
      * not use any Id generator.
@@ -2254,16 +2224,6 @@ public function isIdentifierNatural()
         return $this->generatorType === self::GENERATOR_TYPE_NONE;
     }
 
-    /**
-     * Checks whether the class use a UUID for id generation.
-     *
-     * @return bool
-     */
-    public function isIdentifierUuid()
-    {
-        return $this->generatorType === self::GENERATOR_TYPE_UUID;
-    }
-
     /**
      * Gets the type of a field.
      *

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -5,12 +5,7 @@
 namespace Doctrine\ORM\Mapping\Driver;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\Reader;
-use Doctrine\DBAL\Types\Type;
-use Doctrine\ORM\Annotation;
-use Doctrine\ORM\Cache\Exception\CacheException;
 use Doctrine\ORM\Events;
-use Doctrine\ORM\Id\TableGenerator;
 use Doctrine\ORM\Mapping;
 use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder;
 use Doctrine\ORM\Mapping\MappingException;

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -221,7 +221,6 @@ class EntityGenerator
         ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE  => 'SEQUENCE',
         ClassMetadataInfo::GENERATOR_TYPE_IDENTITY  => 'IDENTITY',
         ClassMetadataInfo::GENERATOR_TYPE_NONE      => 'NONE',
-        ClassMetadataInfo::GENERATOR_TYPE_UUID      => 'UUID',
         ClassMetadataInfo::GENERATOR_TYPE_CUSTOM    => 'CUSTOM',
     ];
 

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

@@ -253,9 +253,6 @@ protected function _getIdGeneratorTypeString($type)
             case ClassMetadataInfo::GENERATOR_TYPE_IDENTITY:
                 return 'IDENTITY';
 
-            case ClassMetadataInfo::GENERATOR_TYPE_UUID:
-                return 'UUID';
-
             case ClassMetadataInfo::GENERATOR_TYPE_CUSTOM:
                 return 'CUSTOM';
         }

lib/Doctrine/ORM/Tools/EntityGenerator.php

@@ -215,16 +215,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Event/PreFlushEventArgs.php
 
-		-
-			message: "#^Call to an undefined method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getTableHiLoCurrentValSql\\(\\)\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Id/TableGenerator.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getTableHiLoUpdateNextValSql\\(\\)\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Id/TableGenerator.php
-
 		-
 			message: "#^Parameter \\#2 \\$discrMap of static method Doctrine\\\\ORM\\\\Internal\\\\Hydration\\\\HydrationException\\:\\:invalidDiscriminatorValue\\(\\) expects array\\<string, string\\>, array\\<int, int\\|string\\> given\\.$#"
 			count: 1
@@ -2092,7 +2082,7 @@ parameters:
 			path: lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
 
 		-
-			message: "#^Parameter \\#1 \\$type of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) expects 1\\|2\\|3\\|4\\|5\\|6\\|7, int given\\.$#"
+			message: "#^Parameter \\#1 \\$type of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) expects 1\\|2\\|4\\|5\\|7, int given\\.$#"
 			count: 1
 			path: lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
 
@@ -2102,7 +2092,7 @@ parameters:
 			path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
 
 		-
-			message: "#^Parameter \\#1 \\$type of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) expects 1\\|2\\|3\\|4\\|5\\|6\\|7, int given\\.$#"
+			message: "#^Parameter \\#1 \\$type of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) expects 1\\|2\\|4\\|5\\|7, int given\\.$#"
 			count: 2
 			path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
 
@@ -2112,7 +2102,7 @@ parameters:
 			path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
 
 		-
-			message: "#^Parameter \\#1 \\$type of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) expects 1\\|2\\|3\\|4\\|5\\|6\\|7, int given\\.$#"
+			message: "#^Parameter \\#1 \\$type of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) expects 1\\|2\\|4\\|5\\|7, int given\\.$#"
 			count: 1
 			path: lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
 

lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php

@@ -4,9 +4,6 @@ includes:
 
 parameters:
     ignoreErrors:
-        # deprecations from doctrine/dbal:3.x
-        - '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getGuidExpression\(\).$/'
-
         # Fallback logic for DBAL 2
         -
             message: '/HelperSet constructor expects/'