Connection, Results: refactorings, passes $formats to Result::__construct()

Author: dg

src/Dibi/Connection.php

@@ -28,6 +28,9 @@ class Connection implements IConnection
 	/** @var array  Current connection configuration */
 	private $config;
 
+	/** @var string[]  resultset formats */
+	private $formats;
+
 	/** @var Driver|null */
 	private $driver;
 
@@ -65,9 +68,14 @@ public function __construct(array $config, string $name = null)
 		Helpers::alias($config, 'result|formatDateTime', 'resultDateTime');
 		$config['driver'] = $config['driver'] ?? 'mysqli';
 		$config['name'] = $name;
-		$config['result']['formatJson'] = $config['result']['formatJson'] ?? 'array';
 		$this->config = $config;
 
+		$this->formats = [
+			Type::DATE => $this->config['result']['formatDate'],
+			Type::DATETIME => $this->config['result']['formatDateTime'],
+			Type::JSON => $this->config['result']['formatJson'] ?? 'array',
+		];
+
 		// profiler
 		if (isset($config['profiler']['file']) && (!isset($config['profiler']['run']) || $config['profiler']['run'])) {
 			$filter = $config['profiler']['filter'] ?? Event::QUERY;
@@ -391,10 +399,7 @@ public function rollback(string $savepoint = null): void
 	 */
 	public function createResultSet(ResultDriver $resultDriver): Result
 	{
-		$res = new Result($resultDriver);
-		return $res->setFormat(Type::DATE, $this->config['result']['formatDate'])
-			->setFormat(Type::DATETIME, $this->config['result']['formatDateTime'])
-			->setFormat(Type::JSON, $this->config['result']['formatJson']);
+		return new Result($resultDriver, $this->formats);
 	}
 
 

src/Dibi/Result.php

@@ -38,12 +38,13 @@ class Result implements IDataSource
 	private $rowFactory;
 
 	/** @var array  format */
-	private $formats = [];
+	private $formats;
 
 
-	public function __construct(ResultDriver $driver)
+	public function __construct(ResultDriver $driver, array $formats = [])
 	{
 		$this->driver = $driver;
+		$this->formats = $formats;
 		$this->detectTypes();
 	}