Remove final constructor for Type

UPGRADE.md

@@ -8,6 +8,10 @@ awareness about deprecated code.
 
 # Upgrade to 4.3
 
+## Deprecated Type::addType
+
+Use `Type::getTypeRegistry()->register()` instead.
+
 ## Deprecated `Table::columnsAreIndexed()`
 
 The `Table::columnsAreIndexed()` method has been deprecated.

src/Types/Exception/TypeArgumentCountError.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Types\Exception;
+
+use ArgumentCountError;
+use Exception;
+
+use function sprintf;
+
+/** @psalm-immutable */
+final class TypeArgumentCountError extends Exception implements TypesException
+{
+    public static function new(string $name, ArgumentCountError $previous): self
+    {
+        return new self(sprintf('Type "%s" cannot be registered through Type::addType because it requires arguments. Use Type::getTypeRegistry()->register instead.', $name), previous: $previous);
+    }
+}

src/Types/Type.php

@@ -4,9 +4,11 @@
 
 namespace Doctrine\DBAL\Types;
 
+use ArgumentCountError;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Exception\TypeArgumentCountError;
 
 use function array_map;
 
@@ -51,11 +53,6 @@
 
     private static ?TypeRegistry $typeRegistry = null;
 
-    /** @internal Do not instantiate directly - use {@see Type::addType()} method instead. */
-    final public function __construct()
-    {
-    }
-
     /**
      * Converts a value from its PHP representation to its database representation
      * of this type.
@@ -137,14 +134,20 @@
     /**
      * Adds a custom type to the type map.
      *
      * @param string             $name      The name of the type.
      * @param class-string<Type> $className The class name of the custom type.
      *
      * @throws Exception
+     *
+     * @deprecated Use Type::getTypeRegistry()->register() instead.
      */
     public static function addType(string $name, string $className): void
     {
-        self::getTypeRegistry()->register($name, new $className());
+       try {
+           self::getTypeRegistry()->register($name, new $className());
+       } catch (ArgumentCountError $e) {
+           throw TypeArgumentCountError::new($name, $e);
+       }
     }
 
     /**

tests/Functional/Schema/CustomIntrospectionTest.php

@@ -29,7 +29,7 @@
             self::markTestSkipped('Skip on Oracle');
         }
 
-        Type::addType(MoneyType::NAME, MoneyType::class);
+        Type::getTypeRegistry()->register(MoneyType::NAME, new MoneyType);
     }
 
     public function testCustomColumnIntrospection(): void

tests/Functional/Schema/MySQLSchemaManagerTest.php

@@ -27,7 +27,7 @@
 {
     public static function setUpBeforeClass(): void
     {
-        Type::addType('point', PointType::class);
+        Type::getTypeRegistry()->register('point', new PointType);
     }
 
     protected function supportsPlatform(AbstractPlatform $platform): bool
@@ -591,7 +591,7 @@
 
     public function testSchemaDiffWithCustomColumnTypeWhileDatabaseTypeDiffers(): void
     {
-        Type::addType('custom_type', CustomType::class);
+        Type::getTypeRegistry()->register('custom_type', new CustomType);
 
         $metadataTable = new Table('table_with_custom_type');
         $metadataTable->addColumn('col1', 'custom_type');

tests/Functional/Schema/PostgreSQLSchemaManagerTest.php

@@ -53,7 +53,7 @@
         $table = $this->connection->createSchemaManager()->introspectTable('domain_type_test');
         self::assertInstanceOf(DecimalType::class, $table->getColumn('value')->getType());
 
-        Type::addType('MyMoney', MoneyType::class);
+        Type::getTypeRegistry()->register('MyMoney', new MoneyType);
         $this->connection->getDatabasePlatform()->registerDoctrineTypeMapping('MyMoney', 'MyMoney');
 
         $table = $this->connection->createSchemaManager()->introspectTable('domain_type_test');

tests/Platforms/AbstractPlatformTestCase.php

@@ -117,7 +117,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         if (Type::hasType($type->getName())) {
             Type::overrideType($type->getName(), $type::class);
         } else {
-            Type::addType($type->getName(), $type::class);
+            Type::getTypeRegistry()->register($type->getName(), new $type);
         }
 
         self::assertSame($type->getName(), $this->platform->getDoctrineTypeMapping('TeStTyPe'));

tests/Types/TypeTest.php

@@ -4,6 +4,8 @@
 
 namespace Doctrine\DBAL\Tests\Types;
 
+use Doctrine\DBAL\Tests\Functional\Schema\Types\MoneyType;
+use Doctrine\DBAL\Types\Exception\TypeArgumentCountError;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -39,4 +41,12 @@
             yield [$constantValue];
         }
     }
+
+    public function testAddTypeWhenTypeRequiresArguments(): void
+    {
+        self::expectException(TypeArgumentCountError::class);
+        self::expectExceptionMessage('Type "some_type" cannot be registered through Type::addType because it requires arguments. Use Type::getTypeRegistry()->register instead.');
+
+        Type::addType('some_type',  TypeWithConstructor::class);
+    }
 }

tests/Types/TypeWithConstructor.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Types;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+class TypeWithConstructor extends Type
+{
+    public function __construct(bool $requirement)
+    {
+    }
+
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform) : string
+    {
+        return '';
+    }
+}