Add TypeRegistry to Configuration and use it in all internal type resolution

composer.json

@@ -47,7 +47,8 @@
         "slevomat/coding-standard": "8.27.1",
         "squizlabs/php_codesniffer": "4.0.1",
         "symfony/cache": "^6.3.8|^7.0|^8.0",
-        "symfony/console": "^5.4|^6.3|^7.0|^8.0"
+        "symfony/console": "^5.4|^6.3|^7.0|^8.0",
+        "symfony/service-contracts": "^2|^3"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

src/Configuration.php

@@ -7,6 +7,8 @@
 use Doctrine\DBAL\Driver\Middleware;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\DBAL\Schema\SchemaManagerFactory;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\TypeRegistry;
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
@@ -36,6 +38,8 @@ class Configuration
 
     private ?SchemaManagerFactory $schemaManagerFactory = null;
 
+    private ?TypeRegistry $typeRegistry = null;
+
     public function __construct()
     {
         $this->schemaAssetsFilter = static function (): bool {
@@ -134,6 +138,19 @@ public function setSchemaManagerFactory(SchemaManagerFactory $schemaManagerFacto
         return $this;
     }
 
+    public function getTypeRegistry(): TypeRegistry
+    {
+        return $this->typeRegistry ??= Type::getTypeRegistry();
+    }
+
+    /** @return $this */
+    public function setTypeRegistry(TypeRegistry $typeRegistry): self
+    {
+        $this->typeRegistry = $typeRegistry;
+
+        return $this;
+    }
+
     public function getDisableTypeComments(): bool
     {
         return true;

src/Connection.php

@@ -194,6 +194,7 @@ public function getDatabasePlatform(): AbstractPlatform
             }
 
             $this->platform = $this->driver->getDatabasePlatform($versionProvider);
+            $this->platform->setConfiguration($this->_config);
         }
 
         return $this->platform;
@@ -1278,7 +1279,8 @@ public function isRollbackOnly(): bool
      */
     public function convertToDatabaseValue(mixed $value, string $type): mixed
     {
-        return Type::getType($type)->convertToDatabaseValue($value, $this->getDatabasePlatform());
+        return $this->_config->getTypeRegistry()->get($type)
+            ->convertToDatabaseValue($value, $this->getDatabasePlatform());
     }
 
     /**
@@ -1294,7 +1296,7 @@ public function convertToDatabaseValue(mixed $value, string $type): mixed
      */
     public function convertToPHPValue(mixed $value, string $type): mixed
     {
-        return Type::getType($type)->convertToPHPValue($value, $this->getDatabasePlatform());
+        return $this->_config->getTypeRegistry()->get($type)->convertToPHPValue($value, $this->getDatabasePlatform());
     }
 
     /**
@@ -1360,7 +1362,7 @@ private function bindParameters(DriverStatement $stmt, array $params, array $typ
     private function getBindingInfo(mixed $value, string|ParameterType|Type $type): array
     {
         if (is_string($type)) {
-            $type = Type::getType($type);
+            $type = $this->_config->getTypeRegistry()->get($type);
         }
 
         if ($type instanceof Type) {

src/Platforms/AbstractPlatform.php

@@ -4,6 +4,7 @@
 
 namespace Doctrine\DBAL\Platforms;
 
+use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
@@ -107,6 +108,8 @@ abstract class AbstractPlatform
      */
     private ?UnquotedIdentifierFolding $unquotedIdentifierFolding = null;
 
+    private ?Configuration $configuration = null;
+
     public function __construct(?UnquotedIdentifierFolding $unquotedIdentifierFolding = null)
     {
         if ($unquotedIdentifierFolding === null) {
@@ -121,6 +124,17 @@ public function __construct(?UnquotedIdentifierFolding $unquotedIdentifierFoldin
         $this->unquotedIdentifierFolding = $unquotedIdentifierFolding ?? UnquotedIdentifierFolding::UPPER;
     }
 
+    /** @internal Called by Connection after platform creation. */
+    public function setConfiguration(Configuration $configuration): void
+    {
+        $this->configuration = $configuration;
+    }
+
+    private function getTypeRegistry(): Types\TypeRegistry
+    {
+        return $this->configuration?->getTypeRegistry() ?? Type::getTypeRegistry();
+    }
+
     /**
      * Returns the SQL snippet that declares a boolean column.
      *
@@ -171,8 +185,8 @@ private function initializeAllDoctrineTypeMappings(): void
     {
         $this->initializeDoctrineTypeMappings();
 
-        foreach (Type::getTypesMap() as $typeName => $className) {
-            foreach (Type::getType($typeName)->getMappedDatabaseTypes($this) as $dbType) {
+        foreach ($this->getTypeRegistry()->getMap() as $typeName => $type) {
+            foreach ($type->getMappedDatabaseTypes($this) as $dbType) {
                 $dbType                             = strtolower($dbType);
                 $this->doctrineTypeMapping[$dbType] = $typeName;
             }
@@ -397,7 +411,7 @@ public function registerDoctrineTypeMapping(string $dbType, string $doctrineType
             $this->initializeAllDoctrineTypeMappings();
         }
 
-        if (! Types\Type::hasType($doctrineType)) {
+        if (! $this->getTypeRegistry()->has($doctrineType)) {
             throw TypeNotFound::new($doctrineType);
         }
 

src/Platforms/Db2/Db2MetadataProvider.php

@@ -193,7 +193,7 @@ private function createTableColumn(array $row): TableColumnMetadataRow
         }
 
         $editor
-            ->setTypeName($type)
+            ->setType($this->connection->getConfiguration()->getTypeRegistry()->get($type))
             ->setNotNull($nulls === 'N')
             ->setDefaultValue($this->parseDefaultExpression($default))
             ->setAutoincrement($generated === 'D');

src/Platforms/MySQL/MySQLMetadataProvider.php

@@ -214,8 +214,10 @@ private function createTableColumn(array $row): TableColumnMetadataRow
 
         $editor = Column::editor()
             ->setQuotedName($columnName)
-            ->setTypeName(
-                $this->platform->getDoctrineTypeMapping($dbType),
+            ->setType(
+                $this->connection->getConfiguration()->getTypeRegistry()->get(
+                    $this->platform->getDoctrineTypeMapping($dbType),
+                ),
             );
 
         if (str_contains($columnType, 'unsigned')) {

src/Platforms/Oracle/OracleMetadataProvider.php

@@ -229,7 +229,7 @@ private function createTableColumn(array $row): TableColumnMetadataRow
         }
 
         $editor
-            ->setTypeName($type)
+            ->setType($this->connection->getConfiguration()->getTypeRegistry()->get($type))
             ->setPrecision($precision)
             ->setScale($scale)
             ->setNotNull($nullable === 'N')

src/Platforms/PostgreSQL/PostgreSQLMetadataProvider.php

@@ -243,8 +243,10 @@ private function createTableColumn(array $row): TableColumnMetadataRow
             $completeType = $domainCompleteType;
         }
 
-        $editor->setTypeName(
-            $this->platform->getDoctrineTypeMapping($typeName),
+        $editor->setType(
+            $this->connection->getConfiguration()->getTypeRegistry()->get(
+                $this->platform->getDoctrineTypeMapping($typeName),
+            ),
         );
 
         switch ($typeName) {

src/Platforms/SQLServer/SQLServerMetadataProvider.php

@@ -221,8 +221,10 @@ private function createTableColumn(array $row): TableColumnMetadataRow
 
         $editor = Column::editor()
             ->setQuotedName($columnName)
-            ->setTypeName(
-                $this->platform->getDoctrineTypeMapping($dbType),
+            ->setType(
+                $this->connection->getConfiguration()->getTypeRegistry()->get(
+                    $this->platform->getDoctrineTypeMapping($dbType),
+                ),
             )
             ->setNotNull(! $isNullable)
             ->setAutoincrement((bool) $isIdentity);

src/Platforms/SQLite/SQLiteMetadataProvider.php

@@ -174,7 +174,7 @@ private function createTableColumn(array $row, array $sqlByTableName): TableColu
 
         $typeName = $this->platform->getDoctrineTypeMapping($dbType);
 
-        $editor->setTypeName($typeName);
+        $editor->setType($this->connection->getConfiguration()->getTypeRegistry()->get($typeName));
 
         if ($dbType === 'char') {
             $editor->setFixed(true);

src/Schema/AbstractSchemaManager.php

@@ -16,6 +16,7 @@
 use Doctrine\DBAL\Schema\Name\Parsers;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\DBAL\Types\Exception\TypesException;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\Deprecations\Deprecation;
 use Throwable;
 
@@ -264,6 +265,8 @@ public function listTables(): array
                 $this->_getPortableTableForeignKeysList($foreignKeyColumnsByTable[$tableName] ?? []),
                 $tableOptionsByTable[$tableName] ?? [],
                 $configuration,
+                null,
+                $this->connection->getConfiguration()->getTypeRegistry(),
             );
         }
 
@@ -494,6 +497,9 @@ public function introspectTable(string $name): Table
             [],
             $this->listTableForeignKeys($name),
             $this->getTableOptions($name),
+            null,
+            null,
+            $this->connection->getConfiguration()->getTypeRegistry(),
         );
     }
 
@@ -1267,6 +1273,12 @@ protected function _getPortableSequenceDefinition(array $sequence): Sequence
         throw NotSupported::new(__METHOD__);
     }
 
+    /** @throws TypesException */
+    final protected function getType(string $typeName): Type
+    {
+        return $this->connection->getConfiguration()->getTypeRegistry()->get($typeName);
+    }
+
     /**
      * Independent of the database the keys of the column list result are lowercased.
      *
@@ -1444,6 +1456,7 @@ public function createSchemaConfig(): SchemaConfig
         }
 
         $schemaConfig->setDefaultTableOptions($params['defaultTableOptions']);
+        $schemaConfig->setTypeRegistry($this->connection->getConfiguration()->getTypeRegistry());
 
         return $schemaConfig;
     }

src/Schema/ColumnDiff.php

@@ -54,6 +54,13 @@ public function hasNameChanged(): bool
 
     public function hasTypeChanged(): bool
     {
+        // TODO: This comparison by class is insufficient now that types can be distinct services sharing the same
+        // class (e.g. two differently configured instances of the same Type subclass). It also produces false
+        // negatives for built-in aliases that share a class: json and json_object both map to JsonType::class,
+        // so switching between them is not detected as a change.
+        // The fix is to compare Type instances by identity (===) once both the introspected schema and the
+        // target schema are guaranteed to resolve types from the same TypeRegistry, so the flyweight invariant
+        // (one instance per registered name) holds across both sides of the diff.
         return $this->newColumn->getType()::class !== $this->oldColumn->getType()::class;
     }
 

src/Schema/DB2SchemaManager.php

@@ -6,7 +6,6 @@
 
 use Doctrine\DBAL\Platforms\DB2Platform;
 use Doctrine\DBAL\Result;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 
 use function array_change_key_case;
@@ -98,7 +97,7 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             $options['precision'] = $precision;
         }
 
-        return new Column($tableColumn['colname'], Type::getType($type), $options);
+        return new Column($tableColumn['colname'], $this->getType($type), $options);
     }
 
     /**

src/Schema/MySQLSchemaManager.php

@@ -17,7 +17,6 @@
 use Doctrine\DBAL\Schema\DefaultExpression\CurrentDate;
 use Doctrine\DBAL\Schema\DefaultExpression\CurrentTime;
 use Doctrine\DBAL\Schema\DefaultExpression\CurrentTimestamp;
-use Doctrine\DBAL\Types\Type;
 
 use function array_change_key_case;
 use function array_map;
@@ -214,7 +213,7 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             $options['comment'] = $tableColumn['comment'];
         }
 
-        $column = new Column($tableColumn['field'], Type::getType($type), $options);
+        $column = new Column($tableColumn['field'], $this->getType($type), $options);
         $column->setPlatformOption('charset', $tableColumn['characterset']);
         $column->setPlatformOption('collation', $tableColumn['collation']);
 

src/Schema/OracleSchemaManager.php

@@ -8,7 +8,6 @@
 use Doctrine\DBAL\Exception\DatabaseObjectNotFoundException;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Result;
-use Doctrine\DBAL\Types\Type;
 
 use function array_change_key_case;
 use function array_key_exists;
@@ -184,7 +183,7 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             $options['comment'] = $tableColumn['comments'];
         }
 
-        return new Column($this->getQuotedIdentifierName($tableColumn['column_name']), Type::getType($type), $options);
+        return new Column($this->getQuotedIdentifierName($tableColumn['column_name']), $this->getType($type), $options);
     }
 
     /**

src/Schema/PostgreSQLSchemaManager.php

@@ -8,7 +8,6 @@
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Types\JsonType;
-use Doctrine\DBAL\Types\Type;
 
 use function array_change_key_case;
 use function array_map;
@@ -274,7 +273,7 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             $options['comment'] = $tableColumn['comment'];
         }
 
-        $column = new Column($tableColumn['field'], Type::getType($type), $options);
+        $column = new Column($tableColumn['field'], $this->getType($type), $options);
 
         if (! empty($tableColumn['collation'])) {
             $column->setPlatformOption('collation', $tableColumn['collation']);

src/Schema/SQLServerSchemaManager.php

@@ -9,7 +9,6 @@
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Schema\DefaultExpression\CurrentTimestamp;
-use Doctrine\DBAL\Types\Type;
 
 use function array_change_key_case;
 use function assert;
@@ -132,7 +131,7 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             $options['length'] = $length;
         }
 
-        $column = new Column($tableColumn['name'], Type::getType($type), $options);
+        $column = new Column($tableColumn['name'], $this->getType($type), $options);
 
         if ($tableColumn['default'] !== null) {
             $default = $this->parseDefaultExpression($tableColumn['default']);

src/Schema/SQLiteSchemaManager.php

@@ -8,7 +8,6 @@
 use Doctrine\DBAL\Platforms\SQLite;
 use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Result;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Deprecations\Deprecation;
 
@@ -127,7 +126,7 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             'scale'     => $scale,
         ];
 
-        $column = new Column($tableColumn['name'], Type::getType($type), $options);
+        $column = new Column($tableColumn['name'], $this->getType($type), $options);
 
         if ($type === Types::STRING || $type === Types::TEXT) {
             $column->setPlatformOption('collation', $tableColumn['collation'] ?? 'BINARY');

src/Schema/Schema.php

@@ -391,7 +391,17 @@ public function createNamespace(string $name): self
      */
     public function createTable(string $name): Table
     {
-        $table = new Table($name, [], [], [], [], [], $this->_schemaConfig->toTableConfiguration());
+        $table = new Table(
+            $name,
+            [],
+            [],
+            [],
+            [],
+            [],
+            $this->_schemaConfig->toTableConfiguration(),
+            null,
+            $this->_schemaConfig->getTypeRegistry(),
+        );
         $this->_addTable($table);
 
         foreach ($this->_schemaConfig->getDefaultTableOptions() as $option => $value) {