Replace static Type::* calls with instance-based TypeRegistry lookups

src/Internal/Hydration/AbstractHydrator.php

@@ -7,9 +7,11 @@
 use BackedEnum;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Result;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\TypeProvider;
+use Doctrine\DBAL\Types\TypeRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Events;
+use Doctrine\ORM\Internal\TypeProviderLocator;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker;
@@ -54,6 +56,8 @@
      */
     protected UnitOfWork $uow;
 
+    private readonly TypeProvider|TypeRegistry $typeProvider;
+
     /**
      * Local ClassMetadata cache to avoid going to the EntityManager all the time.
      *
@@ -85,8 +89,9 @@
      */
     public function __construct(protected EntityManagerInterface $em)
     {
-        $this->platform = $em->getConnection()->getDatabasePlatform();
-        $this->uow      = $em->getUnitOfWork();
+        $this->platform     = $em->getConnection()->getDatabasePlatform();
+        $this->uow          = $em->getUnitOfWork();
+        $this->typeProvider = TypeProviderLocator::fromConnection($em->getConnection());
     }
 
     /**
@@ -458,7 +463,7 @@
                 $columnInfo    = [
                     'isIdentifier' => in_array($fieldName, $classMetadata->identifier, true),
                     'fieldName'    => $fieldName,
-                    'type'         => Type::getType($fieldMapping->type),
+                    'type'         => $this->typeProvider->get($fieldMapping->type),
                     'dqlAlias'     => $ownerMap,
                     'enumType'     => $this->rsm->enumMappings[$key] ?? null,
                 ];
@@ -486,7 +491,7 @@
                     'isScalar'             => true,
                     'isNewObjectParameter' => true,
                     'fieldName'            => $this->rsm->scalarMappings[$key],
-                    'type'                 => Type::getType($this->rsm->typeMappings[$key]),
+                    'type'                 => $this->typeProvider->get($this->rsm->typeMappings[$key]),
                     'argIndex'             => $mapping['argIndex'],
                     'objIndex'             => $mapping['objIndex'],
                     'enumType'             => $this->rsm->enumMappings[$key] ?? null,
@@ -495,7 +500,7 @@
             case isset($this->rsm->scalarMappings[$key], $this->hints[LimitSubqueryWalker::FORCE_DBAL_TYPE_CONVERSION]):
                 return $this->cache[$key] = [
                     'fieldName' => $this->rsm->scalarMappings[$key],
-                    'type'      => Type::getType($this->rsm->typeMappings[$key]),
+                    'type'      => $this->typeProvider->get($this->rsm->typeMappings[$key]),
                     'dqlAlias'  => '',
                     'enumType'  => $this->rsm->enumMappings[$key] ?? null,
                 ];
@@ -504,7 +509,7 @@
                 return $this->cache[$key] = [
                     'isScalar'  => true,
                     'fieldName' => $this->rsm->scalarMappings[$key],
-                    'type'      => Type::getType($this->rsm->typeMappings[$key]),
+                    'type'      => $this->typeProvider->get($this->rsm->typeMappings[$key]),
                     'enumType'  => $this->rsm->enumMappings[$key] ?? null,
                 ];
 
@@ -513,7 +518,7 @@
                 $fieldName = $this->rsm->metaMappings[$key];
                 $dqlAlias  = $this->rsm->columnOwnerMap[$key];
                 $type      = isset($this->rsm->typeMappings[$key])
-                    ? Type::getType($this->rsm->typeMappings[$key])
+                    ? $this->typeProvider->get($this->rsm->typeMappings[$key])
                     : null;
 
                 // Cache metadata fetch

src/Internal/TypeProviderLocator.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM\Internal;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\TypeProvider;
+use Doctrine\DBAL\Types\TypeRegistry;
+
+use function method_exists;
+
+/**
+ * Resolves the {@see TypeProvider} owned by a DBAL connection.
+ *
+ * @internal
+ */
+final class TypeProviderLocator
+{
+    public static function fromConnection(Connection $connection): TypeProvider|TypeRegistry
+    {
+        $configuration = $connection->getConfiguration();
+
+        // The method_exists() check is for DBAL < 4.5 compatibility, where Configuration::getTypeProvider() does not exist yet.
+        // @phpstan-ignore function.alreadyNarrowedType (DBAL < 4.5 compatibility)
+        if (method_exists($configuration, 'getTypeProvider')) {
+            return $configuration->getTypeProvider();
+        }
+
+        return Type::getTypeRegistry();
+    }
+}

src/Mapping/Driver/DatabaseDriver.php

@@ -422,7 +422,9 @@
         $fieldMapping = [
             'fieldName'  => $this->getFieldNameForColumn($tableName, self::getAssetName($column), false),
             'columnName' => self::getAssetName($column),
-            'type'       => Type::getTypeRegistry()->lookupName($column->getType()),
+            'type'       => method_exists($column, 'getTypeName')
+                ? $column->getTypeName()
+                : Type::getTypeRegistry()->lookupName($column->getType()),
             'nullable'   => ! $column->getNotnull(),
             'options'    => [
                 'comment' => $column->getComment(),

src/Persisters/Collection/OneToManyPersister.php

@@ -7,8 +7,8 @@
 use BadMethodCallException;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\DBAL\Exception as DBALException;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityNotFoundException;
+use Doctrine\ORM\Internal\TypeProviderLocator;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\ORM\Mapping\OneToManyAssociationMapping;
 use Doctrine\ORM\PersistentCollection;
@@ -219,12 +219,13 @@
         $idColumnNames     = $rootClass->getIdentifierColumnNames();
         $idColumnList      = implode(', ', $idColumnNames);
         $columnDefinitions = [];
+        $typeProvider      = TypeProviderLocator::fromConnection($this->em->getConnection());
 
         foreach ($idColumnNames as $idColumnName) {
             $columnDefinitions[$idColumnName] = [
                 'name'    => $idColumnName,
                 'notnull' => true,
-                'type'    => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $this->em)),
+                'type'    => $typeProvider->get(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $this->em)),
             ];
         }
 

src/Persisters/Entity/AbstractEntityInheritancePersister.php

@@ -4,7 +4,6 @@
 
 namespace Doctrine\ORM\Persisters\Entity;
 
-use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
 use function sprintf;
@@ -57,7 +56,7 @@ protected function getSelectColumnSQL(string $field, ClassMetadata $class, strin
 
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->name);
 
-        $type = Type::getType($fieldMapping->type);
+        $type = $this->getType($fieldMapping->type);
         $sql  = $type->convertToPHPValueSQL($sql, $this->platform);
 
         return $sql . ' AS ' . $columnAlias;

src/Persisters/Entity/BasicEntityPersister.php

@@ -14,9 +14,12 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\TypeProvider;
+use Doctrine\DBAL\Types\TypeRegistry;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Cache\Persister\CompatOrderings;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Internal\TypeProviderLocator;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\JoinColumnMapping;
@@ -120,6 +123,8 @@
      */
     protected Connection $conn;
 
+    private readonly TypeProvider|TypeRegistry $typeProvider;
+
     /**
      * The database platform.
      */
@@ -181,6 +186,7 @@
     ) {
         $this->conn                  = $em->getConnection();
         $this->platform              = $this->conn->getDatabasePlatform();
+        $this->typeProvider          = TypeProviderLocator::fromConnection($this->conn);
         $this->quoteStrategy         = $em->getConfiguration()->getQuoteStrategy();
         $this->identifierFlattener   = new IdentifierFlattener($em->getUnitOfWork(), $em->getMetadataFactory());
         $this->noLimitsContext       = $this->currentPersisterContext = new CachedPersisterContext(
@@ -205,6 +211,11 @@
         $this->filterHash = $this->em->getFilters()->getHash();
     }
 
+    final protected function getType(string $name): Type
+    {
+        return $this->typeProvider->get($name);
+    }
+
     public function getClassMetadata(): ClassMetadata
     {
         return $this->class;
@@ -292,7 +303,7 @@
         $values = $this->fetchVersionAndNotUpsertableValues($this->class, $id);
 
         foreach ($values as $field => $value) {
-            $value = Type::getType($this->class->fieldMappings[$field]->type)->convertToPHPValue($value, $this->platform);
+            $value = $this->getType($this->class->fieldMappings[$field]->type)->convertToPHPValue($value, $this->platform);
 
             $this->class->setFieldValue($entity, $field, $value);
         }
@@ -418,7 +429,7 @@
                     $column    = $this->quoteStrategy->getColumnName($fieldName, $this->class, $this->platform);
 
                     if (isset($this->class->fieldMappings[$fieldName])) {
-                        $type        = Type::getType($this->columnTypes[$columnName]);
+                        $type        = $this->getType($this->columnTypes[$columnName]);
                         $placeholder = $type->convertToDatabaseValueSQL('?', $this->platform);
                     }
 
@@ -1457,7 +1468,7 @@
                 && isset($this->columnTypes[$this->class->fieldNames[$column]])
                 && isset($this->class->fieldMappings[$this->class->fieldNames[$column]])
             ) {
-                $type        = Type::getType($this->columnTypes[$this->class->fieldNames[$column]]);
+                $type        = $this->getType($this->columnTypes[$this->class->fieldNames[$column]]);
                 $placeholder = $type->convertToDatabaseValueSQL('?', $this->platform);
             }
 
@@ -1543,7 +1554,7 @@
             $this->currentPersisterContext->rsm->addEnumResult($columnAlias, $fieldMapping->enumType);
         }
 
-        $type = Type::getType($fieldMapping->type);
+        $type = $this->getType($fieldMapping->type);
         $sql  = $type->convertToPHPValueSQL($sql, $this->platform);
 
         return $sql . ' AS ' . $columnAlias;
@@ -1650,7 +1661,7 @@
             $placeholder = '?';
 
             if (isset($this->class->fieldMappings[$field])) {
-                $type        = Type::getType($this->class->fieldMappings[$field]->type);
+                $type        = $this->getType($this->class->fieldMappings[$field]->type);
                 $placeholder = $type->convertToDatabaseValueSQL($placeholder, $this->platform);
             }
 

src/Persisters/Entity/JoinedSubclassPersister.php

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\DBAL\LockMode;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Internal\SQLResultCasing;
 use Doctrine\ORM\Mapping\AssociationMapping;
@@ -511,7 +510,7 @@ protected function assignDefaultVersionAndUpsertableValues(object $entity, array
         $values = $this->fetchVersionAndNotUpsertableValues($this->getVersionedClassMetadata(), $id);
 
         foreach ($values as $field => $value) {
-            $value = Type::getType($this->class->fieldMappings[$field]->type)->convertToPHPValue($value, $this->platform);
+            $value = $this->getType($this->class->fieldMappings[$field]->type)->convertToPHPValue($value, $this->platform);
 
             $this->class->setFieldValue($entity, $field, $value);
         }

src/Query/Exec/MultiTableDeleteExecutor.php

@@ -6,7 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Internal\TypeProviderLocator;
 use Doctrine\ORM\Query\AST;
 use Doctrine\ORM\Query\AST\DeleteStatement;
 use Doctrine\ORM\Query\SqlWalker;
@@ -86,11 +86,12 @@ public function __construct(AST\Node $AST, SqlWalker $sqlWalker)
 
         // 4. Store DDL for temporary identifier table.
         $columnDefinitions = [];
+        $typeProvider      = TypeProviderLocator::fromConnection($em->getConnection());
         foreach ($idColumnNames as $idColumnName) {
             $columnDefinitions[$idColumnName] = [
                 'name'    => $idColumnName,
                 'notnull' => true,
-                'type'    => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)),
+                'type'    => $typeProvider->get(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)),
             ];
         }
 

src/Query/Exec/MultiTableUpdateExecutor.php

@@ -6,7 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Internal\TypeProviderLocator;
 use Doctrine\ORM\Query\AST;
 use Doctrine\ORM\Query\AST\UpdateStatement;
 use Doctrine\ORM\Query\ParameterTypeInferer;
@@ -125,12 +125,13 @@ public function __construct(AST\Node $AST, SqlWalker $sqlWalker)
 
         // 4. Store DDL for temporary identifier table.
         $columnDefinitions = [];
+        $typeProvider      = TypeProviderLocator::fromConnection($em->getConnection());
 
         foreach ($idColumnNames as $idColumnName) {
             $columnDefinitions[$idColumnName] = [
                 'name'    => $idColumnName,
                 'notnull' => true,
-                'type'    => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)),
+                'type'    => $typeProvider->get(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)),
             ];
         }
 

src/Query/ResultSetMappingBuilder.php

@@ -4,9 +4,9 @@
 
 namespace Doctrine\ORM\Query;
 
-use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Internal\SQLResultCasing;
+use Doctrine\ORM\Internal\TypeProviderLocator;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Utility\PersisterHelper;
 use InvalidArgumentException;
@@ -238,7 +238,8 @@ private function getColumnAliasMap(
      */
     public function generateSelectClause(array $tableAliases = []): string
     {
-        $sql = '';
+        $sql          = '';
+        $typeProvider = TypeProviderLocator::fromConnection($this->em->getConnection());
 
         foreach ($this->columnOwnerMap as $columnName => $dqlAlias) {
             $tableAlias = $tableAliases[$dqlAlias] ?? $dqlAlias;
@@ -253,7 +254,7 @@ public function generateSelectClause(array $tableAliases = []): string
                 $classFieldMapping = $class->fieldMappings[$fieldName];
                 $columnSql         = $tableAlias . '.' . $classFieldMapping->columnName;
 
-                $type      = Type::getType($classFieldMapping->type);
+                $type      = $typeProvider->get($classFieldMapping->type);
                 $columnSql = $type->convertToPHPValueSQL($columnSql, $this->em->getConnection()->getDatabasePlatform());
 
                 $sql .= $columnSql;