Merge pull request #3356 from Majkl578/builtin-types

Extract constants for built-in types from Type to Types
doctrine · Apr 14, 2019 · 3a0a1d1 · 3a0a1d1
2 parents 11b67bb + 4d40444
commit 3a0a1d1
Show file tree

Hide file tree

Showing 52 changed files with 260 additions and 126 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,3 +1,16 @@
+# Upgrade to 2.10
+
+## Deprecated `Type::*` constants
+
+The constants for built-in types have been moved from `Doctrine\DBAL\Types\Type` to a separate class `Doctrine\DBAL\Types\Types`.
+
+Some of the constants were renamed in the process:
+* `TARRAY`-> `ARRAY`
+* `DATE` -> `DATE_MUTABLE`
+* `DATETIME` -> `DATETIME_MUTABLE`
+* `DATETIMETZ` -> `DATETIMETZ_MUTABLE`
+* `TIME` -> `TIME_MUTABLE`
+
 # Upgrade to 2.9
 
 ## Deprecated `Statement::fetchColumn()` with an invalid index

diff --git a/lib/Doctrine/DBAL/Platforms/DB2Platform.php b/lib/Doctrine/DBAL/Platforms/DB2Platform.php
@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use function array_merge;
 use function count;
 use function current;
@@ -96,7 +97,7 @@ public function initializeDoctrineTypeMappings()
      */
     public function isCommentedDoctrineType(Type $doctrineType)
     {
-        if ($doctrineType->getName() === Type::BOOLEAN) {
+        if ($doctrineType->getName() === Types::BOOLEAN) {
             // We require a commented boolean type in order to distinguish between boolean and smallint
             // as both (have to) map to the same native type.
             return true;

diff --git a/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php b/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php
@@ -2,7 +2,7 @@
 
 namespace Doctrine\DBAL\Platforms;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 
 /**
  * Provides the behavior, features and SQL dialect of the MariaDB 10.2 (10.2.7 GA) database platform.
@@ -36,6 +36,6 @@ protected function initializeDoctrineTypeMappings() : void
     {
         parent::initializeDoctrineTypeMappings();
 
-        $this->doctrineTypeMapping['json'] = Type::JSON;
+        $this->doctrineTypeMapping['json'] = Types::JSON;
     }
 }
diff --git a/lib/Doctrine/DBAL/Platforms/MySQL57Platform.php b/lib/Doctrine/DBAL/Platforms/MySQL57Platform.php
@@ -4,7 +4,7 @@
 
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\TableDiff;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 
 /**
  * Provides the behavior, features and SQL dialect of the MySQL 5.7 (5.7.9 GA) database platform.
@@ -66,6 +66,6 @@ protected function initializeDoctrineTypeMappings()
     {
         parent::initializeDoctrineTypeMappings();
 
-        $this->doctrineTypeMapping['json'] = Type::JSON;
+        $this->doctrineTypeMapping['json'] = Types::JSON;
     }
 }
diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSQL92Platform.php b/lib/Doctrine/DBAL/Platforms/PostgreSQL92Platform.php
@@ -2,7 +2,7 @@
 
 namespace Doctrine\DBAL\Platforms;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use function sprintf;
 
 /**
@@ -53,7 +53,7 @@ protected function initializeDoctrineTypeMappings()
     {
         parent::initializeDoctrineTypeMappings();
 
-        $this->doctrineTypeMapping['json'] = Type::JSON;
+        $this->doctrineTypeMapping['json'] = Types::JSON;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSQL94Platform.php b/lib/Doctrine/DBAL/Platforms/PostgreSQL94Platform.php
@@ -2,7 +2,7 @@
 
 namespace Doctrine\DBAL\Platforms;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 
 /**
  * Provides the behavior, features and SQL dialect of the PostgreSQL 9.4 database platform.
@@ -36,6 +36,6 @@ protected function initializeDoctrineTypeMappings()
     {
         parent::initializeDoctrineTypeMappings();
 
-        $this->doctrineTypeMapping['jsonb'] = Type::JSON;
+        $this->doctrineTypeMapping['jsonb'] = Types::JSON;
     }
 }
diff --git a/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php b/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
@@ -6,6 +6,7 @@
 use Doctrine\DBAL\FetchMode;
 use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use const CASE_LOWER;
 use function array_change_key_case;
 use function array_filter;
@@ -456,7 +457,7 @@ protected function _getPortableTableColumnDefinition($tableColumn)
             $column->setPlatformOption('collation', $tableColumn['collation']);
         }
 
-        if (in_array($column->getType()->getName(), [Type::JSON_ARRAY, Type::JSON], true)) {
+        if (in_array($column->getType()->getName(), [Types::JSON_ARRAY, Types::JSON], true)) {
             $column->setPlatformOption('jsonb', $jsonb);
         }
 

diff --git a/lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureFederationsSynchronizer.php b/lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureFederationsSynchronizer.php
@@ -9,6 +9,7 @@
 use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
 use Doctrine\DBAL\Schema\Synchronizer\SingleDatabaseSynchronizer;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use RuntimeException;
 use function array_merge;
 
@@ -240,12 +241,12 @@ private function getFederationTypeDefaultValue()
         $federationType = Type::getType($this->shardManager->getDistributionType());
 
         switch ($federationType->getName()) {
-            case Type::GUID:
+            case Types::GUID:
                 $defaultValue = '00000000-0000-0000-0000-000000000000';
                 break;
-            case Type::INTEGER:
-            case Type::SMALLINT:
-            case Type::BIGINT:
+            case Types::INTEGER:
+            case Types::SMALLINT:
+            case Types::BIGINT:
                 $defaultValue = '0';
                 break;
             default:

diff --git a/lib/Doctrine/DBAL/Types/ArrayType.php b/lib/Doctrine/DBAL/Types/ArrayType.php
@@ -59,7 +59,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::TARRAY;
+        return Types::ARRAY;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/BigIntType.php b/lib/Doctrine/DBAL/Types/BigIntType.php
@@ -15,7 +15,7 @@ class BigIntType extends Type implements PhpIntegerMappingType
      */
     public function getName()
     {
-        return Type::BIGINT;
+        return Types::BIGINT;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/BinaryType.php b/lib/Doctrine/DBAL/Types/BinaryType.php
@@ -42,7 +42,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
         }
 
         if (! is_resource($value)) {
-            throw ConversionException::conversionFailed($value, self::BINARY);
+            throw ConversionException::conversionFailed($value, Types::BINARY);
         }
 
         return $value;
@@ -53,7 +53,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::BINARY;
+        return Types::BINARY;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/BlobType.php b/lib/Doctrine/DBAL/Types/BlobType.php
@@ -42,7 +42,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
         }
 
         if (! is_resource($value)) {
-            throw ConversionException::conversionFailed($value, self::BLOB);
+            throw ConversionException::conversionFailed($value, Types::BLOB);
         }
 
         return $value;
@@ -53,7 +53,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::BLOB;
+        return Types::BLOB;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/BooleanType.php b/lib/Doctrine/DBAL/Types/BooleanType.php
@@ -39,7 +39,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::BOOLEAN;
+        return Types::BOOLEAN;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DateImmutableType.php b/lib/Doctrine/DBAL/Types/DateImmutableType.php
@@ -15,7 +15,7 @@ class DateImmutableType extends DateType
      */
     public function getName()
     {
-        return Type::DATE_IMMUTABLE;
+        return Types::DATE_IMMUTABLE;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DateIntervalType.php b/lib/Doctrine/DBAL/Types/DateIntervalType.php
@@ -19,7 +19,7 @@ class DateIntervalType extends Type
      */
     public function getName()
     {
-        return Type::DATEINTERVAL;
+        return Types::DATEINTERVAL;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DateTimeImmutableType.php b/lib/Doctrine/DBAL/Types/DateTimeImmutableType.php
@@ -16,7 +16,7 @@ class DateTimeImmutableType extends DateTimeType
      */
     public function getName()
     {
-        return Type::DATETIME_IMMUTABLE;
+        return Types::DATETIME_IMMUTABLE;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DateTimeType.php b/lib/Doctrine/DBAL/Types/DateTimeType.php
@@ -17,7 +17,7 @@ class DateTimeType extends Type implements PhpDateTimeMappingType
      */
     public function getName()
     {
-        return Type::DATETIME;
+        return Types::DATETIME_MUTABLE;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DateTimeTzImmutableType.php b/lib/Doctrine/DBAL/Types/DateTimeTzImmutableType.php
@@ -15,7 +15,7 @@ class DateTimeTzImmutableType extends DateTimeTzType
      */
     public function getName()
     {
-        return Type::DATETIMETZ_IMMUTABLE;
+        return Types::DATETIMETZ_IMMUTABLE;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DateTimeTzType.php b/lib/Doctrine/DBAL/Types/DateTimeTzType.php
@@ -29,7 +29,7 @@ class DateTimeTzType extends Type implements PhpDateTimeMappingType
      */
     public function getName()
     {
-        return Type::DATETIMETZ;
+        return Types::DATETIMETZ_MUTABLE;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DateType.php b/lib/Doctrine/DBAL/Types/DateType.php
@@ -16,7 +16,7 @@ class DateType extends Type
      */
     public function getName()
     {
-        return Type::DATE;
+        return Types::DATE_MUTABLE;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/DecimalType.php b/lib/Doctrine/DBAL/Types/DecimalType.php
@@ -14,7 +14,7 @@ class DecimalType extends Type
      */
     public function getName()
     {
-        return Type::DECIMAL;
+        return Types::DECIMAL;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/FloatType.php b/lib/Doctrine/DBAL/Types/FloatType.php
@@ -11,7 +11,7 @@ class FloatType extends Type
      */
     public function getName()
     {
-        return Type::FLOAT;
+        return Types::FLOAT;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/GuidType.php b/lib/Doctrine/DBAL/Types/GuidType.php
@@ -22,7 +22,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
      */
     public function getName()
     {
-        return Type::GUID;
+        return Types::GUID;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/IntegerType.php b/lib/Doctrine/DBAL/Types/IntegerType.php
@@ -15,7 +15,7 @@ class IntegerType extends Type implements PhpIntegerMappingType
      */
     public function getName()
     {
-        return Type::INTEGER;
+        return Types::INTEGER;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/JsonArrayType.php b/lib/Doctrine/DBAL/Types/JsonArrayType.php
@@ -33,7 +33,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::JSON_ARRAY;
+        return Types::JSON_ARRAY;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/JsonType.php b/lib/Doctrine/DBAL/Types/JsonType.php
@@ -69,7 +69,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::JSON;
+        return Types::JSON;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/ObjectType.php b/lib/Doctrine/DBAL/Types/ObjectType.php
@@ -58,7 +58,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::OBJECT;
+        return Types::OBJECT;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/SimpleArrayType.php b/lib/Doctrine/DBAL/Types/SimpleArrayType.php
@@ -54,7 +54,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::SIMPLE_ARRAY;
+        return Types::SIMPLE_ARRAY;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/SmallIntType.php b/lib/Doctrine/DBAL/Types/SmallIntType.php
@@ -15,7 +15,7 @@ class SmallIntType extends Type implements PhpIntegerMappingType
      */
     public function getName()
     {
-        return Type::SMALLINT;
+        return Types::SMALLINT;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/StringType.php b/lib/Doctrine/DBAL/Types/StringType.php
@@ -30,6 +30,6 @@ public function getDefaultLength(AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::STRING;
+        return Types::STRING;
     }
 }
diff --git a/lib/Doctrine/DBAL/Types/TextType.php b/lib/Doctrine/DBAL/Types/TextType.php
@@ -32,6 +32,6 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      */
     public function getName()
     {
-        return Type::TEXT;
+        return Types::TEXT;
     }
 }
diff --git a/lib/Doctrine/DBAL/Types/TimeImmutableType.php b/lib/Doctrine/DBAL/Types/TimeImmutableType.php
@@ -15,7 +15,7 @@ class TimeImmutableType extends TimeType
      */
     public function getName()
     {
-        return Type::TIME_IMMUTABLE;
+        return Types::TIME_IMMUTABLE;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/TimeType.php b/lib/Doctrine/DBAL/Types/TimeType.php
@@ -16,7 +16,7 @@ class TimeType extends Type
      */
     public function getName()
     {
-        return Type::TIME;
+        return Types::TIME_MUTABLE;
     }
 
     /**