DbalExtension: simplify custom types registration

src/DI/DbalExtension.php

@@ -44,11 +44,23 @@ public function getConfigSchema(): Schema
 				'filterSchemaAssetsExpression' => Expect::string()->nullable(),
 				'autoCommit' => Expect::bool(true),
 			]),
-			'connection' => Expect::array()->default([
-				'driver' => 'pdo_sqlite',
-				'types' => [],
-				'typesMapping' => [],
-			]),
+			'connection' => Expect::structure([
+				'driver' => Expect::mixed('pdo_sqlite'),
+				'types' => Expect::arrayOf(
+					Expect::structure([
+						'class' => Expect::string()->required(),
+						'commented' => Expect::bool(false),
+					])
+						->before(function ($type) {
+							if (is_string($type)) {
+								return ['class' => $type];
+							}
+							return $type;
+						})
+						->castTo('array')
+				),
+				'typesMapping' => Expect::array(),
+			])->otherItems()->castTo('array'),
 		]);
 	}
 

tests/cases/Unit/DI/DbalExtensionTest.php

@@ -4,6 +4,9 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\PostgreSQL100Platform;
+use Doctrine\DBAL\Types\IntegerType;
+use Doctrine\DBAL\Types\StringType;
+use Doctrine\DBAL\Types\Type;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
@@ -82,4 +85,34 @@ public function testNoCache(): void
 		new $class();
 	}
 
+	public function testTypes(): void
+	{
+		$loader = new ContainerLoader(TEMP_PATH, true);
+		$class = $loader->load(function (Compiler $compiler): void {
+			$compiler->addExtension('cache', new CacheExtension());
+			$compiler->addExtension('dbal', new DbalExtension());
+			$compiler->addConfig([
+				'parameters' => [
+					'tempDir' => TEMP_PATH,
+				],
+				'dbal' => ['connection' => [
+					'driver' => 'pdo_sqlite',
+					'types' => [
+						'foo' => ['class' => StringType::class],
+						'bar' => IntegerType::class,
+					],
+				]],
+			]);
+		}, 'di3');
+
+		/** @var Container $container */
+		$container = new $class();
+
+		/** @var Connection $connection */
+		$container->getByType(Connection::class);
+
+		$this->assertInstanceOf(StringType::class, Type::getType('foo'));
+		$this->assertInstanceOf(IntegerType::class, Type::getType('bar'));
+	}
+
 }