diff --git a/src/Types/TypeRegistry.php b/src/Types/TypeRegistry.php index b5e800ad1b4..9b64c6faf9a 100644 --- a/src/Types/TypeRegistry.php +++ b/src/Types/TypeRegistry.php @@ -6,8 +6,7 @@ use Doctrine\DBAL\Exception; -use function array_search; -use function in_array; +use function spl_object_id; /** * The type registry is responsible for holding a map of all known DBAL types. @@ -17,11 +16,17 @@ final class TypeRegistry { /** @var array Map of type names and their corresponding flyweight objects. */ private array $instances; + /** @var array */ + private array $instancesReverseIndex; /** @param array $instances */ public function __construct(array $instances = []) { - $this->instances = $instances; + $this->instances = []; + $this->instancesReverseIndex = []; + foreach ($instances as $name => $type) { + $this->register($name, $type); + } } /** @@ -31,11 +36,12 @@ public function __construct(array $instances = []) */ public function get(string $name): Type { - if (! isset($this->instances[$name])) { + $type = $this->instances[$name] ?? null; + if ($type === null) { throw Exception::unknownColumnType($name); } - return $this->instances[$name]; + return $type; } /** @@ -77,7 +83,8 @@ public function register(string $name, Type $type): void throw Exception::typeAlreadyRegistered($type); } - $this->instances[$name] = $type; + $this->instances[$name] = $type; + $this->instancesReverseIndex[spl_object_id($type)] = $name; } /** @@ -87,15 +94,18 @@ public function register(string $name, Type $type): void */ public function override(string $name, Type $type): void { - if (! isset($this->instances[$name])) { + $origType = $this->instances[$name] ?? null; + if ($origType === null) { throw Exception::typeNotFound($name); } - if (! in_array($this->findTypeName($type), [$name, null], true)) { + if (($this->findTypeName($type) ?? $name) !== $name) { throw Exception::typeAlreadyRegistered($type); } - $this->instances[$name] = $type; + unset($this->instancesReverseIndex[spl_object_id($origType)]); + $this->instances[$name] = $type; + $this->instancesReverseIndex[spl_object_id($type)] = $name; } /** @@ -112,12 +122,6 @@ public function getMap(): array private function findTypeName(Type $type): ?string { - $name = array_search($type, $this->instances, true); - - if ($name === false) { - return null; - } - - return $name; + return $this->instancesReverseIndex[spl_object_id($type)] ?? null; } } diff --git a/tests/Types/TypeRegistryTest.php b/tests/Types/TypeRegistryTest.php index 42d57b69a56..36c3d7949a6 100644 --- a/tests/Types/TypeRegistryTest.php +++ b/tests/Types/TypeRegistryTest.php @@ -99,6 +99,14 @@ public function testRegisterWithAlreadyRegisteredInstance(): void $this->registry->register('other', $newType); } + public function testConstructorWithDuplicateInstance(): void + { + $newType = new TextType(); + + $this->expectException(Exception::class); + new TypeRegistry(['a' => $newType, 'b' => $newType]); + } + public function testOverride(): void { $baseType = new TextType();