fixed compatibility with PHP 8

Author: dg

src/Database/DriverException.php

@@ -37,6 +37,7 @@ public static function from(\PDOException $src)
 		} else {
 			$e->errorInfo = $src->errorInfo;
 			$e->code = $src->code;
+			$e->code = $e->errorInfo[0] ?? $src->code;
 		}
 		return $e;
 	}

src/Database/Table/SqlBuilder.php

@@ -235,7 +235,7 @@ public function getParameters(): array
 		}
 		return array_merge(
 			$this->parameters['select'],
-			$this->parameters['joinConditionSorted'] ? call_user_func_array('array_merge', $this->parameters['joinConditionSorted']) : [],
+			$this->parameters['joinConditionSorted'] ? array_merge(...array_values($this->parameters['joinConditionSorted'])) : [],
 			$this->parameters['where'],
 			$this->parameters['group'],
 			$this->parameters['having'],

tests/Database/Connection.exceptions.phpt

@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
 
 $e = Assert::exception(function () {
 	$connection = new Nette\Database\Connection('unknown');
-}, Nette\Database\ConnectionException::class, 'invalid data source name', 0);
+}, Nette\Database\ConnectionException::class, '%a%valid data source %a%', 0);
 
 Assert::same(null, $e->getDriverCode());
 Assert::same(null, $e->getSqlState());

tests/Database/Connection.lazy.phpt

@@ -17,7 +17,7 @@ require __DIR__ . '/../bootstrap.php';
 test('non lazy', function () {
 	Assert::exception(function () {
 		$connection = new Nette\Database\Connection('dsn', 'user', 'password');
-	}, Nette\Database\DriverException::class, 'invalid data source name');
+	}, Nette\Database\DriverException::class, '%a%valid data source %a%');
 });
 
 
@@ -26,15 +26,15 @@ test('lazy', function () {
 	$context = new Nette\Database\Context($connection, new Structure($connection, new DevNullStorage));
 	Assert::exception(function () use ($context) {
 		$context->query('SELECT ?', 10);
-	}, Nette\Database\DriverException::class, 'invalid data source name');
+	}, Nette\Database\DriverException::class, '%a%valid data source %a%');
 });
 
 
 test('', function () {
 	$connection = new Nette\Database\Connection('dsn', 'user', 'password', ['lazy' => true]);
 	Assert::exception(function () use ($connection) {
 		$connection->quote('x');
-	}, Nette\Database\DriverException::class, 'invalid data source name');
+	}, Nette\Database\DriverException::class, '%a%valid data source %a%');
 });