Connection::__construct() now only accepts connector, use Factory::createFromDsn()

Author: dg

src/Database/Connection.php

@@ -10,6 +10,7 @@
 namespace Nette\Database;
 
 use JetBrains\PhpStorm\Language;
+use Nette;
 use Nette\Utils\Arrays;
 
 
@@ -35,18 +36,20 @@ class Connection
 
 
 	public function __construct(
-		private readonly string $dsn,
-		?string $user = null,
-		#[\SensitiveParameter]
-		?string $password = null,
-		array $options = [],
+		\Closure|string $connector,
 	) {
-		$lazy = $options['lazy'] ?? false;
-		unset($options['newDateTime'], $options['lazy']);
+		if (is_string($connector)) { // compatibility with version 3.x
+			//trigger_error('Passing DSN as string is deprecated, use Nette\Database\Factory::createFromDsn() instead.', E_USER_DEPRECATED);
+			[$dsn, $user, $password, $options] = func_get_args() + [null, null, null, []];
+			$lazy = $options['lazy'] ?? false;
+			unset($options['newDateTime'], $options['lazy']);
+			$this->connector = (new Factory)->createConnectorFromDsn($dsn, $user, $password, $options);
+			if (!$lazy) {
+				$this->connect();
+			}
 
-		$this->connector = (new Factory)->createConnectorFromDsn($dsn, $user, $password, $options);
-		if (!$lazy) {
-			$this->connect();
+		} else {
+			$this->connector = $connector;
 		}
 	}
 
@@ -73,9 +76,11 @@ public function disconnect(): void
 	}
 
 
+	/** @deprecated */
 	public function getDsn(): string
 	{
-		return $this->dsn;
+		return ''; // TODO
+		throw new Nette\DeprecatedException(__METHOD__ . '() is deprecated.');
 	}
 
 

src/Database/Factory.php

@@ -23,28 +23,94 @@ final class Factory
 	];
 
 
-	/** @internal */
-	public function createConnectorFromDsn(
+	public function __construct(
+		private bool $lazy = true,
+	) {
+	}
+
+
+	public function createFromParameters(
+		#[\SensitiveParameter]
+		...$params,
+	): Connection
+	{
+		$params = count($params) === 1 && is_array($params[0] ?? null) ? $params[0] : $params;
+		$factory = $this->createConnectorFromParameters($params);
+		return $this->createFromConnector($factory);
+	}
+
+
+	public function createFromDsn(
 		string $dsn,
 		?string $username = null,
 		#[\SensitiveParameter]
 		?string $password = null,
 		array $options = [],
+	): Connection
+	{
+		$factory = $this->createConnectorFromDsn($dsn, $username, $password, $options);
+		return $this->createFromConnector($factory);
+	}
+
+
+	/**
+	 * @param  \Closure(): Drivers\Connection  $connector
+	 */
+	public function createFromConnector(\Closure $connector): Connection
+	{
+		$connection = new Connection($connector);
+		if (!$this->lazy) {
+			$connection->connect();
+		}
+		return $connection;
+
+	}
+
+
+	/** @internal */
+	public function createConnectorFromParameters(
+		#[\SensitiveParameter]
+		array $params,
 	): \Closure
 	{
 		if ($class = $params['driverClass'] ?? null) {
 			if (!is_subclass_of($class, Drivers\Connection::class)) {
 				throw new \LogicException("Driver class '$class' is not subclass of " . Drivers\Connection::class);
 			}
+			unset($params['driverClass']);
 
-		} else {
-			$driver = explode(':', $dsn)[0];
-			$class = self::Drivers['pdo-' . $driver] ?? null;
+		} elseif ($driver = $params['driver'] ?? null) {
+			$class = self::Drivers[$driver] ?? null;
 			if (!$class) {
-				throw new \LogicException("Unknown PDO driver '$driver'.");
+				throw new \LogicException("Unknown driver '$driver'.");
 			}
+			unset($params['driver']);
+
+		} elseif ($params['dsn'] ?? null) {
+			return $this->createConnectorFromDsn(...$params);
+
+		} else {
+			throw new \LogicException("Missing options 'driver' or 'driverClass'.");
 		}
 
+		return fn() => new $class(...$params);
+	}
+
+
+	/** @internal */
+	public function createConnectorFromDsn(
+		string $dsn,
+		?string $username,
+		#[\SensitiveParameter]
+		?string $password,
+		array $options = [],
+	): \Closure
+	{
+		$driver = explode(':', $dsn)[0];
+		$class = self::Drivers['pdo-' . $driver] ?? null;
+		if (!$class) {
+			throw new \LogicException("Unknown PDO driver '$driver'.");
+		}
 		return fn() => new $class($dsn, $username, $password, $options);
 	}
 }