Released version 4.2.8

.gitattributes

@@ -1,8 +1,8 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .github export-ignore
-.travis.yml export-ignore
+appveyor.yml export-ignore
-ecs.php export-ignore
+ncs.* export-ignore
 phpstan.neon export-ignore
 tests/ export-ignore
 

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.0', '8.1', '8.2']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
 
             fail-fast: false
 

appveyor.yml

@@ -1,34 +1,31 @@
 build: off
 cache:
-    - c:\php -> appveyor.yml
+    - c:\php7 -> appveyor.yml
     - '%LOCALAPPDATA%\Composer\files -> appveyor.yml'
 
 clone_folder: c:\projects\dibi
 
-environment:
-    MYSQL_PWD: Password12!
-
 services:
     - mssql2012sp1
 #    - mssql2014
     - mysql
 
 init:
-    - SET PATH=c:\php;c:\Program Files\MySQL\MySQL Server 5.7\bin;%PATH%
+    - SET PATH=c:\php7;%PATH%
     - SET ANSICON=121x90 (121x90)
 
 install:
-    # Install PHP 8.0
+    # Install PHP 7.2
-    - IF EXIST c:\php (SET PHP=0) ELSE (SET PHP=1)
+    - IF EXIST c:\php7 (SET PHP=0) ELSE (SET PHP=1)
-    - IF %PHP%==1 mkdir c:\php
+    - IF %PHP%==1 mkdir c:\php7
-    - IF %PHP%==1 cd c:\php
+    - IF %PHP%==1 cd c:\php7
-    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-8.0.1-Win32-vs16-x64.zip --output php.zip
+    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.2.18-Win32-VC15-x64.zip --output php.zip
     - IF %PHP%==1 7z x php.zip >nul
     - IF %PHP%==1 echo extension_dir=ext >> php.ini
     - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
-    - IF %PHP%==1 curl https://github.com/microsoft/msphpsql/releases/download/v5.9.0/Windows-8.0.zip -L --output sqlsrv.zip
+    - IF %PHP%==1 curl https://github.com/microsoft/msphpsql/releases/download/v5.8.0/Windows-7.2.zip -L --output sqlsrv.zip
     - IF %PHP%==1 7z x sqlsrv.zip >nul
-    - IF %PHP%==1 copy Windows-8.0\x64\php_sqlsrv_80_ts.dll ext\php_sqlsrv_ts.dll
+    - IF %PHP%==1 copy Windows-7.2\x64\php_sqlsrv_72_ts.dll ext\php_sqlsrv_ts.dll
     - IF %PHP%==1 del /Q *.zip
 
     # Install Microsoft Access Database Engine x64
@@ -43,12 +40,8 @@ install:
     # Create databases.ini
     - copy tests\databases.appveyor.ini tests\databases.ini
 
-before_test:
-    # Create MySQL database
-    - mysql --user=root -e "CREATE DATABASE dibi_test"
-
 test_script:
-    - vendor\bin\tester tests -s -p c:\php\php -c tests\php-win.ini
+    - vendor\bin\tester tests -s -p c:\php7\php -c tests\php-win.ini
 
 on_failure:
     # Print *.actual content

composer.json

@@ -11,11 +11,11 @@
 		}
 	],
 	"require": {
-		"php": ">=8.0 <8.3"
+		"php": ">=7.2"
 	},
 	"require-dev": {
-		"tracy/tracy": "^2.8",
+		"tracy/tracy": "~2.2",
-		"nette/tester": "^2.4",
+		"nette/tester": "~2.0",
 		"nette/di": "^3.0",
 		"phpstan/phpstan": "^0.12"
 	},
@@ -31,7 +31,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "5.0-dev"
+			"dev-master": "4.2-dev"
 		}
 	}
 }

examples/query-language-and-conditions.php

@@ -31,7 +31,7 @@ $name = $cond1 ? 'K%' : null;
 $dibi->test('
 	SELECT *
 	FROM customers
-	%if', isset($name), 'WHERE name LIKE ?', $name, '%end',
+	%if', isset($name), 'WHERE name LIKE ?', $name, '%end'
 );
 // -> SELECT * FROM customers WHERE name LIKE 'K%'
 
@@ -54,7 +54,7 @@ $dibi->test('
 	WHERE
 		%if', isset($name), 'name LIKE ?', $name, '
 			%if', $cond2, 'AND admin=1 %end
-		%else 1 LIMIT 10 %end',
+		%else 1 LIMIT 10 %end'
 );
 // -> SELECT * FROM customers WHERE LIMIT 10
 

examples/query-language-basic-examples.php

@@ -28,7 +28,7 @@ $dibi->test('
 	SELECT COUNT(*) as [count]
 	FROM [comments]
 	WHERE [ip] LIKE ?', $ipMask, '
-	AND [date] > ', new Dibi\DateTime($timestamp),
+	AND [date] > ', new Dibi\DateTime($timestamp)
 );
 // -> SELECT COUNT(*) as [count] FROM [comments] WHERE [ip] LIKE '192.168.%' AND [date] > 876693600
 
@@ -69,7 +69,7 @@ $array = [1, 2, 3];
 $dibi->test('
 	SELECT *
 	FROM people
-	WHERE id IN (?)', $array,
+	WHERE id IN (?)', $array
 );
 // -> SELECT * FROM people WHERE id IN ( 1, 2, 3 )
 

examples/using-datetime.php

@@ -29,6 +29,6 @@ $dibi->test('
 		'id' => 123,
 		'date' => new DateTime('12.3.2007'),
 		'stamp' => new DateTime('23.1.2007 10:23'),
-	],
+	]
 );
 // -> INSERT INTO [mytable] ([id], [date], [stamp]) VALUES (123, '2007-03-12', '2007-01-23 10-23-00')

examples/using-substitutions.php

@@ -54,6 +54,6 @@ define('SUBST_ACTIVE', 7);
 $dibi->test("
 	UPDATE :account:user
 	SET name='John Doe', status=:active:
-	WHERE id=", 7,
+	WHERE id=", 7
 );
 // -> UPDATE eshop_user SET name='John Doe', status=7 WHERE id= 7

readme.md

@@ -34,7 +34,7 @@ Install Dibi via Composer:
 composer require dibi/dibi
 ```
 
-The Dibi 5.0 requires PHP version 8.0 and supports PHP up to 8.2.
+The Dibi 4.2 requires PHP version 7.2 and supports PHP up to 8.3.
 
 
 Usage
@@ -341,7 +341,7 @@ $database->query('INSERT INTO users', [
 There are three methods for dealing with transactions:
 
 ```php
-$database->beginTransaction();
+$database->begin();
 
 $database->commit();
 

src/Dibi/Bridges/Nette/DibiExtension22.php

@@ -19,9 +19,11 @@ use Tracy;
  */
 class DibiExtension22 extends Nette\DI\CompilerExtension
 {
-	private ?bool $debugMode;
+	/** @var bool|null */
+	private $debugMode;
 
-	private ?bool $cliMode;
+	/** @var bool|null */
+	private $cliMode;
 
 
 	public function __construct(?bool $debugMode = null, ?bool $cliMode = null)
@@ -64,7 +66,7 @@ class DibiExtension22 extends Nette\DI\CompilerExtension
 		if (class_exists(Tracy\Debugger::class)) {
 			$connection->addSetup(
 				[new Nette\DI\Statement('Tracy\Debugger::getBlueScreen'), 'addPanel'],
-				[[Dibi\Bridges\Tracy\Panel::class, 'renderException']],
+				[[Dibi\Bridges\Tracy\Panel::class, 'renderException']]
 			);
 		}
 

src/Dibi/Bridges/Tracy/Panel.php

@@ -22,17 +22,20 @@ class Panel implements Tracy\IBarPanel
 {
 	use Dibi\Strict;
 
-	/** maximum SQL length */
+	/** @var int maximum SQL length */
-	public static int $maxLength = 1000;
+	public static $maxLength = 1000;
 
-	public bool|string $explain;
+	/** @var bool|string  explain queries? */
+	public $explain;
 
-	public int $filter;
+	/** @var int */
+	public $filter;
 
-	private array $events = [];
+	/** @var array */
+	private $events = [];
 
 
-	public function __construct(bool $explain = true, ?int $filter = null)
+	public function __construct($explain = true, ?int $filter = null)
 	{
 		$this->filter = $filter ?: Event::QUERY;
 		$this->explain = $explain;
@@ -171,7 +174,7 @@ class Panel implements Tracy\IBarPanel
 	private function getConnectionName(Dibi\Connection $connection): string
 	{
 		$driver = $connection->getConfig('driver');
-		return (is_object($driver) ? $driver::class : $driver)
+		return (is_object($driver) ? get_class($driver) : $driver)
 			. ($connection->getConfig('name') ? '/' . $connection->getConfig('name') : '')
 			. ($connection->getConfig('host') ? "\u{202f}@\u{202f}" . $connection->getConfig('host') : '');
 	}

src/Dibi/Connection.php

@@ -22,25 +22,25 @@ class Connection implements IConnection
 {
 	use Strict;
 
-	/** function (Event $event); Occurs after query is executed */
+	/** @var array of function (Event $event); Occurs after query is executed */
-	public ?array $onEvent = [];
+	public $onEvent = [];
 
-	/** Current connection configuration */
+	/** @var array  Current connection configuration */
-	private array $config;
+	private $config;
 
 	/** @var string[]  resultset formats */
-	private array $formats;
+	private $formats;
 
-	private ?Driver $driver = null;
+	/** @var Driver|null */
+	private $driver;
 
-	private ?Translator $translator = null;
+	/** @var Translator|null */
+	private $translator;
 
-	/** @var array<string, callable(object): Expression> */
+	/** @var HashMap Substitutes for identifiers */
-	private array $translators = [];
+	private $substitutes;
 
-	private HashMap $substitutes;
+	private $transactionDepth = 0;
-
-	private int $transactionDepth = 0;
 
 
 	/**
@@ -75,7 +75,7 @@ class Connection implements IConnection
 		Helpers::alias($config, 'host', 'hostname');
 		Helpers::alias($config, 'result|formatDate', 'resultDate');
 		Helpers::alias($config, 'result|formatDateTime', 'resultDateTime');
-		$config['driver'] ??= 'mysqli';
+		$config['driver'] = $config['driver'] ?? 'mysqli';
 		$config['name'] = $name;
 		$this->config = $config;
 
@@ -93,7 +93,7 @@ class Connection implements IConnection
 			$this->onEvent[] = [new Loggers\FileLogger($config['profiler']['file'], $filter, $errorsOnly), 'logEvent'];
 		}
 
-		$this->substitutes = new HashMap(fn(string $expr) => ":$expr:");
+		$this->substitutes = new HashMap(function (string $expr) { return ":$expr:"; });
 		if (!empty($config['substitutes'])) {
 			foreach ($config['substitutes'] as $key => $value) {
 				$this->substitutes->$key = $value;
@@ -190,8 +190,9 @@ class Connection implements IConnection
 	/**
 	 * Returns configuration variable. If no $key is passed, returns the entire array.
 	 * @see self::__construct
+	 * @return mixed
 	 */
-	final public function getConfig(?string $key = null, $default = null): mixed
+	final public function getConfig(?string $key = null, $default = null)
 	{
 		return $key === null
 			? $this->config
@@ -214,9 +215,10 @@ class Connection implements IConnection
 
 	/**
 	 * Generates (translates) and executes SQL query.
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function query(mixed ...$args): Result
+	final public function query(...$args): Result
 	{
 		return $this->nativeQuery($this->translate(...$args));
 	}
@@ -224,9 +226,10 @@ class Connection implements IConnection
 
 	/**
 	 * Generates SQL query.
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function translate(mixed ...$args): string
+	final public function translate(...$args): string
 	{
 		if (!$this->driver) {
 			$this->connect();
@@ -238,8 +241,9 @@ class Connection implements IConnection
 
 	/**
 	 * Generates and prints SQL query.
+	 * @param  mixed  ...$args
 	 */
-	final public function test(mixed ...$args): bool
+	final public function test(...$args): bool
 	{
 		try {
 			Helpers::dump($this->translate(...$args));
@@ -249,7 +253,7 @@ class Connection implements IConnection
 			if ($e->getSql()) {
 				Helpers::dump($e->getSql());
 			} else {
-				echo $e::class . ': ' . $e->getMessage() . (PHP_SAPI === 'cli' ? "\n" : '<br>');
+				echo get_class($e) . ': ' . $e->getMessage() . (PHP_SAPI === 'cli' ? "\n" : '<br>');
 			}
 
 			return false;
@@ -259,9 +263,10 @@ class Connection implements IConnection
 
 	/**
 	 * Generates (translates) and returns SQL query as DataSource.
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function dataSource(mixed ...$args): DataSource
+	final public function dataSource(...$args): DataSource
 	{
 		return new DataSource($this->translate(...$args), $this);
 	}
@@ -424,7 +429,10 @@ class Connection implements IConnection
 	}
 
 
-	public function transaction(callable $callback): mixed
+	/**
+	 * @return mixed
+	 */
+	public function transaction(callable $callback)
 	{
 		if ($this->transactionDepth === 0) {
 			$this->begin();
@@ -519,28 +527,9 @@ class Connection implements IConnection
 	 */
 	public function substitute(string $value): string
 	{
-		return str_contains($value, ':')
+		return strpos($value, ':') === false
-			? preg_replace_callback('#:([^:\s]*):#', fn(array $m) => $this->substitutes->{$m[1]}, $value)
+			? $value
-			: $value;
+			: preg_replace_callback('#:([^:\s]*):#', function (array $m) { return $this->substitutes->{$m[1]}; }, $value);
-	}
-
-
-	/********************* value objects translation ****************d*g**/
-
-
-	/** @param  callable(object): Expression  $translator */
-	public function addObjectTranslator(string $class, callable $translator): self
-	{
-		$this->translators[$class] = $translator;
-		uksort($this->translators, fn($a, $b) => class_exists($a, false) && is_subclass_of($a, $b) ? -1 : 1);
-		return $this;
-	}
-
-
-	/** @return array<string, callable(object): Expression> */
-	public function getObjectTranslators(): array
-	{
-		return $this->translators;
 	}
 
 
@@ -549,9 +538,10 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch result - shortcut for query() & fetch().
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	public function fetch(mixed ...$args): ?Row
+	public function fetch(...$args): ?Row
 	{
 		return $this->query($args)->fetch();
 	}
@@ -559,10 +549,11 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch results - shortcut for query() & fetchAll().
+	 * @param  mixed  ...$args
 	 * @return Row[]|array[]
 	 * @throws Exception
 	 */
-	public function fetchAll(mixed ...$args): array
+	public function fetchAll(...$args): array
 	{
 		return $this->query($args)->fetchAll();
 	}
@@ -570,9 +561,11 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch first column - shortcut for query() & fetchSingle().
+	 * @param  mixed  ...$args
+	 * @return mixed
 	 * @throws Exception
 	 */
-	public function fetchSingle(mixed ...$args): mixed
+	public function fetchSingle(...$args)
 	{
 		return $this->query($args)->fetchSingle();
 	}
@@ -580,9 +573,10 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch pairs - shortcut for query() & fetchPairs().
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	public function fetchPairs(mixed ...$args): array
+	public function fetchPairs(...$args): array
 	{
 		return $this->query($args)->fetchPairs();
 	}

src/Dibi/DataSource.php

@@ -17,25 +17,35 @@ class DataSource implements IDataSource
 {
 	use Strict;
 
-	private Connection $connection;
+	/** @var Connection */
+	private $connection;
 
-	private string $sql;
+	/** @var string */
+	private $sql;
 
-	private ?Result $result = null;
+	/** @var Result|null */
+	private $result;
 
-	private ?int $count = null;
+	/** @var int|null */
+	private $count;
 
-	private ?int $totalCount = null;
+	/** @var int|null */
+	private $totalCount;
 
-	private array $cols = [];
+	/** @var array */
+	private $cols = [];
 
-	private array $sorting = [];
+	/** @var array */
+	private $sorting = [];
 
-	private array $conds = [];
+	/** @var array */
+	private $conds = [];
 
-	private ?int $offset = null;
+	/** @var int|null */
+	private $offset;
 
-	private ?int $limit = null;
+	/** @var int|null */
+	private $limit;
 
 
 	/**
@@ -55,7 +65,7 @@ class DataSource implements IDataSource
 	 * @param  string|array  $col  column name or array of column names
 	 * @param  string  $as        column alias
 	 */
-	public function select(string|array $col, ?string $as = null): static
+	public function select($col, ?string $as = null): self
 	{
 		if (is_array($col)) {
 			$this->cols = $col;
@@ -71,7 +81,7 @@ class DataSource implements IDataSource
 	/**
 	 * Adds conditions to query.
 	 */
-	public function where($cond): static
+	public function where($cond): self
 	{
 		$this->conds[] = is_array($cond)
 			? $cond // TODO: not consistent with select and orderBy
@@ -85,7 +95,7 @@ class DataSource implements IDataSource
 	 * Selects columns to order by.
 	 * @param  string|array  $row  column name or array of column names
 	 */
-	public function orderBy(string|array $row, string $direction = 'ASC'): static
+	public function orderBy($row, string $direction = 'ASC'): self
 	{
 		if (is_array($row)) {
 			$this->sorting = $row;
@@ -101,7 +111,7 @@ class DataSource implements IDataSource
 	/**
 	 * Limits number of rows.
 	 */
-	public function applyLimit(int $limit, ?int $offset = null): static
+	public function applyLimit(int $limit, ?int $offset = null): self
 	{
 		$this->limit = $limit;
 		$this->offset = $offset;
@@ -151,7 +161,7 @@ class DataSource implements IDataSource
 	 * Like fetch(), but returns only first field.
 	 * @return mixed  value on success, null if no next record
 	 */
-	public function fetchSingle(): mixed
+	public function fetchSingle()
 	{
 		return $this->getResult()->fetchSingle();
 	}
@@ -219,19 +229,24 @@ class DataSource implements IDataSource
 	 */
 	public function __toString(): string
 	{
-		return $this->connection->translate(
+		try {
-			"\nSELECT %n",
+			return $this->connection->translate(
-			(empty($this->cols) ? '*' : $this->cols),
+				"\nSELECT %n",
-			"\nFROM %SQL",
+				(empty($this->cols) ? '*' : $this->cols),
-			$this->sql,
+				"\nFROM %SQL",
-			"\n%ex",
+				$this->sql,
-			$this->conds ? ['WHERE %and', $this->conds] : null,
+				"\n%ex",
-			"\n%ex",
+				$this->conds ? ['WHERE %and', $this->conds] : null,
-			$this->sorting ? ['ORDER BY %by', $this->sorting] : null,
+				"\n%ex",
-			"\n%ofs %lmt",
+				$this->sorting ? ['ORDER BY %by', $this->sorting] : null,
-			$this->offset,
+				"\n%ofs %lmt",
-			$this->limit,
+				$this->offset,
-		);
+				$this->limit
+			);
+		} catch (\Throwable $e) {
+			trigger_error($e->getMessage(), E_USER_ERROR);
+			return '';
+		}
 	}
 
 
@@ -246,7 +261,7 @@ class DataSource implements IDataSource
 		if ($this->count === null) {
 			$this->count = $this->conds || $this->offset || $this->limit
 				? Helpers::intVal($this->connection->nativeQuery(
-					'SELECT COUNT(*) FROM (' . $this->__toString() . ') t',
+					'SELECT COUNT(*) FROM (' . $this->__toString() . ') t'
 				)->fetchSingle())
 				: $this->getTotalCount();
 		}
@@ -262,7 +277,7 @@ class DataSource implements IDataSource
 	{
 		if ($this->totalCount === null) {
 			$this->totalCount = Helpers::intVal($this->connection->nativeQuery(
-				'SELECT COUNT(*) FROM ' . $this->sql,
+				'SELECT COUNT(*) FROM ' . $this->sql
 			)->fetchSingle());
 		}
 

src/Dibi/DateTime.php

@@ -17,7 +17,10 @@ class DateTime extends \DateTimeImmutable
 {
 	use Strict;
 
-	public function __construct(string|int $time = 'now', ?\DateTimeZone $timezone = null)
+	/**
+	 * @param  string|int  $time
+	 */
+	public function __construct($time = 'now', ?\DateTimeZone $timezone = null)
 	{
 		$timezone = $timezone ?: new \DateTimeZone(date_default_timezone_get());
 		if (is_numeric($time)) {

src/Dibi/Drivers/DummyDriver.php

@@ -57,7 +57,7 @@ class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	}
 
 
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return null;
 	}
@@ -171,9 +171,8 @@ class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	}
 
 
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
-		return null;
 	}
 
 

src/Dibi/Drivers/FirebirdDriver.php

@@ -33,10 +33,11 @@ class FirebirdDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	/** @var ?resource */
+	/** @var resource|null */
 	private $transaction;
 
-	private bool $inTransaction = false;
+	/** @var bool */
+	private $inTransaction = false;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -190,7 +191,7 @@ class FirebirdDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}

src/Dibi/Drivers/FirebirdReflector.php

@@ -19,7 +19,8 @@ class FirebirdReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	private Dibi\Driver $driver;
+	/** @var Dibi\Driver */
+	private $driver;
 
 
 	public function __construct(Dibi\Driver $driver)
@@ -241,7 +242,7 @@ class FirebirdReflector implements Dibi\Reflector
 				END AS TRIGGER_ENABLED
 			FROM RDB\$TRIGGERS
 			WHERE RDB\$SYSTEM_FLAG = 0"
-			. ($table === null ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table');"),
+			. ($table === null ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table');")
 		);
 		$triggers = [];
 		while ($row = $res->fetch(true)) {

src/Dibi/Drivers/FirebirdResult.php

@@ -23,8 +23,6 @@ class FirebirdResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	private bool $autoFree = true;
-
 
 	/**
 	 * @param  resource  $resultSet
@@ -35,17 +33,6 @@ class FirebirdResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 */
@@ -102,9 +89,8 @@ class FirebirdResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
-		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 

src/Dibi/Drivers/MySqlReflector.php

@@ -20,7 +20,8 @@ class MySqlReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	private Dibi\Driver $driver;
+	/** @var Dibi\Driver */
+	private $driver;
 
 
 	public function __construct(Dibi\Driver $driver)

src/Dibi/Drivers/MySqliDriver.php

@@ -40,10 +40,11 @@ class MySqliDriver implements Dibi\Driver
 
 	public const ERROR_DATA_TRUNCATED = 1265;
 
-	private \mysqli $connection;
+	/** @var \mysqli */
+	private $connection;
 
-	/** Is buffered (seekable and countable)? */
+	/** @var bool  Is buffered (seekable and countable)? */
-	private bool $buffered = false;
+	private $buffered;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -95,7 +96,7 @@ class MySqliDriver implements Dibi\Driver
 				$config['database'] ?? '',
 				$config['port'] ?? 0,
 				$config['socket'],
-				$config['flags'] ?? 0,
+				$config['flags'] ?? 0
 			);
 
 			if ($this->connection->connect_errno) {
@@ -158,7 +159,10 @@ class MySqliDriver implements Dibi\Driver
 	}
 
 
-	public static function createException(string $message, int|string $code, string $sql): Dibi\DriverException
+	/**
+	 * @param int|string $code
+	 */
+	public static function createException(string $message, $code, string $sql): Dibi\DriverException
 	{
 		if (in_array($code, [1216, 1217, 1451, 1452, 1701], true)) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);

src/Dibi/Drivers/MySqliResult.php

@@ -19,12 +19,11 @@ class MySqliResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	private \mysqli_result $resultSet;
+	/** @var \mysqli_result */
+	private $resultSet;
 
-	private bool $autoFree = true;
+	/** @var bool  Is buffered (seekable and countable)? */
-
+	private $buffered;
-	/** Is buffered (seekable and countable)? */
-	private bool $buffered;
 
 
 	public function __construct(\mysqli_result $resultSet, bool $buffered)
@@ -34,17 +33,6 @@ class MySqliResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			@$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 */
@@ -134,7 +122,6 @@ class MySqliResult implements Dibi\ResultDriver
 	 */
 	public function getResultResource(): \mysqli_result
 	{
-		$this->autoFree = false;
 		return $this->resultSet;
 	}
 

src/Dibi/Drivers/NoDataResult.php

@@ -19,7 +19,8 @@ class NoDataResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	private int $rows;
+	/** @var int */
+	private $rows;
 
 
 	public function __construct(int $rows)
@@ -60,7 +61,7 @@ class NoDataResult implements Dibi\ResultDriver
 	}
 
 
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
 		return null;
 	}

src/Dibi/Drivers/OdbcDriver.php

@@ -30,9 +30,11 @@ class OdbcDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	private ?int $affectedRows;
+	/** @var int|null  Affected rows */
+	private $affectedRows;
 
-	private bool $microseconds = true;
+	/** @var bool */
+	private $microseconds = true;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -123,7 +125,7 @@ class OdbcDriver implements Dibi\Driver
 	 */
 	public function begin(?string $savepoint = null): void
 	{
-		if (!odbc_autocommit($this->connection, false)) {
+		if (!odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 0 : false)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
 	}
@@ -139,7 +141,7 @@ class OdbcDriver implements Dibi\Driver
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
 
-		odbc_autocommit($this->connection, true);
+		odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 1 : true);
 	}
 
 
@@ -153,7 +155,7 @@ class OdbcDriver implements Dibi\Driver
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
 
-		odbc_autocommit($this->connection, true);
+		odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 1 : true);
 	}
 
 
@@ -170,7 +172,7 @@ class OdbcDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}

src/Dibi/Drivers/OdbcReflector.php

@@ -19,7 +19,8 @@ class OdbcReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	private Dibi\Driver $driver;
+	/** @var Dibi\Driver */
+	private $driver;
 
 
 	public function __construct(Dibi\Driver $driver)

src/Dibi/Drivers/OdbcResult.php

@@ -22,9 +22,8 @@ class OdbcResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	private bool $autoFree = true;
+	/** @var int  Cursor */
-
+	private $row = 0;
-	private int $row = 0;
 
 
 	/**
@@ -36,17 +35,6 @@ class OdbcResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 */
@@ -125,9 +113,8 @@ class OdbcResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
-		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 

src/Dibi/Drivers/OracleDriver.php

@@ -32,12 +32,14 @@ class OracleDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	private bool $autocommit = true;
+	/** @var bool */
+	private $autocommit = true;
 
-	/** use native datetime format */
+	/** @var bool  use native datetime format */
-	private bool $nativeDate;
+	private $nativeDate;
 
-	private ?int $affectedRows;
+	/** @var int|null Number of affected rows */
+	private $affectedRows;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -186,7 +188,7 @@ class OracleDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}

src/Dibi/Drivers/OracleReflector.php

@@ -19,7 +19,8 @@ class OracleReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	private Dibi\Driver $driver;
+	/** @var Dibi\Driver */
+	private $driver;
 
 
 	public function __construct(Dibi\Driver $driver)

src/Dibi/Drivers/OracleResult.php

@@ -22,8 +22,6 @@ class OracleResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	private bool $autoFree = true;
-
 
 	/**
 	 * @param  resource  $resultSet
@@ -34,17 +32,6 @@ class OracleResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 */
@@ -108,9 +95,8 @@ class OracleResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
-		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 

src/Dibi/Drivers/PdoDriver.php

@@ -29,13 +29,17 @@ class PdoDriver implements Dibi\Driver
 {
 	use Dibi\Strict;
 
-	private ?PDO $connection;
+	/** @var PDO|null  Connection resource */
+	private $connection;
 
-	private ?int $affectedRows;
+	/** @var int|null  Affected rows */
+	private $affectedRows;
 
-	private string $driverName;
+	/** @var string */
+	private $driverName;
 
-	private string $serverVersion = '';
+	/** @var string */
+	private $serverVersion = '';
 
 
 	/** @throws Dibi\NotSupportedException */

src/Dibi/Drivers/PdoResult.php

@@ -21,9 +21,11 @@ class PdoResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	private ?\PDOStatement $resultSet;
+	/** @var \PDOStatement|null */
+	private $resultSet;
 
-	private string $driverName;
+	/** @var string */
+	private $driverName;
 
 
 	public function __construct(\PDOStatement $resultSet, string $driverName)

src/Dibi/Drivers/PostgreDriver.php

@@ -33,7 +33,8 @@ class PostgreDriver implements Dibi\Driver
 	/** @var resource|PgSql\Connection */
 	private $connection;
 
-	private ?int $affectedRows;
+	/** @var int|null  Affected rows */
+	private $affectedRows;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -139,7 +140,7 @@ class PostgreDriver implements Dibi\Driver
 			$message = substr($message, strlen($m[0]));
 		}
 
-		if ($code === '0A000' && str_contains($message, 'truncate')) {
+		if ($code === '0A000' && strpos($message, 'truncate') !== false) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
 		} elseif ($code === '23502') {
@@ -227,7 +228,7 @@ class PostgreDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) || $this->connection instanceof PgSql\Connection
 			? $this->connection

src/Dibi/Drivers/PostgreReflector.php

@@ -19,9 +19,11 @@ class PostgreReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	private Dibi\Driver $driver;
+	/** @var Dibi\Driver */
+	private $driver;
 
-	private string $version;
+	/** @var string */
+	private $version;
 
 
 	public function __construct(Dibi\Driver $driver, string $version)
@@ -126,7 +128,7 @@ class PostgreReflector implements Dibi\Reflector
 				'size' => $size > 0 ? $size : null,
 				'nullable' => $row['is_nullable'] === 'YES' || $row['is_nullable'] === 't' || $row['is_nullable'] === true,
 				'default' => $row['column_default'],
-				'autoincrement' => (int) $row['ordinal_position'] === $primary && str_starts_with($row['column_default'] ?? '', 'nextval'),
+				'autoincrement' => (int) $row['ordinal_position'] === $primary && substr($row['column_default'] ?? '', 0, 7) === 'nextval',
 				'vendor' => $row,
 			];
 		}

src/Dibi/Drivers/PostgreResult.php

@@ -24,8 +24,6 @@ class PostgreResult implements Dibi\ResultDriver
 	/** @var resource|PgSql\Result */
 	private $resultSet;
 
-	private bool $autoFree = true;
-
 
 	/**
 	 * @param  resource|PgSql\Result  $resultSet
@@ -36,17 +34,6 @@ class PostgreResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 */
@@ -111,9 +98,8 @@ class PostgreResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|PgSql\Result|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
-		$this->autoFree = false;
 		return is_resource($this->resultSet) || $this->resultSet instanceof PgSql\Result
 			? $this->resultSet
 			: null;

src/Dibi/Drivers/SqliteDriver.php

@@ -27,11 +27,14 @@ class SqliteDriver implements Dibi\Driver
 {
 	use Dibi\Strict;
 
-	private SQLite3 $connection;
+	/** @var SQLite3 */
+	private $connection;
 
-	private string $fmtDate;
+	/** @var string  Date format */
+	private $fmtDate;
 
-	private string $fmtDateTime;
+	/** @var string  Datetime format */
+	private $fmtDateTime;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -99,19 +102,19 @@ class SqliteDriver implements Dibi\Driver
 		if ($code !== 19) {
 			return new Dibi\DriverException($message, $code, $sql);
 
-		} elseif (str_contains($message, 'must be unique')
+		} elseif (strpos($message, 'must be unique') !== false
-			|| str_contains($message, 'is not unique')
+			|| strpos($message, 'is not unique') !== false
-			|| str_contains($message, 'UNIQUE constraint failed')
+			|| strpos($message, 'UNIQUE constraint failed') !== false
 		) {
 			return new Dibi\UniqueConstraintViolationException($message, $code, $sql);
 
-		} elseif (str_contains($message, 'may not be null')
+		} elseif (strpos($message, 'may not be null') !== false
-			|| str_contains($message, 'NOT NULL constraint failed')
+			|| strpos($message, 'NOT NULL constraint failed') !== false
 		) {
 			return new Dibi\NotNullConstraintViolationException($message, $code, $sql);
 
-		} elseif (str_contains($message, 'foreign key constraint failed')
+		} elseif (strpos($message, 'foreign key constraint failed') !== false
-			|| str_contains($message, 'FOREIGN KEY constraint failed')
+			|| strpos($message, 'FOREIGN KEY constraint failed') !== false
 		) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
@@ -288,7 +291,7 @@ class SqliteDriver implements Dibi\Driver
 		string $name,
 		callable $rowCallback,
 		callable $agrCallback,
-		int $numArgs = -1,
+		int $numArgs = -1
 	): void
 	{
 		$this->connection->createAggregate($name, $rowCallback, $agrCallback, $numArgs);

src/Dibi/Drivers/SqliteReflector.php

@@ -19,7 +19,8 @@ class SqliteReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	private Dibi\Driver $driver;
+	/** @var Dibi\Driver */
+	private $driver;
 
 
 	public function __construct(Dibi\Driver $driver)

src/Dibi/Drivers/SqliteResult.php

@@ -20,9 +20,8 @@ class SqliteResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	private \SQLite3Result $resultSet;
+	/** @var \SQLite3Result */
-
+	private $resultSet;
-	private bool $autoFree = true;
 
 
 	public function __construct(\SQLite3Result $resultSet)
@@ -31,17 +30,6 @@ class SqliteResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			@$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @throws Dibi\NotSupportedException
@@ -88,7 +76,7 @@ class SqliteResult implements Dibi\ResultDriver
 	{
 		$count = $this->resultSet->numColumns();
 		$columns = [];
-		$types = [SQLITE3_INTEGER => 'int', SQLITE3_FLOAT => 'float', SQLITE3_TEXT => 'text', SQLITE3_BLOB => 'blob', SQLITE3_NULL => 'null'];
+		static $types = [SQLITE3_INTEGER => 'int', SQLITE3_FLOAT => 'float', SQLITE3_TEXT => 'text', SQLITE3_BLOB => 'blob', SQLITE3_NULL => 'null'];
 		for ($i = 0; $i < $count; $i++) {
 			$columns[] = [
 				'name' => $this->resultSet->columnName($i),
@@ -107,7 +95,6 @@ class SqliteResult implements Dibi\ResultDriver
 	 */
 	public function getResultResource(): \SQLite3Result
 	{
-		$this->autoFree = false;
 		return $this->resultSet;
 	}
 

src/Dibi/Drivers/SqlsrvDriver.php

@@ -32,9 +32,11 @@ class SqlsrvDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	private ?int $affectedRows;
+	/** @var int|null  Affected rows */
+	private $affectedRows;
 
-	private string $version = '';
+	/** @var string */
+	private $version = '';
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -58,7 +60,7 @@ class SqlsrvDriver implements Dibi\Driver
 			$options = $config['options'];
 
 			// Default values
-			$options['CharacterSet'] ??= 'UTF-8';
+			$options['CharacterSet'] = $options['CharacterSet'] ?? 'UTF-8';
 			$options['PWD'] = (string) $options['PWD'];
 			$options['UID'] = (string) $options['UID'];
 			$options['Database'] = (string) $options['Database'];
@@ -168,7 +170,7 @@ class SqlsrvDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}

src/Dibi/Drivers/SqlsrvReflector.php

@@ -19,7 +19,8 @@ class SqlsrvReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	private Dibi\Driver $driver;
+	/** @var Dibi\Driver */
+	private $driver;
 
 
 	public function __construct(Dibi\Driver $driver)

src/Dibi/Drivers/SqlsrvResult.php

@@ -22,8 +22,6 @@ class SqlsrvResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	private bool $autoFree = true;
-
 
 	/**
 	 * @param  resource  $resultSet
@@ -34,17 +32,6 @@ class SqlsrvResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 */
@@ -104,9 +91,8 @@ class SqlsrvResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
-		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 

src/Dibi/Event.php

@@ -31,19 +31,26 @@ class Event
 		TRANSACTION = 448, // BEGIN | COMMIT | ROLLBACK
 		ALL = 1023;
 
-	public Connection $connection;
+	/** @var Connection */
+	public $connection;
 
-	public int $type;
+	/** @var int */
+	public $type;
 
-	public string $sql;
+	/** @var string */
+	public $sql;
 
-	public Result|DriverException|null $result;
+	/** @var Result|DriverException|null */
+	public $result;
 
-	public float $time;
+	/** @var float */
+	public $time;
 
-	public ?int $count = null;
+	/** @var int|null */
+	public $count;
 
-	public ?array $source = null;
+	/** @var array|null */
+	public $source;
 
 
 	public function __construct(Connection $connection, int $type, ?string $sql = null)
@@ -54,7 +61,7 @@ class Event
 		$this->time = -microtime(true);
 
 		if ($type === self::QUERY && preg_match('#\(?\s*(SELECT|UPDATE|INSERT|DELETE)#iA', $this->sql, $matches)) {
-			$types = [
+			static $types = [
 				'SELECT' => self::SELECT, 'UPDATE' => self::UPDATE,
 				'INSERT' => self::INSERT, 'DELETE' => self::DELETE,
 			];
@@ -66,7 +73,7 @@ class Event
 			if (
 				isset($row['file'])
 				&& preg_match('~\.(php.?|phtml)$~', $row['file'])
-				&& !str_starts_with($row['file'], $dibiDir)
+				&& substr($row['file'], 0, strlen($dibiDir)) !== $dibiDir
 			) {
 				$this->source = [$row['file'], (int) $row['line']];
 				break;
@@ -79,7 +86,10 @@ class Event
 	}
 
 
-	public function done(Result|DriverException|null $result = null): static
+	/**
+	 * @param  Result|DriverException|null  $result
+	 */
+	public function done($result = null): self
 	{
 		$this->result = $result;
 		try {

src/Dibi/Expression.php

@@ -17,7 +17,8 @@ class Expression
 {
 	use Strict;
 
-	private array $values;
+	/** @var array */
+	private $values;
 
 
 	public function __construct(...$values)

src/Dibi/Fluent.php

@@ -27,6 +27,8 @@ namespace Dibi;
  * @method Fluent innerJoin(...$table)
  * @method Fluent rightJoin(...$table)
  * @method Fluent outerJoin(...$table)
+ * @method Fluent union(Fluent $fluent)
+ * @method Fluent unionAll(Fluent $fluent)
  * @method Fluent as(...$field)
  * @method Fluent on(...$cond)
  * @method Fluent and(...$cond)
@@ -47,7 +49,8 @@ class Fluent implements IDataSource
 
 	public const REMOVE = false;
 
-	public static array $masks = [
+	/** @var array */
+	public static $masks = [
 		'SELECT' => ['SELECT', 'DISTINCT', 'FROM', 'WHERE', 'GROUP BY',
 			'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET', ],
 		'UPDATE' => ['UPDATE', 'SET', 'WHERE', 'ORDER BY', 'LIMIT'],
@@ -55,8 +58,8 @@ class Fluent implements IDataSource
 		'DELETE' => ['DELETE', 'FROM', 'USING', 'WHERE', 'ORDER BY', 'LIMIT'],
 	];
 
-	/** default modifiers for arrays */
+	/** @var array  default modifiers for arrays */
-	public static array $modifiers = [
+	public static $modifiers = [
 		'SELECT' => '%n',
 		'FROM' => '%n',
 		'IN' => '%in',
@@ -68,8 +71,8 @@ class Fluent implements IDataSource
 		'GROUP BY' => '%by',
 	];
 
-	/** clauses separators */
+	/** @var array  clauses separators */
-	public static array $separators = [
+	public static $separators = [
 		'SELECT' => ',',
 		'FROM' => ',',
 		'WHERE' => 'AND',
@@ -83,35 +86,41 @@ class Fluent implements IDataSource
 		'INTO' => false,
 	];
 
-	/** clauses */
+	/** @var array  clauses */
-	public static array $clauseSwitches = [
+	public static $clauseSwitches = [
 		'JOIN' => 'FROM',
 		'INNER JOIN' => 'FROM',
 		'LEFT JOIN' => 'FROM',
 		'RIGHT JOIN' => 'FROM',
 	];
 
-	private Connection $connection;
+	/** @var Connection */
+	private $connection;
 
-	private array $setups = [];
+	/** @var array */
+	private $setups = [];
 
-	private ?string $command = null;
+	/** @var string|null */
+	private $command;
 
-	private array $clauses = [];
+	/** @var array */
+	private $clauses = [];
 
-	private array $flags = [];
+	/** @var array */
+	private $flags = [];
 
+	/** @var array|null */
 	private $cursor;
 
-	/** normalized clauses */
+	/** @var HashMap  normalized clauses */
-	private static HashMap $normalizer;
+	private static $normalizer;
 
 
 	public function __construct(Connection $connection)
 	{
 		$this->connection = $connection;
 
-		if (!isset(self::$normalizer)) {
+		if (self::$normalizer === null) {
 			self::$normalizer = new HashMap([self::class, '_formatClause']);
 		}
 	}
@@ -120,7 +129,7 @@ class Fluent implements IDataSource
 	/**
 	 * Appends new argument to the clause.
 	 */
-	public function __call(string $clause, array $args): static
+	public function __call(string $clause, array $args): self
 	{
 		$clause = self::$normalizer->$clause;
 
@@ -207,7 +216,7 @@ class Fluent implements IDataSource
 	/**
 	 * Switch to a clause.
 	 */
-	public function clause(string $clause): static
+	public function clause(string $clause): self
 	{
 		$this->cursor = &$this->clauses[self::$normalizer->$clause];
 		if ($this->cursor === null) {
@@ -221,7 +230,7 @@ class Fluent implements IDataSource
 	/**
 	 * Removes a clause.
 	 */
-	public function removeClause(string $clause): static
+	public function removeClause(string $clause): self
 	{
 		$this->clauses[self::$normalizer->$clause] = null;
 		return $this;
@@ -231,7 +240,7 @@ class Fluent implements IDataSource
 	/**
 	 * Change a SQL flag.
 	 */
-	public function setFlag(string $flag, bool $value = true): static
+	public function setFlag(string $flag, bool $value = true): self
 	{
 		$flag = strtoupper($flag);
 		if ($value) {
@@ -271,7 +280,7 @@ class Fluent implements IDataSource
 	/**
 	 * Adds Result setup.
 	 */
-	public function setupResult(string $method): static
+	public function setupResult(string $method): self
 	{
 		$this->setups[] = func_get_args();
 		return $this;
@@ -283,10 +292,10 @@ class Fluent implements IDataSource
 
 	/**
 	 * Generates and executes SQL query.
-	 * Returns result set or number of affected rows
+	 * @return Result|int|null  result set or number of affected rows
 	 * @throws Exception
 	 */
-	public function execute(?string $return = null): Result|int|null
+	public function execute(?string $return = null)
 	{
 		$res = $this->query($this->_export());
 		switch ($return) {
@@ -302,8 +311,9 @@ class Fluent implements IDataSource
 
 	/**
 	 * Generates, executes SQL query and fetches the single row.
+	 * @return Row|array|null
 	 */
-	public function fetch(): Row|array|null
+	public function fetch()
 	{
 		return $this->command === 'SELECT' && !$this->clauses['LIMIT']
 			? $this->query($this->_export(null, ['%lmt', 1]))->fetch()
@@ -313,9 +323,9 @@ class Fluent implements IDataSource
 
 	/**
 	 * Like fetch(), but returns only first field.
-	 * Returns value on success, null if no next record
+	 * @return mixed  value on success, null if no next record
 	 */
-	public function fetchSingle(): mixed
+	public function fetchSingle()
 	{
 		return $this->command === 'SELECT' && !$this->clauses['LIMIT']
 			? $this->query($this->_export(null, ['%lmt', 1]))->fetchSingle()
@@ -403,7 +413,12 @@ class Fluent implements IDataSource
 	 */
 	final public function __toString(): string
 	{
-		return $this->connection->translate($this->_export());
+		try {
+			return $this->connection->translate($this->_export());
+		} catch (\Throwable $e) {
+			trigger_error($e->getMessage(), E_USER_ERROR);
+			return '';
+		}
 	}
 
 

src/Dibi/Helpers.php

@@ -14,17 +14,19 @@ class Helpers
 {
 	use Strict;
 
-	private static HashMap $types;
+	/** @var HashMap */
+	private static $types;
 
 
 	/**
 	 * Prints out a syntax highlighted version of the SQL command or Result.
+	 * @param  string|Result  $sql
 	 */
-	public static function dump(string|Result|null $sql = null, bool $return = false): ?string
+	public static function dump($sql = null, bool $return = false): ?string
 	{
 		ob_start();
 		if ($sql instanceof Result && PHP_SAPI === 'cli') {
-			$hasColors = (str_starts_with((string) getenv('TERM'), 'xterm'));
+			$hasColors = (substr((string) getenv('TERM'), 0, 5) === 'xterm');
 			$maxLen = 0;
 			foreach ($sql as $i => $row) {
 				if ($i === 0) {
@@ -73,8 +75,8 @@ class Helpers
 				$sql = \dibi::$sql;
 			}
 
-			$keywords1 = 'SELECT|(?:ON\s+DUPLICATE\s+KEY)?UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|CALL|UNION|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|FETCH\s+NEXT|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE|START\s+TRANSACTION|BEGIN|COMMIT|ROLLBACK(?:\s+TO\s+SAVEPOINT)?|(?:RELEASE\s+)?SAVEPOINT';
+			static $keywords1 = 'SELECT|(?:ON\s+DUPLICATE\s+KEY)?UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|CALL|UNION|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|FETCH\s+NEXT|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE|START\s+TRANSACTION|BEGIN|COMMIT|ROLLBACK(?:\s+TO\s+SAVEPOINT)?|(?:RELEASE\s+)?SAVEPOINT';
-			$keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
+			static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
 
 			// insert new lines
 			$sql = " $sql ";
@@ -89,7 +91,7 @@ class Helpers
 			// syntax highlight
 			$highlighter = "#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is";
 			if (PHP_SAPI === 'cli') {
-				if (str_starts_with((string) getenv('TERM'), 'xterm')) {
+				if (substr((string) getenv('TERM'), 0, 5) === 'xterm') {
 					$sql = preg_replace_callback($highlighter, function (array $m) {
 						if (!empty($m[1])) { // comment
 							return "\033[1;30m" . $m[1] . "\033[0m";
@@ -160,7 +162,7 @@ class Helpers
 	/** @internal */
 	public static function escape(Driver $driver, $value, string $type): string
 	{
-		$types = [
+		static $types = [
 			Type::TEXT => 'text',
 			Type::BINARY => 'binary',
 			Type::BOOL => 'bool',
@@ -182,7 +184,7 @@ class Helpers
 	 */
 	public static function detectType(string $type): ?string
 	{
-		$patterns = [
+		static $patterns = [
 			'^_' => Type::TEXT, // PostgreSQL arrays
 			'RANGE$' => Type::TEXT, // PostgreSQL range types
 			'BYTEA|BLOB|BIN' => Type::BINARY,
@@ -209,7 +211,7 @@ class Helpers
 	/** @internal */
 	public static function getTypeCache(): HashMap
 	{
-		if (!isset(self::$types)) {
+		if (self::$types === null) {
 			self::$types = new HashMap([self::class, 'detectType']);
 		}
 
@@ -236,7 +238,7 @@ class Helpers
 
 	/**
 	 * Import SQL dump from file.
-	 * Returns count of sql commands
+	 * @return int  count of sql commands
 	 */
 	public static function loadFromFile(Connection $connection, string $file, ?callable $onProgress = null): int
 	{
@@ -257,7 +259,7 @@ class Helpers
 			if (strtoupper(substr($s, 0, 10)) === 'DELIMITER ') {
 				$delimiter = trim(substr($s, 10));
 
-			} elseif (str_ends_with($ts = rtrim($s), $delimiter)) {
+			} elseif (substr($ts = rtrim($s), -strlen($delimiter)) === $delimiter) {
 				$sql .= substr($ts, 0, -strlen($delimiter));
 				$driver->query($sql);
 				$sql = '';
@@ -284,14 +286,14 @@ class Helpers
 
 
 	/** @internal */
-	public static function false2Null(mixed $val): mixed
+	public static function false2Null($val)
 	{
 		return $val === false ? null : $val;
 	}
 
 
 	/** @internal */
-	public static function intVal(mixed $value): int
+	public static function intVal($value): int
 	{
 		if (is_int($value)) {
 			return $value;

src/Dibi/Literal.php

@@ -17,7 +17,8 @@ class Literal
 {
 	use Strict;
 
-	private string $value;
+	/** @var string */
+	private $value;
 
 
 	public function __construct($value)

src/Dibi/Loggers/FileLogger.php

@@ -19,12 +19,14 @@ class FileLogger
 {
 	use Dibi\Strict;
 
-	/** Name of the file where SQL errors should be logged */
+	/** @var string  Name of the file where SQL errors should be logged */
-	public string $file;
+	public $file;
 
-	public int $filter;
+	/** @var int */
+	public $filter;
 
-	private bool $errorsOnly;
+	/** @var bool */
+	private $errorsOnly;
 
 
 	public function __construct(string $file, ?int $filter = null, bool $errorsOnly = false)
@@ -56,7 +58,7 @@ class FileLogger
 			$this->writeToFile(
 				$event,
 				"ERROR: $message"
-					. "\n-- SQL: " . $event->sql,
+					. "\n-- SQL: " . $event->sql
 			);
 		} else {
 			$this->writeToFile(
@@ -64,7 +66,7 @@ class FileLogger
 				'OK: ' . $event->sql
 					. ($event->count ? ";\n-- rows: " . $event->count : '')
 					. "\n-- takes: " . sprintf('%0.3f ms', $event->time * 1000)
-					. "\n-- source: " . implode(':', $event->source),
+					. "\n-- source: " . implode(':', $event->source)
 			);
 		}
 	}
@@ -74,7 +76,7 @@ class FileLogger
 	{
 		$driver = $event->connection->getConfig('driver');
 		$message .=
-			"\n-- driver: " . (is_object($driver) ? $driver::class : $driver) . '/' . $event->connection->getConfig('name')
+			"\n-- driver: " . (is_object($driver) ? get_class($driver) : $driver) . '/' . $event->connection->getConfig('name')
 			. "\n-- " . date('Y-m-d H:i:s')
 			. "\n\n";
 		file_put_contents($this->file, $message, FILE_APPEND | LOCK_EX);

src/Dibi/Reflection/Column.php

@@ -29,11 +29,11 @@ class Column
 {
 	use Dibi\Strict;
 
-	/** when created by Result */
+	/** @var Dibi\Reflector|null when created by Result */
-	private ?Dibi\Reflector $reflector;
+	private $reflector;
 
 	/** @var array (name, nativetype, [table], [fullname], [size], [nullable], [default], [autoincrement], [vendor]) */
-	private array $info;
+	private $info;
 
 
 	public function __construct(?Dibi\Reflector $reflector, array $info)
@@ -109,13 +109,15 @@ class Column
 	}
 
 
-	public function getDefault(): mixed
+	/** @return mixed */
+	public function getDefault()
 	{
 		return $this->info['default'] ?? null;
 	}
 
 
-	public function getVendorInfo(string $key): mixed
+	/** @return mixed */
+	public function getVendorInfo(string $key)
 	{
 		return $this->info['vendor'][$key] ?? null;
 	}

src/Dibi/Reflection/Database.php

@@ -23,12 +23,14 @@ class Database
 {
 	use Dibi\Strict;
 
-	private Dibi\Reflector $reflector;
+	/** @var Dibi\Reflector */
+	private $reflector;
 
-	private ?string $name;
+	/** @var string|null */
+	private $name;
 
-	/** @var Table[] */
+	/** @var Table[]|null */
-	private array $tables;
+	private $tables;
 
 
 	public function __construct(Dibi\Reflector $reflector, ?string $name = null)
@@ -87,7 +89,7 @@ class Database
 
 	protected function init(): void
 	{
-		if (!isset($this->tables)) {
+		if ($this->tables === null) {
 			$this->tables = [];
 			foreach ($this->reflector->getTables() as $info) {
 				$this->tables[strtolower($info['name'])] = new Table($this->reflector, $info);

src/Dibi/Reflection/ForeignKey.php

@@ -22,10 +22,11 @@ class ForeignKey
 {
 	use Dibi\Strict;
 
-	private string $name;
+	/** @var string */
+	private $name;
 
 	/** @var array of [local, foreign, onDelete, onUpdate] */
-	private array $references;
+	private $references;
 
 
 	public function __construct(string $name, array $references)

src/Dibi/Reflection/Index.php

@@ -25,7 +25,7 @@ class Index
 	use Dibi\Strict;
 
 	/** @var array (name, columns, [unique], [primary]) */
-	private array $info;
+	private $info;
 
 
 	public function __construct(array $info)

src/Dibi/Reflection/Result.php

@@ -22,13 +22,14 @@ class Result
 {
 	use Dibi\Strict;
 
-	private Dibi\ResultDriver $driver;
+	/** @var Dibi\ResultDriver */
+	private $driver;
 
 	/** @var Column[]|null */
-	private ?array $columns;
+	private $columns;
 
 	/** @var Column[]|null */
-	private ?array $names;
+	private $names;
 
 
 	public function __construct(Dibi\ResultDriver $driver)
@@ -80,7 +81,7 @@ class Result
 
 	protected function initColumns(): void
 	{
-		if (!isset($this->columns)) {
+		if ($this->columns === null) {
 			$this->columns = [];
 			$reflector = $this->driver instanceof Dibi\Reflector
 				? $this->driver

src/Dibi/Reflection/Table.php

@@ -27,22 +27,26 @@ class Table
 {
 	use Dibi\Strict;
 
-	private Dibi\Reflector $reflector;
+	/** @var Dibi\Reflector */
+	private $reflector;
 
-	private string $name;
+	/** @var string */
+	private $name;
 
-	private bool $view;
+	/** @var bool */
+	private $view;
 
-	/** @var Column[] */
+	/** @var Column[]|null */
-	private array $columns;
+	private $columns;
 
-	/** @var ForeignKey[] */
+	/** @var ForeignKey[]|null */
-	private array $foreignKeys;
+	private $foreignKeys;
 
-	/** @var Index[] */
+	/** @var Index[]|null */
-	private array $indexes;
+	private $indexes;
 
-	private ?Index $primaryKey;
+	/** @var Index|null */
+	private $primaryKey;
 
 
 	public function __construct(Dibi\Reflector $reflector, array $info)
@@ -131,7 +135,7 @@ class Table
 
 	protected function initColumns(): void
 	{
-		if (!isset($this->columns)) {
+		if ($this->columns === null) {
 			$this->columns = [];
 			foreach ($this->reflector->getColumns($this->name) as $info) {
 				$this->columns[strtolower($info['name'])] = new Column($this->reflector, $info);
@@ -142,7 +146,7 @@ class Table
 
 	protected function initIndexes(): void
 	{
-		if (!isset($this->indexes)) {
+		if ($this->indexes === null) {
 			$this->initColumns();
 			$this->indexes = [];
 			foreach ($this->reflector->getIndexes($this->name) as $info) {

src/Dibi/Result.php

@@ -19,23 +19,26 @@ class Result implements IDataSource
 {
 	use Strict;
 
-	private ?ResultDriver $driver;
+	/** @var ResultDriver|null */
+	private $driver;
 
-	/** Translate table */
+	/** @var array  Translate table */
-	private array $types = [];
+	private $types = [];
 
-	private ?Reflection\Result $meta;
+	/** @var Reflection\Result|null */
+	private $meta;
 
-	/** Already fetched? Used for allowance for first seek(0) */
+	/** @var bool  Already fetched? Used for allowance for first seek(0) */
-	private bool $fetched = false;
+	private $fetched = false;
 
-	/** returned object class */
+	/** @var string|null  returned object class */
-	private ?string $rowClass = Row::class;
+	private $rowClass = Row::class;
 
 	/** @var callable|null  returned object factory */
 	private $rowFactory;
 
-	private array $formats = [];
+	/** @var array  format */
+	private $formats = [];
 
 
 	public function __construct(ResultDriver $driver, bool $normalize = true)
@@ -130,7 +133,7 @@ class Result implements IDataSource
 	/**
 	 * Set fetched object class. This class should extend the Row class.
 	 */
-	public function setRowClass(?string $class): static
+	public function setRowClass(?string $class): self
 	{
 		$this->rowClass = $class;
 		return $this;
@@ -149,7 +152,7 @@ class Result implements IDataSource
 	/**
 	 * Set a factory to create fetched object instances. These should extend the Row class.
 	 */
-	public function setRowFactory(callable $callback): static
+	public function setRowFactory(callable $callback): self
 	{
 		$this->rowFactory = $callback;
 		return $this;
@@ -159,8 +162,9 @@ class Result implements IDataSource
 	/**
 	 * Fetches the row at current position, process optional type conversion.
 	 * and moves the internal cursor to the next position
+	 * @return Row|array|null
 	 */
-	final public function fetch(): mixed
+	final public function fetch()
 	{
 		$row = $this->getResultDriver()->fetch(true);
 		if ($row === null) {
@@ -181,9 +185,9 @@ class Result implements IDataSource
 
 	/**
 	 * Like fetch(), but returns only first field.
-	 * Returns value on success, null if no next record
+	 * @return mixed value on success, null if no next record
 	 */
-	final public function fetchSingle(): mixed
+	final public function fetchSingle()
 	{
 		$row = $this->getResultDriver()->fetch(true);
 		if ($row === null) {
@@ -202,7 +206,7 @@ class Result implements IDataSource
 	 */
 	final public function fetchAll(?int $offset = null, ?int $limit = null): array
 	{
-		$limit ??= -1;
+		$limit = $limit ?? -1;
 		$this->seek($offset ?: 0);
 		$row = $this->fetch();
 		if (!$row) {
@@ -234,7 +238,7 @@ class Result implements IDataSource
 	 */
 	final public function fetchAssoc(string $assoc): array
 	{
-		if (str_contains($assoc, ',')) {
+		if (strpos($assoc, ',') !== false) {
 			return $this->oldFetchAssoc($assoc);
 		}
 
@@ -491,7 +495,7 @@ class Result implements IDataSource
 				$row[$key] = ((bool) $value) && $value !== 'f' && $value !== 'F';
 
 			} elseif ($type === Type::DATETIME || $type === Type::DATE || $type === Type::TIME) {
-				if ($value && !str_starts_with((string) $value, '0000-00')) { // '', null, false, '0000-00-00', ...
+				if ($value && substr((string) $value, 0, 7) !== '0000-00') { // '', null, false, '0000-00-00', ...
 					$value = new DateTime($value);
 					$row[$key] = $format ? $value->format($format) : $value;
 				} else {
@@ -525,7 +529,7 @@ class Result implements IDataSource
 	 * Define column type.
 	 * @param  string|null  $type  use constant Type::*
 	 */
-	final public function setType(string $column, ?string $type): static
+	final public function setType(string $column, ?string $type): self
 	{
 		$this->types[$column] = $type;
 		return $this;
@@ -553,7 +557,7 @@ class Result implements IDataSource
 	/**
 	 * Sets type format.
 	 */
-	final public function setFormat(string $type, ?string $format): static
+	final public function setFormat(string $type, ?string $format): self
 	{
 		$this->formats[$type] = $format;
 		return $this;
@@ -563,7 +567,7 @@ class Result implements IDataSource
 	/**
 	 * Sets type formats.
 	 */
-	final public function setFormats(array $formats): static
+	final public function setFormats(array $formats): self
 	{
 		$this->formats = $formats;
 		return $this;
@@ -587,7 +591,7 @@ class Result implements IDataSource
 	 */
 	public function getInfo(): Reflection\Result
 	{
-		if (!isset($this->meta)) {
+		if ($this->meta === null) {
 			$this->meta = new Reflection\Result($this->getResultDriver());
 		}
 

src/Dibi/ResultIterator.php

@@ -17,11 +17,14 @@ class ResultIterator implements \Iterator, \Countable
 {
 	use Strict;
 
-	private Result $result;
+	/** @var Result */
+	private $result;
 
-	private mixed $row;
+	/** @var mixed */
+	private $row;
 
-	private int $pointer = 0;
+	/** @var int */
+	private $pointer = 0;
 
 
 	public function __construct(Result $result)
@@ -43,8 +46,10 @@ class ResultIterator implements \Iterator, \Countable
 
 	/**
 	 * Returns the key of the current element.
+	 * @return mixed
 	 */
-	public function key(): mixed
+	#[\ReturnTypeWillChange]
+	public function key()
 	{
 		return $this->pointer;
 	}
@@ -52,8 +57,10 @@ class ResultIterator implements \Iterator, \Countable
 
 	/**
 	 * Returns the current element.
+	 * @return mixed
 	 */
-	public function current(): mixed
+	#[\ReturnTypeWillChange]
+	public function current()
 	{
 		return $this->row;
 	}

src/Dibi/Row.php

@@ -32,12 +32,13 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 
 	/**
 	 * Converts value to DateTime object.
+	 * @return DateTime|string|null
 	 */
-	public function asDateTime(string $key, ?string $format = null): DateTime|string|null
+	public function asDateTime(string $key, ?string $format = null)
 	{
 		$time = $this[$key];
 		if (!$time instanceof DateTime) {
-			if (!$time || str_starts_with((string) $time, '0000-00')) { // '', null, false, '0000-00-00', ...
+			if (!$time || substr((string) $time, 0, 7) === '0000-00') { // '', null, false, '0000-00-00', ...
 				return null;
 			}
 
@@ -82,7 +83,8 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 	}
 
 
-	final public function offsetGet($nm): mixed
+	#[\ReturnTypeWillChange]
+	final public function offsetGet($nm)
 	{
 		return $this->$nm;
 	}

src/Dibi/Strict.php

@@ -20,7 +20,7 @@ use ReflectionProperty;
 trait Strict
 {
 	/** @var array [method => [type => callback]] */
-	private static array $extMethods;
+	private static $extMethods;
 
 
 	/**
@@ -31,7 +31,7 @@ trait Strict
 	{
 		$class = method_exists($this, $name) ? 'parent' : static::class;
 		$items = (new ReflectionClass($this))->getMethods(ReflectionMethod::IS_PUBLIC);
-		$items = array_map(fn($item) => $item->getName(), $items);
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
 		$hint = ($t = Helpers::getSuggestion($items, $name))
 			? ", did you mean $t()?"
 			: '.';
@@ -46,8 +46,8 @@ trait Strict
 	public static function __callStatic(string $name, array $args)
 	{
 		$rc = new ReflectionClass(static::class);
-		$items = array_filter($rc->getMethods(\ReflectionMethod::IS_STATIC), fn($m) => $m->isPublic());
+		$items = array_filter($rc->getMethods(\ReflectionMethod::IS_STATIC), function ($m) { return $m->isPublic(); });
-		$items = array_map(fn($item) => $item->getName(), $items);
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
 		$hint = ($t = Helpers::getSuggestion($items, $name))
 			? ", did you mean $t()?"
 			: '.';
@@ -69,8 +69,8 @@ trait Strict
 		}
 
 		$rc = new ReflectionClass($this);
-		$items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), fn($p) => !$p->isStatic());
+		$items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), function ($p) { return !$p->isStatic(); });
-		$items = array_map(fn($item) => $item->getName(), $items);
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
 		$hint = ($t = Helpers::getSuggestion($items, $name))
 			? ", did you mean $$t?"
 			: '.';
@@ -85,8 +85,8 @@ trait Strict
 	public function __set(string $name, $value)
 	{
 		$rc = new ReflectionClass($this);
-		$items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), fn($p) => !$p->isStatic());
+		$items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), function ($p) { return !$p->isStatic(); });
-		$items = array_map(fn($item) => $item->getName(), $items);
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
 		$hint = ($t = Helpers::getSuggestion($items, $name))
 			? ", did you mean $$t?"
 			: '.';

src/Dibi/Translator.php

@@ -17,28 +17,38 @@ final class Translator
 {
 	use Strict;
 
-	private Connection $connection;
+	/** @var Connection */
+	private $connection;
 
-	private Driver $driver;
+	/** @var Driver */
+	private $driver;
 
-	private int $cursor = 0;
+	/** @var int */
+	private $cursor = 0;
 
-	private array $args;
+	/** @var array */
+	private $args;
 
 	/** @var string[] */
-	private array $errors;
+	private $errors;
 
-	private bool $comment = false;
+	/** @var bool */
+	private $comment = false;
 
-	private int $ifLevel = 0;
+	/** @var int */
+	private $ifLevel = 0;
 
-	private int $ifLevelStart = 0;
+	/** @var int */
+	private $ifLevelStart = 0;
 
-	private ?int $limit = null;
+	/** @var int|null */
+	private $limit;
 
-	private ?int $offset = null;
+	/** @var int|null */
+	private $offset;
 
-	private HashMap $identifiers;
+	/** @var HashMap */
+	private $identifiers;
 
 
 	public function __construct(Connection $connection)
@@ -86,21 +96,22 @@ final class Translator
 						// note: this can change $this->args & $this->cursor & ...
 						. preg_replace_callback(
 							<<<'XX'
-								/
+							/
-								(?=[`['":%?])                       ## speed-up
+							(?=[`['":%?])                       ## speed-up
-								(?:
+							(?:
-									`(.+?)`|                        ## 1) `identifier`
+								`(.+?)`|                        ## 1) `identifier`
-									\[(.+?)\]|                      ## 2) [identifier]
+								\[(.+?)\]|                      ## 2) [identifier]
-									(')((?:''|[^'])*)'|             ## 3,4) string
+								(')((?:''|[^'])*)'|             ## 3,4) string
-									(")((?:""|[^"])*)"|             ## 5,6) "string"
+								(")((?:""|[^"])*)"|             ## 5,6) "string"
-									('|")|                          ## 7) lone quote
+								('|")|                          ## 7) lone quote
-									:(\S*?:)([a-zA-Z0-9._]?)|       ## 8,9) :substitution:
+								:(\S*?:)([a-zA-Z0-9._]?)|       ## 8,9) :substitution:
-									%([a-zA-Z~][a-zA-Z0-9~]{0,5})|  ## 10) modifier
+								%([a-zA-Z~][a-zA-Z0-9~]{0,5})|  ## 10) modifier
-									(\?)                            ## 11) placeholder
+								(\?)                            ## 11) placeholder
-								)/xs
+							)/xs
-								XX,
+XX
+							,
 							[$this, 'cb'],
-							substr($arg, $toSkip),
+							substr($arg, $toSkip)
 						);
 					if (preg_last_error()) {
 						throw new PcreException;
@@ -162,8 +173,9 @@ final class Translator
 
 	/**
 	 * Apply modifier to single value.
+	 * @param  mixed  $value
 	 */
-	public function formatValue(mixed $value, ?string $modifier): string
+	public function formatValue($value, ?string $modifier): string
 	{
 		if ($this->comment) {
 			return '...';
@@ -198,7 +210,7 @@ final class Translator
 								$v = $this->formatValue($v, $pair[1]);
 								if ($pair[1] === 'l' || $pair[1] === 'in') {
 									$op = 'IN ';
-								} elseif (str_contains($pair[1], 'like')) {
+								} elseif (strpos($pair[1], 'like') !== false) {
 									$op = 'LIKE ';
 								} elseif ($v === 'NULL') {
 									$op = 'IS ';
@@ -268,7 +280,7 @@ final class Translator
 								$proto = array_keys($v);
 							}
 						} else {
-							return $this->errors[] = '**Unexpected type ' . (is_object($v) ? $v::class : gettype($v)) . '**';
+							return $this->errors[] = '**Unexpected type ' . (is_object($v) ? get_class($v) : gettype($v)) . '**';
 						}
 
 						$pair = explode('%', $k, 2); // split into identifier & modifier
@@ -314,19 +326,6 @@ final class Translator
 			}
 		}
 
-		if (is_object($value)
-			&& $modifier === null
-			&& !$value instanceof Literal
-			&& !$value instanceof Expression
-		) {
-			foreach ($this->connection->getObjectTranslators() as $class => $translator) {
-				if ($value instanceof $class) {
-					$value = $translator($value);
-					return $this->connection->translate(...$value->getValues());
-				}
-			}
-		}
-
 		// object-to-scalar procession
 		if ($value instanceof \BackedEnum && is_scalar($value->value)) {
 			$value = $value->value;
@@ -350,7 +349,7 @@ final class Translator
 				) {
 					// continue
 				} else {
-					$type = is_object($value) ? $value::class : gettype($value);
+					$type = is_object($value) ? get_class($value) : gettype($value);
 					return $this->errors[] = "**Invalid combination of type $type and modifier %$modifier**";
 				}
 			}
@@ -438,20 +437,20 @@ final class Translator
 						$value = substr($value, 0, $toSkip)
 							. preg_replace_callback(
 								<<<'XX'
-																	/
+								/
-																	(?=[`['":])
+								(?=[`['":])
-																	(?:
+								(?:
-																		`(.+?)`|
+									`(.+?)`|
-																		\[(.+?)\]|
+									\[(.+?)\]|
-																		(')((?:''|[^'])*)'|
+									(')((?:''|[^'])*)'|
-																		(")((?:""|[^"])*)"|
+									(")((?:""|[^"])*)"|
-																		('|")|
+									('|")|
-																		:(\S*?:)([a-zA-Z0-9._]?)
+									:(\S*?:)([a-zA-Z0-9._]?)
-																	)/sx
+								)/sx
-									XX
+XX
 								,
 								[$this, 'cb'],
-								substr($value, $toSkip),
+								substr($value, $toSkip)
 							);
 						if (preg_last_error()) {
 							throw new PcreException;
@@ -517,7 +516,7 @@ final class Translator
 			return $this->connection->translate(...$value->getValues());
 
 		} else {
-			$type = is_object($value) ? $value::class : gettype($value);
+			$type = is_object($value) ? get_class($value) : gettype($value);
 			return $this->errors[] = "**Unexpected $type**";
 		}
 	}

src/Dibi/dibi.php

@@ -44,30 +44,30 @@ class dibi
 		IDENTIFIER = 'n';
 
 	/** version */
-	public const VERSION = '5.0-dev';
+	public const VERSION = '4.2.8';
 
 	/** sorting order */
 	public const
 		ASC = 'ASC',
 		DESC = 'DESC';
 
-	/** Last SQL command @see dibi::query() */
+	/** @var string|null  Last SQL command @see dibi::query() */
-	public static ?string $sql = null;
+	public static $sql;
 
-	/** Elapsed time for last query */
+	/** @var float|null  Elapsed time for last query */
-	public static ?float $elapsedTime = null;
+	public static $elapsedTime;
 
-	/** Elapsed time for all queries */
+	/** @var float  Elapsed time for all queries */
-	public static float $totalTime = 0;
+	public static $totalTime;
 
-	/** Number or queries */
+	/** @var int  Number or queries */
-	public static int $numOfQueries = 0;
+	public static $numOfQueries = 0;
 
 	/** @var Dibi\Connection[]  Connection registry storage for Dibi\Connection objects */
-	private static array $registry = [];
+	private static $registry = [];
 
-	/** Current connection */
+	/** @var Dibi\Connection  Current connection */
-	private static Dibi\Connection $connection;
+	private static $connection;
 
 
 	/**
@@ -87,7 +87,7 @@ class dibi
 	 * @param  array   $config  connection parameters
 	 * @throws Dibi\Exception
 	 */
-	public static function connect(array $config = [], string $name = '0'): Dibi\Connection
+	public static function connect($config = [], string $name = '0'): Dibi\Connection
 	{
 		return self::$connection = self::$registry[$name] = new Dibi\Connection($config, $name);
 	}
@@ -150,9 +150,10 @@ class dibi
 
 	/**
 	 * Prints out a syntax highlighted version of the SQL command or Result.
+	 * @param  string|Dibi\Result  $sql
 	 * @param  bool  $return  return output instead of printing it?
 	 */
-	public static function dump(string|Dibi\Result|null $sql = null, bool $return = false): ?string
+	public static function dump($sql = null, bool $return = false): ?string
 	{
 		return Dibi\Helpers::dump($sql, $return);
 	}
@@ -163,7 +164,7 @@ class dibi
 	 */
 	public static function stripMicroseconds(DateTimeInterface $dt): DateTimeInterface
 	{
-		$class = $dt::class;
+		$class = get_class($dt);
 		return new $class($dt->format('Y-m-d H:i:s'), $dt->getTimezone());
 	}
 }

src/Dibi/exceptions.php

@@ -15,15 +15,15 @@ namespace Dibi;
  */
 class Exception extends \Exception
 {
-	private ?string $sql;
+	/** @var string|null */
+	private $sql;
 
 
-	public function __construct(
+	/**
-		string $message = '',
+	 * @param  int|string  $code
-		int|string $code = 0,
+	 */
-		?string $sql = null,
+	public function __construct(string $message = '', $code = 0, ?string $sql = null, ?\Throwable $previous = null)
-		?\Throwable $previous = null,
+	{
-	) {
 		parent::__construct($message, 0, $previous);
 		$this->code = $code;
 		$this->sql = $sql;
@@ -56,9 +56,17 @@ class DriverException extends Exception
  */
 class PcreException extends Exception
 {
-	public function __construct()
+	public function __construct(string $message = '%msg.')
 	{
-		parent::__construct(preg_last_error_msg(), preg_last_error());
+		static $messages = [
+			PREG_INTERNAL_ERROR => 'Internal error',
+			PREG_BACKTRACK_LIMIT_ERROR => 'Backtrack limit was exhausted',
+			PREG_RECURSION_LIMIT_ERROR => 'Recursion limit was exhausted',
+			PREG_BAD_UTF8_ERROR => 'Malformed UTF-8 data',
+			5 => 'Offset didn\'t correspond to the begin of a valid UTF-8 code point', // PREG_BAD_UTF8_OFFSET_ERROR
+		];
+		$code = preg_last_error();
+		parent::__construct(str_replace('%msg', $messages[$code] ?? 'Unknown error', $message), $code);
 	}
 }
 
@@ -78,7 +86,8 @@ class NotSupportedException extends Exception
  */
 class ProcedureException extends Exception
 {
-	protected string $severity;
+	/** @var string */
+	protected $severity;
 
 
 	/**

src/Dibi/interfaces.php

@@ -67,8 +67,9 @@ interface Driver
 
 	/**
 	 * Returns the connection resource.
+	 * @return mixed
 	 */
-	function getResource(): mixed;
+	function getResource();
 
 	/**
 	 * Returns the connection reflector.
@@ -116,6 +117,7 @@ interface ResultDriver
 
 	/**
 	 * Moves cursor position without fetching row.
+	 * @return bool  true on success, false if unable to seek to specified record
 	 * @throws Exception
 	 */
 	function seek(int $row): bool;
@@ -140,8 +142,9 @@ interface ResultDriver
 
 	/**
 	 * Returns the result set resource.
+	 * @return mixed
 	 */
-	function getResultResource(): mixed;
+	function getResultResource();
 
 	/**
 	 * Decodes data from result set.

tests/databases.appveyor.ini

@@ -13,13 +13,12 @@ driver = mysqli
 host = 127.0.0.1
 username = root
 password = "Password12!"
-database = dibi_test
 charset = utf8
 system = mysql
 
 [mysql pdo]
 driver = pdo
-dsn = "mysql:host=127.0.0.1;dbname=dibi_test"
+dsn = "mysql:host=127.0.0.1"
 username = root
 password = "Password12!"
 system = mysql

tests/databases.sample.ini

@@ -13,13 +13,12 @@ driver = mysqli
 host = 127.0.0.1
 username = root
 password =
-database = dibi_test
 charset = utf8
 system = mysql
 
 [mysql pdo]
 driver = pdo
-dsn = "mysql:host=127.0.0.1;dbname=dibi_test"
+dsn = "mysql:host=127.0.0.1"
 username = root
 password =
 system = mysql

tests/dibi/Connection.fetch.phpt

@@ -33,13 +33,13 @@ Assert::equal([
 $res = $conn->query('SELECT * FROM [products] ORDER BY product_id');
 Assert::same(
 	[1 => 'Chair', 'Table', 'Computer'],
-	$res->fetchPairs('product_id', 'title'),
+	$res->fetchPairs('product_id', 'title')
 );
 
 $res = $conn->query('SELECT * FROM [products] ORDER BY product_id');
 Assert::same(
 	[1 => 'Chair', 'Table', 'Computer'],
-	$res->fetchPairs(),
+	$res->fetchPairs()
 );
 
 

tests/dibi/Connection.objectTranslator.phpt

@@ -1,119 +0,0 @@
-<?php
-
-/**
- * @dataProvider ../databases.ini
- */
-
-declare(strict_types=1);
-
-use Tester\Assert;
-
-require __DIR__ . '/bootstrap.php';
-
-$conn = new Dibi\Connection($config + ['formatDateTime' => "'Y-m-d H:i:s.u'", 'formatDate' => "'Y-m-d'"]);
-
-
-class Email
-{
-	public $address = 'address@example.com';
-}
-
-class Time extends DateTimeImmutable
-{
-}
-
-
-test('Without object translator', function () use ($conn) {
-	Assert::exception(function () use ($conn) {
-		$conn->translate('?', new Email);
-	}, Dibi\Exception::class, 'SQL translate error: Unexpected Email');
-});
-
-
-test('Basics', function () use ($conn) {
-	$conn->addObjectTranslator(Email::class, fn($object) => new Dibi\Expression('?', $object->address));
-	Assert::same(
-		reformat([
-			'sqlsrv' => "N'address@example.com'",
-			"'address@example.com'",
-		]),
-		$conn->translate('?', new Email),
-	);
-});
-
-
-test('DateTime', function () use ($conn) {
-	$stamp = Time::createFromFormat('Y-m-d H:i:s', '2022-11-22 12:13:14');
-
-	// Without object translator, DateTime child is translated by driver
-	Assert::same(
-		$conn->getDriver()->escapeDateTime($stamp),
-		$conn->translate('?', $stamp),
-	);
-
-
-	// With object translator
-	$conn->addObjectTranslator(Time::class, fn($object) => new Dibi\Expression('OwnTime(?)', $object->format('H:i:s')));
-	Assert::same(
-		reformat([
-			'sqlsrv' => "OwnTime(N'12:13:14')",
-			"OwnTime('12:13:14')",
-		]),
-		$conn->translate('?', $stamp),
-	);
-
-
-	// With modifier, it is still translated by driver
-	Assert::same(
-		$conn->getDriver()->escapeDateTime($stamp),
-		$conn->translate('%dt', $stamp),
-	);
-	Assert::same(
-		$conn->getDriver()->escapeDateTime($stamp),
-		$conn->translate('%t', $stamp),
-	);
-	Assert::same(
-		$conn->getDriver()->escapeDate($stamp),
-		$conn->translate('%d', $stamp),
-	);
-
-
-	// DateTimeImmutable as a Time parent is not affected and still translated by driver
-	$dt = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-11-22 12:13:14');
-	Assert::same(
-		$conn->getDriver()->escapeDateTime($dt),
-		$conn->translate('?', $dt),
-	);
-
-	// But DateTime translation can be overloaded
-	$conn->addObjectTranslator(DateTimeInterface::class, fn() => new Dibi\Expression('OwnDateTime'));
-	Assert::same(
-		'OwnDateTime',
-		$conn->translate('?', $dt),
-	);
-});
-
-
-test('Complex structures', function () use ($conn) {
-	$conn->addObjectTranslator(Email::class, fn($object) => new Dibi\Expression('?', $object->address));
-	$conn->addObjectTranslator(Time::class, fn($object) => new Dibi\Expression('OwnTime(?)', $object->format('H:i:s')));
-	$conn->addObjectTranslator(Time::class, fn($object) => new Dibi\Expression('OwnTime(?)', $object->format('H:i:s')));
-
-	$time = Time::createFromFormat('Y-m-d H:i:s', '2022-11-22 12:13:14');
-	Assert::same(
-		reformat([
-			'sqlsrv' => "([a], [b], [c], [d], [e], [f], [g]) VALUES (OwnTime(N'12:13:14'), '2022-11-22', CONVERT(DATETIME2(7), '2022-11-22 12:13:14.000000'), CONVERT(DATETIME2(7), '2022-11-22 12:13:14.000000'), N'address@example.com', OwnDateTime, OwnDateTime)",
-			'odbc' => "([a], [b], [c], [d], [e], [f], [g]) VALUES (OwnTime('12:13:14'), #11/22/2022#, #11/22/2022 12:13:14.000000#, #11/22/2022 12:13:14.000000#, 'address@example.com', OwnDateTime, OwnDateTime)",
-			"([a], [b], [c], [d], [e], [f], [g]) VALUES (OwnTime('12:13:14'), '2022-11-22', '2022-11-22 12:13:14.000000', '2022-11-22 12:13:14.000000', 'address@example.com', OwnDateTime, OwnDateTime)",
-		]),
-		$conn->translate('%v', [
-			'a' => $time,
-			'b%d' => $time,
-			'c%t' => $time,
-			'd%dt' => $time,
-			'e' => new Email,
-			'f' => new DateTime,
-			'g' => new DateTimeImmutable,
-		]),
-	);
-});

tests/dibi/Connection.substitutions.phpt

@@ -14,27 +14,27 @@ $conn->getSubstitutes()->blog = 'wp_';
 
 Assert::same(
 	reformat('UPDATE wp_items SET [val]=1'),
-	$conn->translate('UPDATE :blog:items SET [val]=1'),
+	$conn->translate('UPDATE :blog:items SET [val]=1')
 );
 
 Assert::same(
 	reformat('UPDATE [wp_items] SET [val]=1'),
-	$conn->translate('UPDATE [:blog:items] SET [val]=1'),
+	$conn->translate('UPDATE [:blog:items] SET [val]=1')
 );
 
 Assert::same(
 	reformat("UPDATE 'wp_' SET [val]=1"),
-	$conn->translate('UPDATE :blog: SET [val]=1'),
+	$conn->translate('UPDATE :blog: SET [val]=1')
 );
 
 Assert::same(
 	reformat("UPDATE ':blg:' SET [val]=1"),
-	$conn->translate('UPDATE :blg: SET [val]=1'),
+	$conn->translate('UPDATE :blg: SET [val]=1')
 );
 
 Assert::same(
 	reformat("UPDATE table SET [text]=':blog:a'"),
-	$conn->translate("UPDATE table SET [text]=':blog:a'"),
+	$conn->translate("UPDATE table SET [text]=':blog:a'")
 );
 
 
@@ -43,14 +43,16 @@ $conn->getSubstitutes()->{''} = 'my_';
 
 Assert::same(
 	reformat('UPDATE my_table SET [val]=1'),
-	$conn->translate('UPDATE ::table SET [val]=1'),
+	$conn->translate('UPDATE ::table SET [val]=1')
 );
 
 
 // create substitutions using fallback callback
-$conn->getSubstitutes()->setCallback(fn($expr) => '_' . $expr . '_');
+$conn->getSubstitutes()->setCallback(function ($expr) {
+	return '_' . $expr . '_';
+});
 
 Assert::same(
 	reformat('UPDATE _account_user SET [val]=1'),
-	$conn->translate('UPDATE :account:user SET [val]=1'),
+	$conn->translate('UPDATE :account:user SET [val]=1')
 );

tests/dibi/DataSource.phpt

@@ -17,7 +17,7 @@ Assert::match(
 	reformat('
 SELECT *
 FROM (SELECT * FROM products) t'),
-	(string) $ds,
+	(string) $ds
 );
 
 
@@ -25,7 +25,7 @@ Assert::same(3, $ds->count());
 Assert::same(3, $ds->getTotalCount());
 Assert::same(
 	reformat('SELECT COUNT(*) FROM (SELECT * FROM products) t'),
-	dibi::$sql,
+	dibi::$sql
 );
 
 
@@ -39,7 +39,7 @@ FROM (SELECT * FROM products) t
  WHERE (title like '%a%')
  ORDER BY [title] DESC
  "),
-	(string) $ds,
+	(string) $ds
 );
 
 
@@ -53,7 +53,7 @@ FROM (SELECT * FROM products) t
  WHERE (title like '%a%') AND (product_id = 1)
  ORDER BY [title] DESC, [product_id] ASC
  "),
-	(string) $ds,
+	(string) $ds
 );
 
 
@@ -67,7 +67,7 @@ FROM (SELECT * FROM products) t
  WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
  ORDER BY [product_id] ASC
  "),
-	(string) $ds,
+	(string) $ds
 );
 
 
@@ -95,7 +95,7 @@ FROM (SELECT * FROM products) t
  WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
  ORDER BY [product_id] ASC
 "),
-	dibi::$sql,
+	dibi::$sql
 );
 
 
@@ -108,7 +108,7 @@ FROM (SELECT * FROM products) t
  WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
  ORDER BY [product_id] ASC
 ) t"),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -117,7 +117,7 @@ Assert::match(
 	reformat('
 SELECT *
 FROM (SELECT [title] FROM [products]) t'),
-	(string) $ds,
+	(string) $ds
 );
 
 Assert::equal(new Row([
@@ -129,7 +129,7 @@ Assert::same(1, $conn->dataSource('SELECT * FROM products ORDER BY product_id')-
 
 Assert::same(
 	[1 => 'Chair', 'Table', 'Computer'],
-	$conn->dataSource('SELECT * FROM products ORDER BY product_id')->fetchPairs(),
+	$conn->dataSource('SELECT * FROM products ORDER BY product_id')->fetchPairs()
 );
 
 Assert::equal([
@@ -154,7 +154,7 @@ Assert::match(
 	reformat('
 SELECT *
 FROM [products]'),
-	(string) $ds,
+	(string) $ds
 );
 
 Assert::same(3, $ds->count());

tests/dibi/DateTime.phpt

@@ -10,10 +10,10 @@ require __DIR__ . '/bootstrap.php';
 
 date_default_timezone_set('Europe/Prague');
 
-Assert::same('1978-01-23 11:40:00.000000', (string) new DateTime(254_400_000));
+Assert::same('1978-01-23 11:40:00.000000', (string) new DateTime(254400000));
-Assert::same('1978-01-23 11:40:00.000000', (string) (new DateTime)->setTimestamp(254_400_000));
+Assert::same('1978-01-23 11:40:00.000000', (string) (new DateTime)->setTimestamp(254400000));
-Assert::same(254_400_000, (new DateTime(254_400_000))->getTimestamp());
+Assert::same(254400000, (new DateTime(254400000))->getTimestamp());
 
-Assert::same(is_int(2_544_000_000) ? 2_544_000_000 : '2544000000', (new DateTime(2_544_000_000))->getTimestamp()); // 64 bit
+Assert::same(is_int(2544000000) ? 2544000000 : '2544000000', (new DateTime(2544000000))->getTimestamp()); // 64 bit
 
 Assert::same('1978-05-05 00:00:00.000000', (string) new DateTime('1978-05-05'));

tests/dibi/Fluent.delete.phpt

@@ -15,33 +15,33 @@ $fluent = $conn->delete('table')->as('bAlias')
 
 Assert::same(
 	reformat('DELETE IGNORE FROM [table] AS [bAlias]'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->removeClause('from')->from('anotherTable');
 
 Assert::same(
 	reformat('DELETE IGNORE FROM [anotherTable]'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->using('thirdTable');
 
 Assert::same(
 	reformat('DELETE IGNORE FROM [anotherTable] USING [thirdTable]'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->setFlag('IGNORE', false);
 
 Assert::same(
 	reformat('DELETE FROM [anotherTable] USING [thirdTable]'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->limit(10);
 
 Assert::same(
 	reformat('DELETE FROM [anotherTable] USING [thirdTable] LIMIT 10'),
-	(string) $fluent,
+	(string) $fluent
 );

tests/dibi/Fluent.fetch.limit.mssql.phpt

@@ -58,28 +58,28 @@ $fluent = $conn->select('*')
 
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
 $fluent->fetch();
 Assert::same(
 	'SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t',
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchAll(0, 3);
 Assert::same(
 	reformat('SELECT TOP (3) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql,
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -87,16 +87,16 @@ $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql,
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -105,14 +105,14 @@ $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql,
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id]'),
-	(string) $fluent,
+	(string) $fluent
 );

tests/dibi/Fluent.fetch.limit.phpt

@@ -23,28 +23,28 @@ $fluent = $conn->select('*')
 
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchAll(2, 3);
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 3 OFFSET 2'),
-	dibi::$sql,
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -52,16 +52,16 @@ $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
-	dibi::$sql,
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -69,16 +69,16 @@ $fluent->removeClause('limit');
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
-	dibi::$sql,
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 18446744073709551615 OFFSET 3'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -86,14 +86,14 @@ $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1'),
-	dibi::$sql,
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1'),
-	dibi::$sql,
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id]'),
-	(string) $fluent,
+	(string) $fluent
 );

tests/dibi/Fluent.insert.phpt

@@ -21,40 +21,40 @@ $fluent = $conn->insert('table', $arr)
 
 Assert::same(
 	reformat('INSERT IGNORE DELAYED INTO [table] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL)'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->setFlag('IGNORE', false);
 
 Assert::same(
 	reformat('INSERT DELAYED INTO [table] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL)'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->setFlag('HIGH_priority');
 
 Assert::same(
 	reformat('INSERT DELAYED HIGH_PRIORITY INTO [table] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL)'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->into('anotherTable');
 
 Assert::same(
 	reformat('INSERT DELAYED HIGH_PRIORITY INTO [anotherTable] VALUES (\'Super Product\', 12, NULL)'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->values('%l', $arr);
 
 Assert::same(
 	reformat('INSERT DELAYED HIGH_PRIORITY INTO [anotherTable] VALUES (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL)'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->values($arr);
 
 Assert::same(
 	reformat('INSERT DELAYED HIGH_PRIORITY INTO [anotherTable] VALUES (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL)'),
-	(string) $fluent,
+	(string) $fluent
 );

tests/dibi/Fluent.select.phpt

@@ -25,7 +25,7 @@ $fluent = $conn->select('*')
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d]'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->from('table')->as('table.Alias')
@@ -34,21 +34,21 @@ $fluent->from('table')->as('table.Alias')
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [table] AS [table.Alias] INNER JOIN [table1] ON table.col = table1.col INNER JOIN [table2] ON table.col = table2.col'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->from('anotherTable');
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [table] AS [table.Alias] INNER JOIN [table1] ON table.col = table1.col INNER JOIN [table2] ON table.col = table2.col , [anotherTable]'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->removeClause('from')->from('anotherTable');
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable]'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->as('anotherAlias')
@@ -58,7 +58,7 @@ $fluent->as('anotherAlias')
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable] AS [anotherAlias] INNER JOIN [table3] ON table.col = table3.col'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->where('col > %i', $max)
@@ -71,14 +71,14 @@ $fluent->where('col > %i', $max)
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable] AS [anotherAlias] INNER JOIN [table3] ON table.col = table3.col WHERE col > 10 OR col < 5 AND active = 1 AND [col] IN (1, 2, 3) ORDER BY [val] ASC , [val2] DESC , [val3] DESC'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->orderBy(Dibi\Fluent::REMOVE);
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable] AS [anotherAlias] INNER JOIN [table3] ON table.col = table3.col WHERE col > 10 OR col < 5 AND active = 1 AND [col] IN (1, 2, 3)'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -86,7 +86,7 @@ $fluent = $conn->select('*')
 	->select(
 		$conn->select('count(*)')
 		->from('precteni')->as('P')
-		->where('P.id_clanku', '=', 'C.id_clanku'),
+		->where('P.id_clanku', '=', 'C.id_clanku')
 	)
 	->from('clanky')->as('C')
 	->where('id_clanku=%i', 123)
@@ -99,7 +99,7 @@ Assert::same(
 		'sqlsrv' => 'SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY',
 		'SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 LIMIT 1',
 	]),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -112,7 +112,7 @@ $fluent = $conn->select('*')
 
 Assert::same(
 	reformat('SELECT * , [x] AS [xAlias] FROM [products] INNER JOIN [orders] USING (product_id) INNER JOIN [customers] USING ([customer_id]) INNER JOIN [items] USING ([customer_id], [order_id])'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -124,7 +124,7 @@ $fluent = $conn->command()->select()
 
 Assert::same(
 	reformat('SELECT * FROM [products] INNER JOIN [orders] USING (product_id)'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -138,7 +138,7 @@ Assert::same(
 		'sqlsrv' => "SELECT * FROM [me] AS [t] WHERE col > 10 AND ([x] = N'a') AND (b) AND (c)",
 		"SELECT * FROM [me] AS [t] WHERE col > 10 AND ([x] = 'a') AND (b) AND (c)",
 	]),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -147,9 +147,9 @@ if ($config['system'] === 'mysql') {
 		->limit(' 1; DROP TABLE users')
 		->offset(' 1; DROP TABLE users');
 
-	Assert::exception(function () use ($fluent) {
+	Assert::error(function () use ($fluent) {
 		(string) $fluent;
-	}, Dibi\Exception::class, "Expected number, ' 1; DROP TABLE users' given.");
+	}, E_USER_ERROR, "Expected number, ' 1; DROP TABLE users' given.");
 }
 
 
@@ -158,5 +158,5 @@ $fluent = $conn->select('*')->from('abc')
 
 Assert::same(
 	reformat('SELECT * FROM [abc] WHERE x IN ((SELECT [id] FROM [xyz]))'),
-	(string) $fluent,
+	(string) $fluent
 );

tests/dibi/Fluent.update.phpt

@@ -21,14 +21,14 @@ $fluent = $conn->update('table', $arr)
 
 Assert::same(
 	reformat('UPDATE IGNORE DELAYED [table] SET [title]=\'Super Product\', [price]=12, [brand]=NULL'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 $fluent->set(['another' => 123]);
 
 Assert::same(
 	reformat('UPDATE IGNORE DELAYED [table] SET [title]=\'Super Product\', [price]=12, [brand]=NULL , [another]=123'),
-	(string) $fluent,
+	(string) $fluent
 );
 
 
@@ -40,5 +40,5 @@ $arr = [
 $fluent = $conn->update(['table1', 'table2'], $arr);
 Assert::same(
 	reformat('UPDATE [table1], [table2] SET [table1].[title]=\'Super Product\', [table2].[price]=12, [table2].[brand]=NULL'),
-	(string) $fluent,
+	(string) $fluent
 );

tests/dibi/HashMap.phpt

@@ -6,7 +6,9 @@ use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
-$hash = new Dibi\HashMap(fn($v) => "b-$v-e");
+$hash = new Dibi\HashMap(function ($v) {
+	return "b-$v-e";
+});
 
 Assert::same('b-X-e', $hash->{'X'});
 Assert::same('b--e', $hash->{''});

tests/dibi/Result.meta.phpt

@@ -28,14 +28,14 @@ Assert::same(4, $res->getColumnCount());
 
 Assert::same(
 	['product_id', 'order_id', 'name', 'xXx'],
-	$info->getColumnNames(),
+	$info->getColumnNames()
 );
 
 
 if (!in_array($config['driver'], ['sqlite', 'sqlite3', 'pdo', 'sqlsrv'], true)) {
 	Assert::same(
 		['products.product_id', 'orders.order_id', 'customers.name', 'xXx'],
-		$info->getColumnNames(true),
+		$info->getColumnNames(true)
 	);
 }
 

tests/dibi/Sqlsrv.insert.phpt

@@ -25,7 +25,7 @@ $conn->query(
 	'CREATE TRIGGER %n ON %n AFTER INSERT AS INSERT INTO %n DEFAULT VALUES',
 	'UpdAAB',
 	'aab',
-	'aaa',
+	'aaa'
 );
 
 $conn->query('INSERT INTO %n DEFAULT VALUES', 'aab');

tests/dibi/Sqlsrv.limits.phpt

@@ -21,19 +21,19 @@ $tests = function ($conn) {
 		// Limit and offset
 		Assert::same(
 			'SELECT 1 OFFSET 10 ROWS FETCH NEXT 10 ROWS ONLY',
-			$conn->translate('SELECT 1 %ofs %lmt', 10, 10),
+			$conn->translate('SELECT 1 %ofs %lmt', 10, 10)
 		);
 
 		// Limit only
 		Assert::same(
 			'SELECT 1 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
-			$conn->translate('SELECT 1 %lmt', 10),
+			$conn->translate('SELECT 1 %lmt', 10)
 		);
 
 		// Offset only
 		Assert::same(
 			'SELECT 1 OFFSET 10 ROWS',
-			$conn->translate('SELECT 1 %ofs', 10),
+			$conn->translate('SELECT 1 %ofs', 10)
 		);
 
 		// Offset invalid
@@ -42,7 +42,7 @@ $tests = function ($conn) {
 				$conn->translate('SELECT 1 %ofs', -10);
 			},
 			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
+			'Negative offset or limit.'
 		);
 
 		// Limit invalid
@@ -51,7 +51,7 @@ $tests = function ($conn) {
 				$conn->translate('SELECT 1 %lmt', -10);
 			},
 			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
+			'Negative offset or limit.'
 		);
 
 		// Limit invalid, offset valid
@@ -60,7 +60,7 @@ $tests = function ($conn) {
 				$conn->translate('SELECT 1 %ofs %lmt', 10, -10);
 			},
 			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
+			'Negative offset or limit.'
 		);
 
 		// Limit valid, offset invalid
@@ -69,23 +69,22 @@ $tests = function ($conn) {
 				$conn->translate('SELECT 1 %ofs %lmt', -10, 10);
 			},
 			Dibi\NotSupportedException::class,
-			'Negative offset or limit.',
+			'Negative offset or limit.'
 		);
 	} else {
 		Assert::same(
 			'SELECT TOP (1) * FROM (SELECT 1) t',
-			$conn->translate('SELECT 1 %lmt', 1),
+			$conn->translate('SELECT 1 %lmt', 1)
 		);
 
 		Assert::same(
 			'SELECT 1',
-			$conn->translate('SELECT 1 %lmt', -10),
+			$conn->translate('SELECT 1 %lmt', -10)
 		);
 
-		Assert::exception(
+		Assert::exception(function () {
-			$conn->translate('SELECT 1 %ofs %lmt', 10, 10),
+			$conn->translate('SELECT 1 %ofs %lmt', 10, 10);
-			Dibi\NotSupportedException::class,
+		}, Dibi\NotSupportedException::class);
-		);
 	}
 };
 

tests/dibi/Translator.conditions.phpt

@@ -27,8 +27,8 @@ FROM [customers]
 		isset($name),
 		'WHERE [name] LIKE %s',
 		'xxx',
-		'%end',
+		'%end'
-	),
+	)
 );
 
 
@@ -42,8 +42,8 @@ FROM  [customers] /* ... */'),
 SELECT *
 FROM %if',
 		true,
-		'[customers] %else [products]',
+		'[customers] %else [products]'
-	),
+	)
 );
 
 
@@ -62,7 +62,7 @@ FROM [people]
 WHERE [id] > 0
 	%if', false, 'AND [foo]=%i', 1, '
 	%else %if', true, 'AND [bar]=%i', 1, '
-'),
+')
 );
 
 
@@ -97,8 +97,8 @@ WHERE
 		%if',
 		false,
 		'AND [admin]=1 %end
-	%else 1 LIMIT 10 %end',
+	%else 1 LIMIT 10 %end'
-	),
+	)
 );
 
 
@@ -113,6 +113,6 @@ Assert::same(
 		3,
 		'%ofs',
 		5,
-		'%end',
+		'%end'
-	),
+	)
 );

tests/dibi/Translator.identifiers.phpt

@@ -15,35 +15,35 @@ $conn = new Dibi\Connection($config);
 
 Assert::same(
 	reformat('SELECT * FROM where WHERE select < 2'),
-	$conn->translate('SELECT * FROM where WHERE select < 2'),
+	$conn->translate('SELECT * FROM where WHERE select < 2')
 );
 
 
 Assert::same(
 	reformat('SELECT * FROM [where] WHERE where.select < 2'),
-	$conn->translate('SELECT * FROM [where] WHERE where.select < 2'),
+	$conn->translate('SELECT * FROM [where] WHERE where.select < 2')
 );
 
 
 Assert::same(
 	reformat('SELECT * FROM [where] WHERE [where].[select] < 2'),
-	$conn->translate('SELECT * FROM [where] WHERE [where.select] < 2'),
+	$conn->translate('SELECT * FROM [where] WHERE [where.select] < 2')
 );
 
 
 Assert::same(
 	reformat('SELECT * FROM [where] as [temp] WHERE [temp].[select] < 2'),
-	$conn->translate('SELECT * FROM [where] as [temp] WHERE [temp.select] < 2'),
+	$conn->translate('SELECT * FROM [where] as [temp] WHERE [temp.select] < 2')
 );
 
 
 Assert::same(
 	reformat('SELECT * FROM [where] WHERE [quot\'n\' space] > 2'),
-	$conn->translate("SELECT * FROM [where] WHERE [quot'n' space] > 2"),
+	$conn->translate("SELECT * FROM [where] WHERE [quot'n' space] > 2")
 );
 
 
 Assert::same(
 	reformat('SELECT * FROM [where] WHERE [where].[quot\'n\' space] > 2'),
-	$conn->translate("SELECT * FROM [where] WHERE [where.quot'n' space] > 2"),
+	$conn->translate("SELECT * FROM [where] WHERE [where.quot'n' space] > 2")
 );

tests/dibi/Translator.phpt

@@ -23,7 +23,7 @@ Assert::same(
 	$conn->translate('REPLACE INTO [products]', [
 		'title' => 'Drticka',
 		'price' => 318,
-	]),
+	])
 );
 
 
@@ -38,7 +38,7 @@ Assert::same(
 		'sqlsrv' => "INSERT INTO [products] ([title], [price], [brand]) VALUES (N'Super Product', 12, NULL) , (N'Super Product', 12, NULL) , (N'Super Product', 12, NULL)",
 		"INSERT INTO [products] ([title], [price], [brand]) VALUES ('Super Product', 12, NULL) , ('Super Product', 12, NULL) , ('Super Product', 12, NULL)",
 	]),
-	$conn->translate('INSERT INTO [products]', $array, $array, $array),
+	$conn->translate('INSERT INTO [products]', $array, $array, $array)
 );
 
 
@@ -53,7 +53,7 @@ Assert::same(
 		'sqlsrv' => "INSERT INTO [products]  ([pole], [bit]) VALUES (N'hodnota1', 1) , (N'hodnota2', 1) , (N'hodnota3', 1)",
 		"INSERT INTO [products]  ([pole], [bit]) VALUES ('hodnota1', 1) , ('hodnota2', 1) , ('hodnota3', 1)",
 	]),
-	$conn->translate('INSERT INTO [products] %ex', $array),
+	$conn->translate('INSERT INTO [products] %ex', $array)
 );
 
 
@@ -66,7 +66,7 @@ Assert::same(
 	$conn->translate('UPDATE [colors] SET', [
 		'color' => 'blue',
 		'order' => 12,
-	], 'WHERE [id]=%i', 123),
+	], 'WHERE [id]=%i', 123)
 );
 
 
@@ -74,20 +74,20 @@ Assert::same(
 $array = [1, 2, 3];
 Assert::same(
 	reformat('SELECT * FROM [people] WHERE [id] IN ( 1, 2, 3 )'),
-	$conn->translate('SELECT * FROM [people] WHERE [id] IN (', $array, ')'),
+	$conn->translate('SELECT * FROM [people] WHERE [id] IN (', $array, ')')
 );
 
 
 // long numbers
 Assert::same(
 	reformat('SELECT -123456789123456789123456789'),
-	$conn->translate('SELECT %i', '-123456789123456789123456789'),
+	$conn->translate('SELECT %i', '-123456789123456789123456789')
 );
 
 // long float numbers
 Assert::same(
 	reformat('SELECT -.12345678912345678912345678e10'),
-	$conn->translate('SELECT %f', '-.12345678912345678912345678e10'),
+	$conn->translate('SELECT %f', '-.12345678912345678912345678e10')
 );
 
 // invalid input
@@ -101,7 +101,7 @@ Assert::same(
 		'sqlsrv' => "SELECT * FROM [table] WHERE id=10 AND name=N'ahoj'",
 		"SELECT * FROM [table] WHERE id=10 AND name='ahoj'",
 	]),
-	$conn->translate('SELECT * FROM [table] WHERE id=%i AND name=%s', 10, 'ahoj'),
+	$conn->translate('SELECT * FROM [table] WHERE id=%i AND name=%s', 10, 'ahoj')
 );
 
 Assert::same(
@@ -109,7 +109,7 @@ Assert::same(
 		'sqlsrv' => "TEST ([cond] > 2) OR ([cond2] = N'3') OR (cond3 < RAND())",
 		"TEST ([cond] > 2) OR ([cond2] = '3') OR (cond3 < RAND())",
 	]),
-	$conn->translate('TEST %or', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()']),
+	$conn->translate('TEST %or', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'])
 );
 
 Assert::same(
@@ -117,7 +117,7 @@ Assert::same(
 		'sqlsrv' => "TEST ([cond] > 2) AND ([cond2] = N'3') AND (cond3 < RAND())",
 		"TEST ([cond] > 2) AND ([cond2] = '3') AND (cond3 < RAND())",
 	]),
-	$conn->translate('TEST %and', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()']),
+	$conn->translate('TEST %and', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'])
 );
 
 
@@ -126,7 +126,7 @@ $where[] = '[age] > 20';
 $where[] = '[email] IS NOT NULL';
 Assert::same(
 	reformat('SELECT * FROM [table] WHERE ([age] > 20) AND ([email] IS NOT NULL)'),
-	$conn->translate('SELECT * FROM [table] WHERE %and', $where),
+	$conn->translate('SELECT * FROM [table] WHERE %and', $where)
 );
 
 
@@ -139,14 +139,14 @@ Assert::same(
 		'sqlsrv' => "SELECT * FROM [table] WHERE ([age] IS NULL) AND ([email] = N'ahoj') AND ([id] IN (10, 20, 30))",
 		"SELECT * FROM [table] WHERE ([age] IS NULL) AND ([email] = 'ahoj') AND ([id] IN (10, 20, 30))",
 	]),
-	$conn->translate('SELECT * FROM [table] WHERE %and', $where),
+	$conn->translate('SELECT * FROM [table] WHERE %and', $where)
 );
 
 
 $where = [];
 Assert::same(
 	reformat('SELECT * FROM [table] WHERE 1=1'),
-	$conn->translate('SELECT * FROM [table] WHERE %and', $where),
+	$conn->translate('SELECT * FROM [table] WHERE %and', $where)
 );
 
 
@@ -161,7 +161,7 @@ $order = [
 ];
 Assert::same(
 	reformat('SELECT * FROM [people] ORDER BY [field1] ASC, [field2] DESC, [field3] ASC, [field4] DESC, [field5] ASC, [field6] DESC'),
-	$conn->translate('SELECT * FROM [people] ORDER BY %by', $order),
+	$conn->translate('SELECT * FROM [people] ORDER BY %by', $order)
 );
 
 
@@ -172,7 +172,7 @@ Assert::same(
 		'sqlsrv' => 'SELECT * FROM [products] OFFSET 0 ROWS FETCH NEXT 2 ROWS ONLY',
 		'SELECT * FROM [products] LIMIT 2',
 	]),
-	$conn->translate('SELECT * FROM [products] %lmt', 2),
+	$conn->translate('SELECT * FROM [products] %lmt', 2)
 );
 
 if ($config['system'] === 'odbc') {
@@ -186,7 +186,7 @@ if ($config['system'] === 'odbc') {
 			'sqlsrv' => 'SELECT * FROM [products] OFFSET 1 ROWS FETCH NEXT 2 ROWS ONLY',
 			'SELECT * FROM [products] LIMIT 2 OFFSET 1',
 		]),
-		$conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1),
+		$conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1)
 	);
 
 	// with offset = 50
@@ -197,7 +197,7 @@ if ($config['system'] === 'odbc') {
 			'sqlsrv' => 'SELECT * FROM [products] OFFSET 50 ROWS',
 			'SELECT * FROM [products] LIMIT -1 OFFSET 50',
 		]),
-		$conn->translate('SELECT * FROM [products] %ofs', 50),
+		$conn->translate('SELECT * FROM [products] %ofs', 50)
 	);
 }
 
@@ -223,7 +223,7 @@ Assert::same(
 		'b8%d' => null,
 		'b9%t' => null,
 		'c1%t' => new DateTime('1212-09-26 16:51:34.0124'),
-	]),
+	])
 );
 
 Assert::exception(function () use ($conn) {
@@ -247,13 +247,13 @@ if ($config['system'] === 'postgre') {
 	$conn->query('SET standard_conforming_strings = off');
 	Assert::same(
 		"SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n\\\\%\\\\_\\\\\\\\''\"%'",
-		$conn->translate($args[0], $args[1], $args[2], $args[3]),
+		$conn->translate($args[0], $args[1], $args[2], $args[3])
 	);
 
 	$conn->query('SET standard_conforming_strings = on');
 	Assert::same(
 		"SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n\\%\\_\\\\''\"%'",
-		$conn->translate($args[0], $args[1], $args[2], $args[3]),
+		$conn->translate($args[0], $args[1], $args[2], $args[3])
 	);
 } elseif ($config['driver'] !== 'sqlite') { // sqlite2
 	Assert::same(
@@ -263,7 +263,7 @@ if ($config['system'] === 'postgre') {
 			'sqlsrv' => "SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\n[%][_]\\''\"%'",
 			"SELECT * FROM products WHERE (title LIKE 'C%' AND title LIKE '%r') OR title LIKE '%a\\n\\%\\_\\\\\\\\\\'\"%'",
 		]),
-		$conn->translate($args[0], $args[1], $args[2], $args[3]),
+		$conn->translate($args[0], $args[1], $args[2], $args[3])
 	);
 }
 
@@ -274,43 +274,38 @@ $e = Assert::exception(function () use ($conn) {
 Assert::same('SELECT **Alone quote**', $e->getSql());
 
 Assert::match(
-	pattern: reformat([
+	reformat([
-		'mysql' => <<<'XX'
+		'mysql' => "SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
-			SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+CONCAT(last_name, ', ', first_name) AS full_name
-			CONCAT(last_name, ', ', first_name) AS full_name
+GROUP BY `user`
-			GROUP BY `user`
+HAVING MAX(salary) > %i 123
-			HAVING MAX(salary) > %i 123
+INTO OUTFILE '/tmp/result\\'.txt'
-			INTO OUTFILE '/tmp/result\'.txt'
+FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'
-			FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'
+LINES TERMINATED BY '\\\\n'
-			LINES TERMINATED BY '\\n'
+",
-			XX,
+		'sqlsrv' => "SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
-		'sqlsrv' => <<<'XX'
+CONCAT(last_name, N', ', first_name) AS full_name
-			SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+GROUP BY [user]
-			CONCAT(last_name, N', ', first_name) AS full_name
+HAVING MAX(salary) > %i 123
-			GROUP BY [user]
+INTO OUTFILE N'/tmp/result''.txt'
-			HAVING MAX(salary) > %i 123
+FIELDS TERMINATED BY N',' OPTIONALLY ENCLOSED BY N'\"'
-			INTO OUTFILE N'/tmp/result''.txt'
+LINES TERMINATED BY N'\\n'", "SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
-			FIELDS TERMINATED BY N',' OPTIONALLY ENCLOSED BY N'"'
+CONCAT(last_name, ', ', first_name) AS full_name
-			LINES TERMINATED BY N'\n'
+GROUP BY [user]
-			XX,
+HAVING MAX(salary) > %i 123
-		<<<'XX'
+INTO OUTFILE '/tmp/result''.txt'
-			SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'
-			CONCAT(last_name, ', ', first_name) AS full_name
+LINES TERMINATED BY '\\n'
-			GROUP BY [user]
+",
-			HAVING MAX(salary) > %i 123
-			INTO OUTFILE '/tmp/result''.txt'
-			FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
-			LINES TERMINATED BY '\n'
-			XX,
 	]),
-	actual: $conn->translate('%sql', 'SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+	$conn->translate('%sql', 'SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
 CONCAT(last_name, ", ", first_name) AS full_name
 GROUP BY [user]
 HAVING MAX(salary) > %i', 123, "
 INTO OUTFILE '/tmp/result''.txt'
 FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'
 LINES TERMINATED BY '\\n'
-"),
+")
 );
 
 
@@ -335,124 +330,114 @@ $array5 = ['RAND()', '[col1] > [col2]'];
 
 
 Assert::match(
-	pattern: reformat([
+	reformat([
-		'mysql' => <<<'XX'
+		'mysql' => "SELECT *
-			SELECT *
+FROM `db`.`table`
-			FROM `db`.`table`
+WHERE (`test`.`a` LIKE '1995-03-01'
-			WHERE (`test`.`a` LIKE '1995-03-01'
+	OR `b1` IN ( 1, 2, 3 )
-				OR `b1` IN ( 1, 2, 3 )
+	OR `b2` IN ('1', '2', '3' )
-				OR `b2` IN ('1', '2', '3' )
+	OR `b3` IN ( )
-				OR `b3` IN ( )
+	OR `b4` IN ( 'one', 'two', 'three' )
-				OR `b4` IN ( 'one', 'two', 'three' )
+	OR `b5` IN (`col1` AS `one`, `col2` AS `two`, `col3` AS `thr.ee` )
-				OR `b5` IN (`col1` AS `one`, `col2` AS `two`, `col3` AS `thr.ee` )
+	OR `b6` IN ('one', 'two', 'thr.ee')
-				OR `b6` IN ('one', 'two', 'thr.ee')
+	OR `b7` IN (NULL)
-				OR `b7` IN (NULL)
+	OR `b8` IN (RAND() `col1` > `col2` )
-				OR `b8` IN (RAND() `col1` > `col2` )
+	OR `b9` IN (RAND(), [col1] > [col2] )
-				OR `b9` IN (RAND(), [col1] > [col2] )
+	OR `b10` IN (  )
-				OR `b10` IN (  )
+	AND `c` = 'embedded \\' string'
-				AND `c` = 'embedded \' string'
+	OR `d`=10
-				OR `d`=10
+	OR `e`=NULL
-				OR `e`=NULL
+	OR `true`= 1
-				OR `true`= 1
+	OR `false`= 0
-				OR `false`= 0
+	OR `str_null`=NULL
-				OR `str_null`=NULL
+	OR `str_not_null`='hello'
-				OR `str_not_null`='hello'
+LIMIT 10",
-			LIMIT 10
+		'sqlsrv' => "SELECT *
-			XX,
+FROM [db].[table]
-		'sqlsrv' => <<<'XX'
+WHERE ([test].[a] LIKE '1995-03-01'
-			SELECT *
+	OR [b1] IN ( 1, 2, 3 )
-			FROM [db].[table]
+	OR [b2] IN (N'1', N'2', N'3' )
-			WHERE ([test].[a] LIKE '1995-03-01'
+	OR [b3] IN ( )
-				OR [b1] IN ( 1, 2, 3 )
+	OR [b4] IN ( N'one', N'two', N'three' )
-				OR [b2] IN (N'1', N'2', N'3' )
+	OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [thr.ee] )
-				OR [b3] IN ( )
+	OR [b6] IN (N'one', N'two', N'thr.ee')
-				OR [b4] IN ( N'one', N'two', N'three' )
+	OR [b7] IN (NULL)
-				OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [thr.ee] )
+	OR [b8] IN (RAND() [col1] > [col2] )
-				OR [b6] IN (N'one', N'two', N'thr.ee')
+	OR [b9] IN (RAND(), [col1] > [col2] )
-				OR [b7] IN (NULL)
+	OR [b10] IN (  )
-				OR [b8] IN (RAND() [col1] > [col2] )
+	AND [c] = N'embedded '' string'
-				OR [b9] IN (RAND(), [col1] > [col2] )
+	OR [d]=10
-				OR [b10] IN (  )
+	OR [e]=NULL
-				AND [c] = N'embedded '' string'
+	OR [true]= 1
-				OR [d]=10
+	OR [false]= 0
-				OR [e]=NULL
+	OR [str_null]=NULL
-				OR [true]= 1
+	OR [str_not_null]=N'hello'
-				OR [false]= 0
+LIMIT 10",
-				OR [str_null]=NULL
+		'postgre' => 'SELECT *
-				OR [str_not_null]=N'hello'
+FROM "db"."table"
-			LIMIT 10
+WHERE ("test"."a" LIKE \'1995-03-01\'
-			XX,
+	OR "b1" IN ( 1, 2, 3 )
-		'postgre' => <<<'XX'
+	OR "b2" IN (\'1\', \'2\', \'3\' )
-			SELECT *
+	OR "b3" IN ( )
-			FROM "db"."table"
+	OR "b4" IN ( \'one\', \'two\', \'three\' )
-			WHERE ("test"."a" LIKE '1995-03-01'
+	OR "b5" IN ("col1" AS "one", "col2" AS "two", "col3" AS "thr.ee" )
-				OR "b1" IN ( 1, 2, 3 )
+	OR "b6" IN (\'one\', \'two\', \'thr.ee\')
-				OR "b2" IN ('1', '2', '3' )
+	OR "b7" IN (NULL)
-				OR "b3" IN ( )
+	OR "b8" IN (RAND() "col1" > "col2" )
-				OR "b4" IN ( 'one', 'two', 'three' )
+	OR "b9" IN (RAND(), [col1] > [col2] )
-				OR "b5" IN ("col1" AS "one", "col2" AS "two", "col3" AS "thr.ee" )
+	OR "b10" IN (  )
-				OR "b6" IN ('one', 'two', 'thr.ee')
+	AND "c" = \'embedded \'\' string\'
-				OR "b7" IN (NULL)
+	OR "d"=10
-				OR "b8" IN (RAND() "col1" > "col2" )
+	OR "e"=NULL
-				OR "b9" IN (RAND(), [col1] > [col2] )
+	OR "true"= TRUE
-				OR "b10" IN (  )
+	OR "false"= FALSE
-				AND "c" = 'embedded '' string'
+	OR "str_null"=NULL
-				OR "d"=10
+	OR "str_not_null"=\'hello\'
-				OR "e"=NULL
+LIMIT 10',
-				OR "true"= TRUE
+		'odbc' => "SELECT *
-				OR "false"= FALSE
+FROM [db].[table]
-				OR "str_null"=NULL
+WHERE ([test].[a] LIKE #03/01/1995#
-				OR "str_not_null"='hello'
+	OR [b1] IN ( 1, 2, 3 )
-			LIMIT 10
+	OR [b2] IN ('1', '2', '3' )
-			XX,
+	OR [b3] IN ( )
-		'odbc' => <<<'XX'
+	OR [b4] IN ( 'one', 'two', 'three' )
-			SELECT *
+	OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [thr.ee] )
-			FROM [db].[table]
+	OR [b6] IN ('one', 'two', 'thr.ee')
-			WHERE ([test].[a] LIKE #03/01/1995#
+	OR [b7] IN (NULL)
-				OR [b1] IN ( 1, 2, 3 )
+	OR [b8] IN (RAND() [col1] > [col2] )
-				OR [b2] IN ('1', '2', '3' )
+	OR [b9] IN (RAND(), [col1] > [col2] )
-				OR [b3] IN ( )
+	OR [b10] IN (  )
-				OR [b4] IN ( 'one', 'two', 'three' )
+	AND [c] = 'embedded '' string'
-				OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [thr.ee] )
+	OR [d]=10
-				OR [b6] IN ('one', 'two', 'thr.ee')
+	OR [e]=NULL
-				OR [b7] IN (NULL)
+	OR [true]= 1
-				OR [b8] IN (RAND() [col1] > [col2] )
+	OR [false]= 0
-				OR [b9] IN (RAND(), [col1] > [col2] )
+	OR [str_null]=NULL
-				OR [b10] IN (  )
+	OR [str_not_null]='hello'
-				AND [c] = 'embedded '' string'
+LIMIT 10",
-				OR [d]=10
+		"SELECT *
-				OR [e]=NULL
+FROM [db].[table]
-				OR [true]= 1
+WHERE ([test].[a] LIKE '1995-03-01'
-				OR [false]= 0
+	OR [b1] IN ( 1, 2, 3 )
-				OR [str_null]=NULL
+	OR [b2] IN ('1', '2', '3' )
-				OR [str_not_null]='hello'
+	OR [b3] IN ( )
-			LIMIT 10
+	OR [b4] IN ( 'one', 'two', 'three' )
-			XX,
+	OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [thr.ee] )
-		<<<'XX'
+	OR [b6] IN ('one', 'two', 'thr.ee')
-			SELECT *
+	OR [b7] IN (NULL)
-			FROM [db].[table]
+	OR [b8] IN (RAND() [col1] > [col2] )
-			WHERE ([test].[a] LIKE '1995-03-01'
+	OR [b9] IN (RAND(), [col1] > [col2] )
-				OR [b1] IN ( 1, 2, 3 )
+	OR [b10] IN (  )
-				OR [b2] IN ('1', '2', '3' )
+	AND [c] = 'embedded '' string'
-				OR [b3] IN ( )
+	OR [d]=10
-				OR [b4] IN ( 'one', 'two', 'three' )
+	OR [e]=NULL
-				OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [thr.ee] )
+	OR [true]= 1
-				OR [b6] IN ('one', 'two', 'thr.ee')
+	OR [false]= 0
-				OR [b7] IN (NULL)
+	OR [str_null]=NULL
-				OR [b8] IN (RAND() [col1] > [col2] )
+	OR [str_not_null]='hello'
-				OR [b9] IN (RAND(), [col1] > [col2] )
+LIMIT 10",
-				OR [b10] IN (  )
-				AND [c] = 'embedded '' string'
-				OR [d]=10
-				OR [e]=NULL
-				OR [true]= 1
-				OR [false]= 0
-				OR [str_null]=NULL
-				OR [str_not_null]='hello'
-			LIMIT 10
-			XX,
 	]),
-	actual: $conn->translate('SELECT *
+	$conn->translate('SELECT *
 FROM [db.table]
 WHERE ([test.a] LIKE %d', '1995-03-01', '
 	OR [b1] IN (', $array1, ')
@@ -472,7 +457,7 @@ WHERE ([test.a] LIKE %d', '1995-03-01', '
 	OR [false]=', false, '
 	OR [str_null]=%sn', '', '
 	OR [str_not_null]=%sn', 'hello', '
-LIMIT 10'),
+LIMIT 10')
 );
 
 
@@ -481,19 +466,19 @@ Assert::same(
 		'sqlsrv' => "TEST  [cond] > 2 [cond2] = N'3' cond3 < RAND() 123",
 		"TEST  [cond] > 2 [cond2] = '3' cond3 < RAND() 123",
 	]),
-	$conn->translate('TEST %ex', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'], 123),
+	$conn->translate('TEST %ex', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'], 123)
 );
 
 
 Assert::same(
 	reformat('TEST ([cond] > 2) OR ([cond2] > 3) OR ([cond3] = 10 + 1)'),
-	$conn->translate('TEST %or', ['`cond` > 2', ['[cond2] > %i', '3'], 'cond3%sql' => ['10 + 1']]),
+	$conn->translate('TEST %or', ['`cond` > 2', ['[cond2] > %i', '3'], 'cond3%sql' => ['10 + 1']])
 );
 
 
 Assert::same(
 	reformat('TEST ([cond] = 2) OR ([cond3] = RAND())'),
-	$conn->translate('TEST %or', ['cond' => 2, 'cond3%sql' => 'RAND()']),
+	$conn->translate('TEST %or', ['cond' => 2, 'cond3%sql' => 'RAND()'])
 );
 
 
@@ -502,7 +487,7 @@ Assert::same(
 		'sqlsrv' => "TEST ([cond1] 3) OR ([cond2] RAND()) OR ([cond3] LIKE N'string')",
 		"TEST ([cond1] 3) OR ([cond2] RAND()) OR ([cond3] LIKE 'string')",
 	]),
-	$conn->translate('TEST %or', ['cond1%ex' => 3, 'cond2%ex' => 'RAND()', 'cond3%ex' => ['LIKE %s', 'string']]),
+	$conn->translate('TEST %or', ['cond1%ex' => 3, 'cond2%ex' => 'RAND()', 'cond3%ex' => ['LIKE %s', 'string']])
 );
 
 
@@ -512,7 +497,7 @@ Assert::same(
 		'sqlsrv' => 'SELECT * FROM [test] WHERE [id] LIKE N\'%d%t\' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
 		'SELECT * FROM [test] WHERE [id] LIKE \'%d%t\' LIMIT 10',
 	]),
-	$conn->translate("SELECT * FROM [test] WHERE %n LIKE '%d%t' %lmt", 'id', 10),
+	$conn->translate("SELECT * FROM [test] WHERE %n LIKE '%d%t' %lmt", 'id', 10)
 );
 
 
@@ -521,13 +506,13 @@ $where = [
 ];
 Assert::same(
 	reformat('SELECT * FROM [tablename] WHERE ([tablename].[column] = 1)'),
-	$conn->translate('SELECT * FROM [tablename] WHERE %and', $where),
+	$conn->translate('SELECT * FROM [tablename] WHERE %and', $where)
 );
 
 
 Assert::same(
 	reformat('SELECT FROM ...'),
-	$conn->translate('SELECT FROM ... %lmt', null),
+	$conn->translate('SELECT FROM ... %lmt', null)
 );
 
 Assert::same(
@@ -535,7 +520,7 @@ Assert::same(
 		'sqlsrv' => "SELECT N'%i'",
 		"SELECT '%i'",
 	]),
-	$conn->translate("SELECT '%i'"),
+	$conn->translate("SELECT '%i'")
 );
 
 Assert::same(
@@ -543,7 +528,7 @@ Assert::same(
 		'sqlsrv' => "SELECT N'%i'",
 		"SELECT '%i'",
 	]),
-	$conn->translate('SELECT "%i"'),
+	$conn->translate('SELECT "%i"')
 );
 
 
@@ -558,7 +543,7 @@ Assert::same(
 	], [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
-	]),
+	])
 );
 
 Assert::same(
@@ -569,7 +554,7 @@ Assert::same(
 	$conn->translate('UPDATE [products]', [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
-	]),
+	])
 );
 
 Assert::same(
@@ -580,7 +565,7 @@ Assert::same(
 	$conn->translate('UPDATE [products]', [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
-	]),
+	])
 );
 
 Assert::same(
@@ -591,7 +576,7 @@ Assert::same(
 	$conn->translate('SELECT * FROM [products] WHERE', [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
-	]),
+	])
 );
 
 
@@ -603,7 +588,7 @@ Assert::same(
 			'top' => 2,
 		]),
 		new Dibi\Expression('number < %i', 100),
-	]),
+	])
 );
 
 
@@ -628,7 +613,7 @@ Assert::same(
 		'sqlsrv' => "INSERT INTO test ([id], [text], [num]) VALUES (1, N'ahoj', 1), (2, N'jak', -1), (3, N'se', 10), (4, SUM(5), 1)",
 		"INSERT INTO test ([id], [text], [num]) VALUES (1, 'ahoj', 1), (2, 'jak', -1), (3, 'se', 10), (4, SUM(5), 1)",
 	]),
-	$conn->translate('INSERT INTO test %m', $array6),
+	$conn->translate('INSERT INTO test %m', $array6)
 );
 
 
@@ -639,12 +624,12 @@ $by = [
 
 Assert::same(
 	reformat('SELECT * FROM table ORDER BY funkce(nazev_pole) ASC, [jine_pole] DESC'),
-	$conn->translate('SELECT * FROM table ORDER BY %by', $by),
+	$conn->translate('SELECT * FROM table ORDER BY %by', $by)
 );
 
 Assert::same(
 	reformat('INSERT INTO [test].*'),
-	$conn->translate('INSERT INTO [test.*]'),
+	$conn->translate('INSERT INTO [test.*]')
 );
 
 Assert::exception(function () use ($conn) {
@@ -658,23 +643,23 @@ Assert::exception(function () use ($conn) {
 
 Assert::same(
 	reformat('SELECT * FROM table'),
-	$conn->translate('SELECT', new Dibi\Literal('* FROM table')),
+	$conn->translate('SELECT', new Dibi\Literal('* FROM table'))
 );
 
 Assert::same(
 	reformat('SELECT * FROM table'),
-	$conn->translate('SELECT %SQL', new Dibi\Literal('* FROM table')),
+	$conn->translate('SELECT %SQL', new Dibi\Literal('* FROM table'))
 );
 
 Assert::same(
 	reformat('SELECT * FROM table'),
-	$conn->translate(new Dibi\Literal('SELECT * FROM table')),
+	$conn->translate(new Dibi\Literal('SELECT * FROM table'))
 );
 
 
 Assert::same(
 	reformat('SELECT [a].[b] AS [c.d]'),
-	$conn->translate('SELECT %n AS %N', 'a.b', 'c.d'),
+	$conn->translate('SELECT %n AS %N', 'a.b', 'c.d')
 );
 
 
@@ -692,5 +677,5 @@ Assert::same(
 		'spec2%f' => 1000.00,
 		'spec3%i' => 10000,
 		'spec4' => 10000,
-	], 'WHERE [price]=%f', 123.5),
+	], 'WHERE [price]=%f', 123.5)
 );

tests/dibi/data/mysql.sql

@@ -1,7 +1,8 @@
-DROP TABLE IF EXISTS `orders`;
+DROP DATABASE IF EXISTS dibi_test;
-DROP TABLE IF EXISTS `products`;
+CREATE DATABASE dibi_test;
-DROP TABLE IF EXISTS `customers`;
+USE dibi_test;
 
+DROP TABLE IF EXISTS `products`;
 CREATE TABLE `products` (
 	`product_id` int(11) NOT NULL AUTO_INCREMENT,
 	`title` varchar(100) NOT NULL,
@@ -14,6 +15,7 @@ INSERT INTO `products` (`product_id`, `title`) VALUES
 (3, 'Computer'),
 (2, 'Table');
 
+DROP TABLE IF EXISTS `customers`;
 CREATE TABLE `customers` (
 	`customer_id` int(11) NOT NULL AUTO_INCREMENT,
 	`name` varchar(100) NOT NULL,
@@ -28,6 +30,7 @@ INSERT INTO `customers` (`customer_id`, `name`) VALUES
 (5, 'Kryten'),
 (6, 'Kristine Kochanski');
 
+DROP TABLE IF EXISTS `orders`;
 CREATE TABLE `orders` (
 	`order_id` int(11) NOT NULL AUTO_INCREMENT,
 	`customer_id` int(11) NOT NULL,

tests/dibi/meta.phpt

@@ -19,11 +19,12 @@ try {
 	Tester\Environment::skip($e->getMessage());
 }
 
-$tableNames = $meta->getTableNames();
+if ($config['system'] !== 'sqlsrv') {
-Assert::true(in_array('customers', $tableNames, true));
+	Assert::same(3, count($meta->getTables()));
-Assert::true(in_array('orders', $tableNames, true));
+	$names = $meta->getTableNames();
-Assert::true(in_array('products', $tableNames, true));
+	sort($names);
-
+	Assert::equal(['customers', 'orders', 'products'], $names);
+}
 
 Assert::false($meta->hasTable('xxxx'));
 

tests/dibi/mysql.time.phpt

@@ -12,6 +12,7 @@ require __DIR__ . '/bootstrap.php';
 
 $conn = new Dibi\Connection($config);
 
+$conn->query('USE dibi_test');
 $conn->query('DROP TABLE IF EXISTS timetest');
 $conn->query('CREATE TABLE timetest (col TIME NOT NULL) ENGINE=InnoDB');
 $conn->query('INSERT INTO timetest VALUES ("12:30:40")');