added typehint [Closes #443 ]

2025-09-04 03:35:26 +02:00 · 2023-09-29 15:45:31 +02:00
112 changed files with 3085 additions and 2750 deletions
--- a/.github/workflows/coding-style.yml
+++ b/.github/workflows/coding-style.yml
@@ -7,10 +7,10 @@ jobs:
        name: Nette Code Checker
        runs-on: ubuntu-latest
        steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
            - uses: shivammathur/setup-php@v2
              with:
-                  php-version: 8.3
+                  php-version: 8.0
                  coverage: none

            - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
@@ -21,10 +21,10 @@ jobs:
        name: Nette Coding Standard
        runs-on: ubuntu-latest
        steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
            - uses: shivammathur/setup-php@v2
              with:
-                  php-version: 8.3
+                  php-version: 8.0
                  coverage: none

            - run: composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -10,10 +10,10 @@ jobs:
        name: PHPStan
        runs-on: ubuntu-latest
        steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
            - uses: shivammathur/setup-php@v2
              with:
-                  php-version: 8.2
+                  php-version: 8.0
                  coverage: none

            - run: composer install --no-progress --prefer-dist
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,7 +3,7 @@ name: Tests
 on: [push, pull_request]

 env:
-    php-extensions: mbstring, intl, mysqli, pgsql, sqlsrv-5.12.0, pdo_sqlsrv-5.12.0
+    php-extensions: mbstring, intl, mysqli, pgsql, sqlsrv-5.10.0beta2, pdo_sqlsrv-5.10.0beta2
    php-tools: "composer:v2, pecl"

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

            fail-fast: false

@@ -43,6 +43,7 @@ jobs:
                    --health-retries=5
                    -e MYSQL_ROOT_PASSWORD=root
                    -e MYSQL_DATABASE=dibi_test
+                    --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"

            postgres96:
                image: postgres:9.6
@@ -82,13 +83,13 @@ jobs:
                    - 1433:1433
                options: >-
                    --name=mssql
-                    --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1' -N -C"
+                    --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'"
                    --health-interval 10s
                    --health-timeout 5s
                    --health-retries 5

        steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
            - uses: shivammathur/setup-php@v2
              with:
                  php-version: ${{ matrix.php }}
@@ -100,19 +101,19 @@ jobs:
              run: cp ./tests/databases.github.ini ./tests/databases.ini

            - name: Create MS SQL Database
-              run: docker exec -i mssql /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE dibi_test' -N -C
+              run: docker exec -i mssql /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE dibi_test'

            - run: composer install --no-progress --prefer-dist
            - run: vendor/bin/tester -p phpdbg tests -s -C --coverage ./coverage.xml --coverage-src ./src
            - if: failure()
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v3
              with:
-                  name: output-${{ matrix.php }}
+                  name: output
                  path: tests/**/output


            - name: Save Code Coverage
-              if: ${{ matrix.php == '8.2' }}
+              if: ${{ matrix.php == '8.0' }}
              env:
                  COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
              run: |
--- a/appveyor.yml
+++ b/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
-    - IF EXIST c:\php (SET PHP=0) ELSE (SET PHP=1)
-    - IF %PHP%==1 mkdir c:\php
-    - IF %PHP%==1 cd c:\php
-    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-8.0.1-Win32-vs16-x64.zip --output php.zip
+    # Install PHP 7.2
+    - IF EXIST c:\php7 (SET PHP=0) ELSE (SET PHP=1)
+    - IF %PHP%==1 mkdir c:\php7
+    - IF %PHP%==1 cd c:\php7
+    - 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
--- a/composer.json
+++ b/composer.json
@@ -11,32 +11,27 @@
 		}
 	],
 	"require": {
-		"php": "8.2 - 8.5"
+		"php": ">=7.2"
 	},
 	"require-dev": {
-		"tracy/tracy": "^2.9",
-		"nette/tester": "^2.5",
-		"nette/di": "^3.1",
-		"phpstan/phpstan-nette": "^2.0@stable",
-		"jetbrains/phpstorm-attributes": "^1.0"
+		"tracy/tracy": "~2.2",
+		"nette/tester": "~2.0",
+		"nette/di": "^3.0",
+		"phpstan/phpstan": "^0.12"
 	},
 	"replace": {
 		"dg/dibi": "*"
 	},
 	"autoload": {
-		"classmap": ["src/"],
-		"psr-4": {
-			"Dibi\\": "src/Dibi"
-		}
+		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev",
 	"scripts": {
 		"phpstan": "phpstan analyse",
 		"tester": "tester tests -s"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "6.0-dev"
+			"dev-master": "4.2-dev"
 		}
 	}
 }
--- a/examples/query-language-and-conditions.php
+++ b/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

--- a/examples/query-language-basic-examples.php
+++ b/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 )

--- a/examples/result-set-data-types.php
+++ b/examples/result-set-data-types.php
@@ -27,9 +27,9 @@ $dibi = new Dibi\Connection([
 // using manual hints
 $res = $dibi->query('SELECT * FROM [customers]');

-$res->setType('customer_id', Type::Integer)
-	->setType('added', Type::DateTime)
-	->setFormat(Type::DateTime, 'Y-m-d H:i:s');
+$res->setType('customer_id', Type::INTEGER)
+	->setType('added', Type::DATETIME)
+	->setFormat(Type::DATETIME, 'Y-m-d H:i:s');


 Tracy\Dumper::dump($res->fetch());
--- a/examples/using-datetime.php
+++ b/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')
--- a/examples/using-substitutions.php
+++ b/examples/using-substitutions.php
@@ -45,7 +45,7 @@ function substFallBack($expr)


 // define callback
-$dibi->getSubstitutes()->setCallback(substFallBack(...));
+$dibi->getSubstitutes()->setCallback('substFallBack');

 // define substitutes as constants
 define('SUBST_ACCOUNT', 'eshop_');
@@ -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
--- a/readme.md
+++ b/readme.md
@@ -34,7 +34,7 @@ Install Dibi via Composer:
 composer require dibi/dibi
 ```

-The Dibi 6.0 requires PHP version 8.2 and supports PHP up to 8.5.
+The Dibi 4.2 requires PHP version 7.2 and supports PHP up to 8.3.


 Usage
@@ -608,7 +608,7 @@ $database->query("UPDATE [:blog:items] SET [text]='Hello World'");
 Dibi automatically detects the types of query columns and converts fields them to native PHP types. We can also specify the type manually. You can find the possible types in the `Dibi\Type` class.

 ```php
-$result->setType('id', Dibi\Type::Integer); // id will be integer
+$result->setType('id', Dibi\Type::INTEGER); // id will be integer
 $row = $result->fetch();

 is_int($row->id) // true
@@ -639,7 +639,7 @@ In the configuration file, we will register the DI extensions and add the `dibi`

 ```neon
 extensions:
-	dibi: Dibi\Bridges\Nette\DibiExtension3
+	dibi: Dibi\Bridges\Nette\DibiExtension22

 dibi:
 	host: localhost
--- a/src/Dibi/Bridges/Nette/DibiExtension22.php
+++ b/src/Dibi/Bridges/Nette/DibiExtension22.php
@@ -19,10 +19,17 @@ use Tracy;
 */
 class DibiExtension22 extends Nette\DI\CompilerExtension
 {
-	public function __construct(
-		private ?bool $debugMode = null,
-		private ?bool $cliMode = null,
-	) {
+	/** @var bool|null */
+	private $debugMode;
+
+	/** @var bool|null */
+	private $cliMode;
+
+
+	public function __construct(?bool $debugMode = null, ?bool $cliMode = null)
+	{
+		$this->debugMode = $debugMode;
+		$this->cliMode = $cliMode;
 	}


@@ -59,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']]
 			);
 		}

--- a/src/Dibi/Bridges/Nette/DibiExtension3.php
+++ b/src/Dibi/Bridges/Nette/DibiExtension3.php
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Bridges\Nette;
-
-use Dibi;
-use Nette;
-use Nette\Schema\Expect;
-use Tracy;
-use function is_array;
-
-
-/**
- * Dibi extension for Nette Framework 3. Creates 'connection' & 'panel' services.
- */
-class DibiExtension3 extends Nette\DI\CompilerExtension
-{
-	public function __construct(
-		private ?bool $debugMode = null,
-		private ?bool $cliMode = null,
-	) {
-	}
-
-
-	public function getConfigSchema(): Nette\Schema\Schema
-	{
-		return Expect::structure([
-			'autowired' => Expect::bool(true),
-			'flags' => Expect::anyOf(Expect::arrayOf('string'), Expect::type('dynamic')),
-			'profiler' => Expect::bool(),
-			'explain' => Expect::bool(true),
-			'filter' => Expect::bool(true),
-			'driver' => Expect::string()->dynamic(),
-			'name' => Expect::string()->dynamic(),
-			'lazy' => Expect::bool(false)->dynamic(),
-			'onConnect' => Expect::array()->dynamic(),
-			'substitutes' => Expect::arrayOf('string')->dynamic(),
-			'result' => Expect::structure([
-				'normalize' => Expect::bool(true),
-				'formatDateTime' => Expect::string(),
-				'formatTimeInterval' => Expect::string(),
-				'formatJson' => Expect::string(),
-			])->castTo('array'),
-		])->otherItems(Expect::type('mixed'))
-			->castTo('array');
-	}
-
-
-	public function loadConfiguration()
-	{
-		$container = $this->getContainerBuilder();
-		$config = $this->getConfig();
-		$this->debugMode ??= $container->parameters['debugMode'];
-		$this->cliMode ??= $container->parameters['consoleMode'];
-
-		$useProfiler = $config['profiler'] ?? (class_exists(Tracy\Debugger::class) && $this->debugMode && !$this->cliMode);
-		unset($config['profiler']);
-
-		if (is_array($config['flags'])) {
-			$flags = 0;
-			foreach ((array) $config['flags'] as $flag) {
-				$flags |= constant($flag);
-			}
-			$config['flags'] = $flags;
-		}
-
-		$connection = $container->addDefinition($this->prefix('connection'))
-			->setCreator(Dibi\Connection::class, [$config])
-			->setAutowired($config['autowired']);
-
-		if (class_exists(Tracy\Debugger::class)) {
-			$connection->addSetup(
-				[new Nette\DI\Definitions\Statement('Tracy\Debugger::getBlueScreen'), 'addPanel'],
-				[[Dibi\Bridges\Tracy\Panel::class, 'renderException']],
-			);
-		}
-
-		if ($useProfiler) {
-			$panel = $container->addDefinition($this->prefix('panel'))
-				->setCreator(Dibi\Bridges\Tracy\Panel::class, [
-					$config['explain'],
-					$config['filter'] ? Dibi\Event::QUERY : Dibi\Event::ALL,
-				]);
-			$connection->addSetup([$panel, 'register'], [$connection]);
-		}
-	}
-}
--- a/src/Dibi/Bridges/Nette/config.sample.neon
+++ b/src/Dibi/Bridges/Nette/config.sample.neon
@@ -1,8 +1,8 @@
 # This will create service named 'dibi.connection'.
-# Requires Nette Framework 3 or later
+# Requires Nette Framework 2.2 or later

 extensions:
-	dibi: Dibi\Bridges\Nette\DibiExtension3
+	dibi: Dibi\Bridges\Nette\DibiExtension22

 dibi:
 	host: localhost
--- a/src/Dibi/Bridges/Tracy/Panel.php
+++ b/src/Dibi/Bridges/Tracy/Panel.php
@@ -13,7 +13,6 @@ use Dibi;
 use Dibi\Event;
 use Dibi\Helpers;
 use Tracy;
-use function count, is_string, strlen;


 /**
@@ -21,23 +20,33 @@ use function count, is_string, strlen;
 */
 class Panel implements Tracy\IBarPanel
 {
-	public static int $maxLength = 1000;
+	use Dibi\Strict;

-	private array $events = [];
+	/** @var int maximum SQL length */
+	public static $maxLength = 1000;
+
+	/** @var bool|string  explain queries? */
+	public $explain;
+
+	/** @var int */
+	public $filter;
+
+	/** @var array */
+	private $events = [];


-	public function __construct(
-		public bool|string $explain = true,
-		public int $filter = Event::QUERY,
-	) {
+	public function __construct($explain = true, ?int $filter = null)
+	{
+		$this->filter = $filter ?: Event::QUERY;
+		$this->explain = $explain;
 	}


 	public function register(Dibi\Connection $connection): void
 	{
 		Tracy\Debugger::getBar()->addPanel($this);
-		Tracy\Debugger::getBlueScreen()->addPanel(self::renderException(...));
-		$connection->onEvent[] = $this->logEvent(...);
+		Tracy\Debugger::getBlueScreen()->addPanel([self::class, 'renderException']);
+		$connection->onEvent[] = [$this, 'logEvent'];
 	}


@@ -62,7 +71,7 @@ class Panel implements Tracy\IBarPanel
 		if ($e instanceof Dibi\Exception && $e->getSql()) {
 			return [
 				'tab' => 'SQL',
-				'panel' => Helpers::dump($e->getSql(), return: true),
+				'panel' => Helpers::dump($e->getSql(), true),
 			];
 		}

@@ -118,7 +127,7 @@ class Panel implements Tracy\IBarPanel
 					? $this->explain
 					: ($connection->getConfig('driver') === 'oracle' ? 'EXPLAIN PLAN FOR' : 'EXPLAIN');
 				try {
-					$explain = @Helpers::dump($connection->nativeQuery("$cmd $event->sql"), return: true);
+					$explain = @Helpers::dump($connection->nativeQuery("$cmd $event->sql"), true);
 				} catch (Dibi\Exception $e) {
 				}

@@ -132,7 +141,7 @@ class Panel implements Tracy\IBarPanel
 				$s .= "<br /><a href='#tracy-debug-DibiProfiler-row-$counter' class='tracy-toggle tracy-collapsed' rel='#tracy-debug-DibiProfiler-row-$counter'>explain</a>";
 			}

-			$s .= '</td><td class="tracy-DibiProfiler-sql">' . Helpers::dump(strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql, return: true);
+			$s .= '</td><td class="tracy-DibiProfiler-sql">' . Helpers::dump(strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql, true);
 			if ($explain) {
 				$s .= "<div id='tracy-debug-DibiProfiler-row-$counter' class='tracy-collapsed'>{$explain}</div>";
 			}
@@ -151,8 +160,8 @@ class Panel implements Tracy\IBarPanel
 			#tracy-debug .tracy-DibiProfiler-source { color: #999 !important }
 			#tracy-debug tracy-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
 			<h1>Queries:' . "\u{a0}" . count($this->events)
-				. ($totalTime === null ? '' : ", time:\u{a0}" . number_format($totalTime * 1000, 1, '.', "\u{202f}") . "\u{202f}ms")
-				. ($singleConnection === null ? '' : ', ' . htmlspecialchars($this->getConnectionName($singleConnection))) . '</h1>
+				. ($totalTime === null ? '' : ", time:\u{a0}" . number_format($totalTime * 1000, 1, '.', "\u{202f}") . "\u{202f}ms") . ', '
+				. htmlspecialchars($this->getConnectionName($singleConnection)) . '</h1>
 			<div class="tracy-inner tracy-DibiProfiler">
 			<table class="tracy-sortable">
 				<tr><th>Time&nbsp;ms</th><th>SQL Statement</th><th>Rows</th>' . (!$singleConnection ? '<th>Connection</th>' : '') . '</tr>
@@ -165,7 +174,7 @@ class Panel implements Tracy\IBarPanel
 	private function getConnectionName(Dibi\Connection $connection): string
 	{
 		$driver = $connection->getConfig('driver');
-		return get_debug_type($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') : '');
 	}
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -9,10 +9,7 @@ declare(strict_types=1);

 namespace Dibi;

-use JetBrains\PhpStorm\Language;
 use Traversable;
-use function array_key_exists, is_array, sprintf;
-use const PHP_SAPI;


 /**
@@ -21,35 +18,29 @@ use const PHP_SAPI;
 * @property-read int $affectedRows
 * @property-read int $insertId
 */
-class Connection
+class Connection implements IConnection
 {
-	private const Drivers = [
-		'firebird' => Drivers\Ibase\Connection::class,
-		'mysqli' => Drivers\MySQLi\Connection::class,
-		'odbc' => Drivers\ODBC\Connection::class,
-		'oracle' => Drivers\OCI8\Connection::class,
-		'pdo' => Drivers\PDO\Connection::class,
-		'postgre' => Drivers\PgSQL\Connection::class,
-		'sqlite3' => Drivers\SQLite3\Connection::class,
-		'sqlite' => Drivers\SQLite3\Connection::class,
-		'sqlsrv' => Drivers\SQLSrv\Connection::class,
-	];
+	use Strict;

-	/** function (Event $event); Occurs after query is executed */
-	public ?array $onEvent = [];
-	private array $config;
+	/** @var array of function (Event $event); Occurs after query is executed */
+	public $onEvent = [];
+
+	/** @var array  Current connection configuration */
+	private $config;

 	/** @var string[]  resultset formats */
-	private array $formats;
-	private ?Drivers\Connection $driver = null;
-	private Drivers\Engine $engine;
-	private ?Translator $translator = null;
+	private $formats;

-	/** @var array<string, callable(object): Expression | null> */
-	private array $translators = [];
-	private bool $sortTranslators = false;
-	private HashMap $substitutes;
-	private int $transactionDepth = 0;
+	/** @var Driver|null */
+	private $driver;
+
+	/** @var Translator|null */
+	private $translator;
+
+	/** @var HashMap Substitutes for identifiers */
+	private $substitutes;
+
+	private $transactionDepth = 0;


 	/**
@@ -84,15 +75,15 @@ class Connection
 		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;

 		$this->formats = [
-			Type::Date => $this->config['result']['formatDate'],
-			Type::DateTime => $this->config['result']['formatDateTime'],
+			Type::DATE => $this->config['result']['formatDate'],
+			Type::DATETIME => $this->config['result']['formatDateTime'],
 			Type::JSON => $this->config['result']['formatJson'] ?? 'array',
-			Type::TimeInterval => $this->config['result']['formatTimeInterval'] ?? null,
+			Type::TIME_INTERVAL => $this->config['result']['formatTimeInterval'] ?? null,
 		];

 		// profiler
@@ -102,7 +93,7 @@ class Connection
 			$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;
@@ -135,16 +126,17 @@ class Connection
 	 */
 	final public function connect(): void
 	{
-		if ($this->config['driver'] instanceof Drivers\Connection) {
+		if ($this->config['driver'] instanceof Driver) {
 			$this->driver = $this->config['driver'];
 			$this->translator = new Translator($this);
 			return;

-		} elseif (is_subclass_of($this->config['driver'], Drivers\Connection::class)) {
+		} elseif (is_subclass_of($this->config['driver'], Driver::class)) {
 			$class = $this->config['driver'];

 		} else {
-			$class = self::Drivers[strtolower($this->config['driver'])] ?? throw new Exception("Unknown driver '{$this->config['driver']}'.");
+			$class = preg_replace(['#\W#', '#sql#'], ['_', 'Sql'], ucfirst(strtolower($this->config['driver'])));
+			$class = "Dibi\\Drivers\\{$class}Driver";
 			if (!class_exists($class)) {
 				throw new Exception("Unable to create instance of Dibi driver '$class'.");
 			}
@@ -198,8 +190,9 @@ class Connection
 	/**
 	 * 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
@@ -210,7 +203,7 @@ class Connection
 	/**
 	 * Returns the driver and connects to a database in lazy mode.
 	 */
-	final public function getDriver(): Drivers\Connection
+	final public function getDriver(): Driver
 	{
 		if (!$this->driver) {
 			$this->connect();
@@ -222,9 +215,10 @@ class Connection

 	/**
 	 * Generates (translates) and executes SQL query.
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function query(#[Language('GenericSQL')] mixed ...$args): Result
+	final public function query(...$args): Result
 	{
 		return $this->nativeQuery($this->translate(...$args));
 	}
@@ -232,9 +226,10 @@ class Connection

 	/**
 	 * Generates SQL query.
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function translate(#[Language('GenericSQL')] mixed ...$args): string
+	final public function translate(...$args): string
 	{
 		if (!$this->driver) {
 			$this->connect();
@@ -246,8 +241,9 @@ class Connection

 	/**
 	 * Generates and prints SQL query.
+	 * @param  mixed  ...$args
 	 */
-	final public function test(#[Language('GenericSQL')] mixed ...$args): bool
+	final public function test(...$args): bool
 	{
 		try {
 			Helpers::dump($this->translate(...$args));
@@ -257,7 +253,7 @@ class Connection
 			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;
@@ -267,9 +263,10 @@ class Connection

 	/**
 	 * Generates (translates) and returns SQL query as DataSource.
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function dataSource(#[Language('GenericSQL')] mixed ...$args): DataSource
+	final public function dataSource(...$args): DataSource
 	{
 		return new DataSource($this->translate(...$args), $this);
 	}
@@ -279,7 +276,7 @@ class Connection
 	 * Executes the SQL query.
 	 * @throws Exception
 	 */
-	final public function nativeQuery(#[Language('SQL')] string $sql): Result
+	final public function nativeQuery(string $sql): Result
 	{
 		if (!$this->driver) {
 			$this->connect();
@@ -298,7 +295,7 @@ class Connection
 			throw $e;
 		}

-		$res = $this->createResultSet($res ?: new Drivers\Dummy\Result(max(0, $this->driver->getAffectedRows())));
+		$res = $this->createResultSet($res ?: new Drivers\NoDataResult(max(0, $this->driver->getAffectedRows())));
 		if ($event) {
 			$this->onEvent($event->done($res));
 		}
@@ -432,7 +429,10 @@ class Connection
 	}


-	public function transaction(callable $callback): mixed
+	/**
+	 * @return mixed
+	 */
+	public function transaction(callable $callback)
 	{
 		if ($this->transactionDepth === 0) {
 			$this->begin();
@@ -462,7 +462,7 @@ class Connection
 	/**
 	 * Result set factory.
 	 */
-	public function createResultSet(Drivers\Result $resultDriver): Result
+	public function createResultSet(ResultDriver $resultDriver): Result
 	{
 		return (new Result($resultDriver, $this->config['result']['normalize'] ?? true))
 			->setFormats($this->formats);
@@ -527,77 +527,9 @@ class Connection
 	 */
 	public function substitute(string $value): string
 	{
-		return str_contains($value, ':')
-			? preg_replace_callback('#:([^:\s]*):#', fn(array $m) => $this->substitutes->{$m[1]}, $value)
-			: $value;
-	}
-
-
-	/********************* value objects translation ****************d*g**/
-
-
-	/**
-	 * @param  callable(object): Expression  $translator
-	 */
-	public function setObjectTranslator(callable $translator): void
-	{
-		if (!$translator instanceof \Closure) {
-			$translator = \Closure::fromCallable($translator);
-		}
-
-		$param = (new \ReflectionFunction($translator))->getParameters()[0] ?? null;
-		$type = $param?->getType();
-		$types = match (true) {
-			$type instanceof \ReflectionNamedType => [$type],
-			$type instanceof \ReflectionUnionType => $type->getTypes(),
-			default => throw new Exception('Object translator must have exactly one parameter with class typehint.'),
-		};
-
-		foreach ($types as $type) {
-			if ($type->isBuiltin() || $type->allowsNull()) {
-				throw new Exception("Object translator must have exactly one parameter with non-nullable class typehint, got '$type'.");
-			}
-			$this->translators[$type->getName()] = $translator;
-		}
-		$this->sortTranslators = true;
-	}
-
-
-	public function translateObject(object $object): ?Expression
-	{
-		if ($this->sortTranslators) {
-			$this->translators = array_filter($this->translators);
-			uksort($this->translators, fn($a, $b) => is_subclass_of($a, $b) ? -1 : 1);
-			$this->sortTranslators = false;
-		}
-
-		if (!array_key_exists($object::class, $this->translators)) {
-			$translator = null;
-			foreach ($this->translators as $class => $t) {
-				if ($object instanceof $class) {
-					$translator = $t;
-					break;
-				}
-			}
-			$this->translators[$object::class] = $translator;
-		}
-
-		$translator = $this->translators[$object::class];
-		if ($translator === null) {
-			return null;
-		}
-
-		$result = $translator($object);
-		if (!$result instanceof Expression) {
-			throw new Exception(sprintf(
-				"Object translator for class '%s' returned '%s' but %s expected.",
-				$object::class,
-				get_debug_type($result),
-				Expression::class,
-			));
-		}
-
-		return $result;
+		return strpos($value, ':') === false
+			? $value
+			: preg_replace_callback('#:([^:\s]*):#', function (array $m) { return $this->substitutes->{$m[1]}; }, $value);
 	}


@@ -606,9 +538,10 @@ class Connection

 	/**
 	 * Executes SQL query and fetch result - shortcut for query() & fetch().
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	public function fetch(#[Language('GenericSQL')] mixed ...$args): ?Row
+	public function fetch(...$args): ?Row
 	{
 		return $this->query($args)->fetch();
 	}
@@ -616,10 +549,11 @@ class Connection

 	/**
 	 * Executes SQL query and fetch results - shortcut for query() & fetchAll().
+	 * @param  mixed  ...$args
 	 * @return Row[]|array[]
 	 * @throws Exception
 	 */
-	public function fetchAll(#[Language('GenericSQL')] mixed ...$args): array
+	public function fetchAll(...$args): array
 	{
 		return $this->query($args)->fetchAll();
 	}
@@ -627,9 +561,11 @@ class Connection

 	/**
 	 * Executes SQL query and fetch first column - shortcut for query() & fetchSingle().
+	 * @param  mixed  ...$args
+	 * @return mixed
 	 * @throws Exception
 	 */
-	public function fetchSingle(#[Language('GenericSQL')] mixed ...$args): mixed
+	public function fetchSingle(...$args)
 	{
 		return $this->query($args)->fetchSingle();
 	}
@@ -637,9 +573,10 @@ class Connection

 	/**
 	 * Executes SQL query and fetch pairs - shortcut for query() & fetchPairs().
+	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	public function fetchPairs(#[Language('GenericSQL')] mixed ...$args): array
+	public function fetchPairs(...$args): array
 	{
 		return $this->query($args)->fetchPairs();
 	}
@@ -671,15 +608,6 @@ class Connection
 	}


-	public function getDatabaseEngine(): Drivers\Engine
-	{
-		if (!$this->driver) { // TODO
-			$this->connect();
-		}
-		return $this->engine ??= $this->driver->getReflector();
-	}
-
-
 	/**
 	 * Gets a information about the current database.
 	 */
@@ -689,14 +617,14 @@ class Connection
 			$this->connect();
 		}

-		return new Reflection\Database($this->getDatabaseEngine(), $this->config['database'] ?? null);
+		return new Reflection\Database($this->driver->getReflector(), $this->config['database'] ?? null);
 	}


 	/**
 	 * Prevents unserialization.
 	 */
-	public function __unserialize($_)
+	public function __wakeup()
 	{
 		throw new NotSupportedException('You cannot serialize or unserialize ' . static::class . ' instances.');
 	}
@@ -705,7 +633,7 @@ class Connection
 	/**
 	 * Prevents serialization.
 	 */
-	public function __serialize()
+	public function __sleep()
 	{
 		throw new NotSupportedException('You cannot serialize or unserialize ' . static::class . ' instances.');
 	}
--- a/src/Dibi/DataSource.php
+++ b/src/Dibi/DataSource.php
@@ -9,24 +9,43 @@ declare(strict_types=1);

 namespace Dibi;

-use function func_get_args, is_array, strpbrk;
-

 /**
 * Default implementation of IDataSource.
 */
 class DataSource implements IDataSource
 {
-	private readonly Connection $connection;
-	private readonly string $sql;
-	private ?Result $result = null;
-	private ?int $count = null;
-	private ?int $totalCount = null;
-	private array $cols = [];
-	private array $sorting = [];
-	private array $conds = [];
-	private ?int $offset = null;
-	private ?int $limit = null;
+	use Strict;
+
+	/** @var Connection */
+	private $connection;
+
+	/** @var string */
+	private $sql;
+
+	/** @var Result|null */
+	private $result;
+
+	/** @var int|null */
+	private $count;
+
+	/** @var int|null */
+	private $totalCount;
+
+	/** @var array */
+	private $cols = [];
+
+	/** @var array */
+	private $sorting = [];
+
+	/** @var array */
+	private $conds = [];
+
+	/** @var int|null */
+	private $offset;
+
+	/** @var int|null */
+	private $limit;


 	/**
@@ -35,7 +54,7 @@ class DataSource implements IDataSource
 	public function __construct(string $sql, Connection $connection)
 	{
 		$this->sql = strpbrk($sql, " \t\r\n") === false
-			? $connection->getDatabaseEngine()->escapeIdentifier($sql) // table name
+			? $connection->getDriver()->escapeIdentifier($sql) // table name
 			: '(' . $sql . ') t'; // SQL command
 		$this->connection = $connection;
 	}
@@ -46,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;
@@ -62,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
@@ -76,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;
@@ -92,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;
@@ -142,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();
 	}
@@ -210,19 +229,24 @@ class DataSource implements IDataSource
 	 */
 	public function __toString(): string
 	{
-		return $this->connection->translate(
-			"\nSELECT %n",
-			(empty($this->cols) ? '*' : $this->cols),
-			"\nFROM %SQL",
-			$this->sql,
-			"\n%ex",
-			$this->conds ? ['WHERE %and', $this->conds] : null,
-			"\n%ex",
-			$this->sorting ? ['ORDER BY %by', $this->sorting] : null,
-			"\n%ofs %lmt",
-			$this->offset,
-			$this->limit,
-		);
+		try {
+			return $this->connection->translate(
+				"\nSELECT %n",
+				(empty($this->cols) ? '*' : $this->cols),
+				"\nFROM %SQL",
+				$this->sql,
+				"\n%ex",
+				$this->conds ? ['WHERE %and', $this->conds] : null,
+				"\n%ex",
+				$this->sorting ? ['ORDER BY %by', $this->sorting] : null,
+				"\n%ofs %lmt",
+				$this->offset,
+				$this->limit
+			);
+		} catch (\Throwable $e) {
+			trigger_error($e->getMessage(), E_USER_ERROR);
+			return '';
+		}
 	}


@@ -237,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();
 		}
@@ -253,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());
 		}

--- a/src/Dibi/DateTime.php
+++ b/src/Dibi/DateTime.php
@@ -15,7 +15,12 @@ namespace Dibi;
 */
 class DateTime extends \DateTimeImmutable
 {
-	public function __construct(string|int $time = 'now', ?\DateTimeZone $timezone = null)
+	use Strict;
+
+	/**
+	 * @param  string|int  $time
+	 */
+	public function __construct($time = 'now', ?\DateTimeZone $timezone = null)
 	{
 		$timezone = $timezone ?: new \DateTimeZone(date_default_timezone_get());
 		if (is_numeric($time)) {
--- a/src/Dibi/Drivers/Connection.php
+++ b/src/Dibi/Drivers/Connection.php
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers;
-
-use Dibi\DriverException;
-use Dibi\Exception;
-
-
-/**
- * Database connection driver.
- */
-interface Connection
-{
-	/**
-	 * Disconnects from a database.
-	 * @throws Exception
-	 */
-	function disconnect(): void;
-
-	/**
-	 * Internal: Executes the SQL query.
-	 * @throws DriverException
-	 */
-	function query(string $sql): ?Result;
-
-	/**
-	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 */
-	function getAffectedRows(): ?int;
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 */
-	function getInsertId(?string $sequence): ?int;
-
-	/**
-	 * Begins a transaction (if supported).
-	 * @throws DriverException
-	 */
-	function begin(?string $savepoint = null): void;
-
-	/**
-	 * Commits statements in a transaction.
-	 * @throws DriverException
-	 */
-	function commit(?string $savepoint = null): void;
-
-	/**
-	 * Rollback changes in a transaction.
-	 * @throws DriverException
-	 */
-	function rollback(?string $savepoint = null): void;
-
-	/**
-	 * Returns the connection resource.
-	 */
-	function getResource(): mixed;
-
-	/**
-	 * Returns the connection reflector.
-	 */
-	function getReflector(): Engine;
-
-	/**
-	 * Encodes data for use in a SQL statement.
-	 */
-	function escapeText(string $value): string;
-
-	function escapeBinary(string $value): string;
-}
--- a/src/Dibi/Drivers/Dummy/Connection.php
+++ b/src/Dibi/Drivers/Dummy/Connection.php
@@ -7,23 +7,24 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Dummy;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;


 /**
 * The dummy driver for testing purposes.
 */
-class Connection implements Drivers\Connection, Drivers\Result, Drivers\Engine
+class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 {
+	use Dibi\Strict;
+
 	public function disconnect(): void
 	{
 	}


-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		return null;
 	}
@@ -56,7 +57,7 @@ class Connection implements Drivers\Connection, Drivers\Result, Drivers\Engine
 	}


-	public function getResource(): mixed
+	public function getResource()
 	{
 		return null;
 	}
@@ -65,7 +66,7 @@ class Connection implements Drivers\Connection, Drivers\Result, Drivers\Engine
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
 		return $this;
 	}
@@ -170,9 +171,8 @@ class Connection implements Drivers\Connection, Drivers\Result, Drivers\Engine
 	}


-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
-		return null;
 	}


--- a/src/Dibi/Drivers/Engine.php
+++ b/src/Dibi/Drivers/Engine.php
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers;
-
-
-/**
- * Engine-specific behaviors.
- */
-interface Engine
-{
-	function escapeIdentifier(string $value): string;
-
-	function escapeBool(bool $value): string;
-
-	function escapeDate(\DateTimeInterface $value): string;
-
-	function escapeDateTime(\DateTimeInterface $value): string;
-
-	function escapeDateInterval(\DateInterval $value): string;
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	function escapeLike(string $value, int $pos): string;
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
-
-	/**
-	 * Returns list of tables.
-	 * @return array of {name [, (bool) view ]}
-	 */
-	function getTables(): array;
-
-	/**
-	 * Returns metadata for all columns in a table.
-	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
-	 */
-	function getColumns(string $table): array;
-
-	/**
-	 * Returns metadata for all indexes in a table.
-	 * @return array of {name, (array of names) columns [, (bool) unique, (bool) primary ]}
-	 */
-	function getIndexes(string $table): array;
-
-	/**
-	 * Returns metadata for all foreign keys in a table.
-	 */
-	function getForeignKeys(string $table): array;
-}
--- a/src/Dibi/Drivers/Engines/OracleEngine.php
+++ b/src/Dibi/Drivers/Engines/OracleEngine.php
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers\Engines;
-
-use Dibi;
-use Dibi\Drivers\Connection;
-use Dibi\Drivers\Engine;
-
-
-/**
- * The reflector for Oracle database.
- */
-class OracleEngine implements Engine
-{
-	public function __construct(
-		private readonly Connection $driver,
-	) {
-	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		// @see http://download.oracle.com/docs/cd/B10500_01/server.920/a96540/sql_elements9a.htm
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $this->nativeDate // TODO
-			? "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')"
-			: $value->format('U');
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $this->nativeDate // TODO
-			? "to_date('" . $value->format('Y-m-d G:i:s') . "', 'YYYY-mm-dd hh24:mi:ss')"
-			: $value->format('U');
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
-		$value = str_replace("'", "''", $value);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($offset) {
-			// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
-			$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
-				. ($limit !== null ? 'WHERE ROWNUM <= ' . ($offset + $limit) : '')
-				. ') WHERE "__rnum" > ' . $offset;
-
-		} elseif ($limit !== null) {
-			$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
-		}
-	}
-
-
-	/**
-	 * Returns list of tables.
-	 */
-	public function getTables(): array
-	{
-		$res = $this->driver->query('SELECT * FROM cat');
-		$tables = [];
-		while ($row = $res->fetch(false)) {
-			if ($row[1] === 'TABLE' || $row[1] === 'VIEW') {
-				$tables[] = [
-					'name' => $row[0],
-					'view' => $row[1] === 'VIEW',
-				];
-			}
-		}
-
-		return $tables;
-	}
-
-
-	/**
-	 * Returns metadata for all columns in a table.
-	 */
-	public function getColumns(string $table): array
-	{
-		$res = $this->driver->query('SELECT * FROM "ALL_TAB_COLUMNS" WHERE "TABLE_NAME" = ' . $this->driver->escapeText($table));
-		$columns = [];
-		while ($row = $res->fetch(true)) {
-			$columns[] = [
-				'table' => $row['TABLE_NAME'],
-				'name' => $row['COLUMN_NAME'],
-				'nativetype' => $row['DATA_TYPE'],
-				'size' => $row['DATA_LENGTH'] ?? null,
-				'nullable' => $row['NULLABLE'] === 'Y',
-				'default' => $row['DATA_DEFAULT'],
-				'vendor' => $row,
-			];
-		}
-
-		return $columns;
-	}
-
-
-	/**
-	 * Returns metadata for all indexes in a table.
-	 */
-	public function getIndexes(string $table): array
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Returns metadata for all foreign keys in a table.
-	 */
-	public function getForeignKeys(string $table): array
-	{
-		throw new Dibi\NotImplementedException;
-	}
-}
--- a/src/Dibi/Drivers/Firebird/Connection.php
+++ b/src/Dibi/Drivers/Firebird/Connection.php
@@ -7,12 +7,10 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Ibase;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
 use Dibi\Helpers;
-use function is_resource;


 /**
@@ -26,19 +24,20 @@ use function is_resource;
 *   - buffers (int) => buffers is the number of database buffers to allocate for the server-side cache. If 0 or omitted, server chooses its own default.
 *   - resource (resource) => existing connection resource
 */
-class Connection implements Drivers\Connection
+class FirebirdDriver implements Dibi\Driver
 {
-	public const ErrorExceptionThrown = -836;
+	use Dibi\Strict;

-	#[\Deprecated('use FirebirdDriver::ErrorExceptionThrown')]
-	public const ERROR_EXCEPTION_THROWN = self::ErrorExceptionThrown;
+	public const ERROR_EXCEPTION_THROWN = -836;

 	/** @var resource */
 	private $connection;

-	/** @var ?resource */
+	/** @var resource|null */
 	private $transaction;
-	private bool $inTransaction = false;
+
+	/** @var bool */
+	private $inTransaction = false;


 	/** @throws Dibi\NotSupportedException */
@@ -87,7 +86,7 @@ class Connection implements Drivers\Connection
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException|Dibi\Exception
 	 */
-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		$resource = $this->inTransaction
 			? $this->transaction
@@ -192,7 +191,7 @@ class Connection implements Drivers\Connection
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}
@@ -201,9 +200,9 @@ class Connection implements Drivers\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
-		return new Drivers\Engines\FirebirdEngine($this);
+		return new FirebirdReflector($this);
 	}


@@ -211,9 +210,9 @@ class Connection implements Drivers\Connection
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): Result
+	public function createResultDriver($resource): FirebirdResult
 	{
-		return new Result($resource);
+		return new FirebirdResult($resource);
 	}


@@ -233,4 +232,56 @@ class Connection implements Drivers\Connection
 	{
 		return "'" . str_replace("'", "''", $value) . "'";
 	}
+
+
+	public function escapeIdentifier(string $value): string
+	{
+		return '"' . str_replace('"', '""', $value) . '"';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return "'" . substr($value->format('Y-m-d H:i:s.u'), 0, -2) . "'";
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes($this->escapeText($value), '%_\\');
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit > 0 || $offset > 0) {
+			// http://www.firebirdsql.org/refdocs/langrefupd20-select.html
+			$sql = 'SELECT ' . ($limit > 0 ? 'FIRST ' . $limit : '') . ($offset > 0 ? ' SKIP ' . $offset : '') . ' * FROM (' . $sql . ')';
+		}
+	}
 }
--- a/src/Dibi/Drivers/Engines/FirebirdEngine.php
+++ b/src/Dibi/Drivers/Engines/FirebirdEngine.php
@@ -7,73 +7,25 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Engines;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers\Connection;
-use Dibi\Drivers\Engine;


 /**
 * The reflector for Firebird/InterBase database.
 */
-class FirebirdEngine implements Engine
+class FirebirdReflector implements Dibi\Reflector
 {
-	public function __construct(
-		private readonly Connection $driver,
-	) {
-	}
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;


-	public function escapeIdentifier(string $value): string
+	public function __construct(Dibi\Driver $driver)
 	{
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return "'" . substr($value->format('Y-m-d H:i:s.u'), 0, -2) . "'";
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes($this->driver->escapeText($value), '%_\\');
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit > 0 || $offset > 0) {
-			// http://www.firebirdsql.org/refdocs/langrefupd20-select.html
-			$sql = 'SELECT ' . ($limit > 0 ? 'FIRST ' . $limit : '') . ($offset > 0 ? ' SKIP ' . $offset : '') . ' * FROM (' . $sql . ')';
-		}
+		$this->driver = $driver;
 	}


@@ -290,7 +242,7 @@ class FirebirdEngine implements Engine
 				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)) {
--- a/src/Dibi/Drivers/Firebird/Result.php
+++ b/src/Dibi/Drivers/Firebird/Result.php
@@ -7,23 +7,29 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Ibase;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
 use Dibi\Helpers;
-use function is_resource;


 /**
 * The driver for Firebird/InterBase result set.
 */
-class Result implements Drivers\Result
+class FirebirdResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		/** @var resource */
-		private $resultSet,
-	) {
+	use Dibi\Strict;
+
+	/** @var resource */
+	private $resultSet;
+
+
+	/**
+	 * @param  resource  $resultSet
+	 */
+	public function __construct($resultSet)
+	{
+		$this->resultSet = $resultSet;
 	}


@@ -47,7 +53,7 @@ class Result implements Drivers\Result
 			: @ibase_fetch_row($this->resultSet, IBASE_TEXT); // intentionally @

 		if (ibase_errcode()) {
-			if (ibase_errcode() === Connection::ERROR_EXCEPTION_THROWN) {
+			if (ibase_errcode() === FirebirdDriver::ERROR_EXCEPTION_THROWN) {
 				preg_match('/exception (\d+) (\w+) (.*)/is', ibase_errmsg(), $match);
 				throw new Dibi\ProcedureException($match[3], $match[1], $match[2]);

@@ -83,7 +89,7 @@ class Result implements Drivers\Result
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
--- a/src/Dibi/Drivers/Engines/MySQLEngine.php
+++ b/src/Dibi/Drivers/Engines/MySQLEngine.php
@@ -7,82 +7,26 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Engines;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers\Connection;
-use Dibi\Drivers\Engine;


 /**
 * The reflector for MySQL databases.
 * @internal
 */
-class MySQLEngine implements Engine
+class MySqlReflector implements Dibi\Reflector
 {
-	public function __construct(
-		private readonly Connection $driver,
-	) {
-	}
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;


-	public function escapeIdentifier(string $value): string
+	public function __construct(Dibi\Driver $driver)
 	{
-		return '`' . str_replace('`', '``', $value) . '`';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d H:i:s.u'");
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		if ($value->y || $value->m || $value->d) {
-			throw new Dibi\NotSupportedException('Only time interval is supported.');
-		}
-
-		return $value->format("'%r%H:%I:%S.%f'");
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null || $offset) {
-			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-			$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
-				. ($offset ? ' OFFSET ' . $offset : '');
-		}
+		$this->driver = $driver;
 	}


@@ -109,7 +53,7 @@ class MySQLEngine implements Engine
 	 */
 	public function getColumns(string $table): array
 	{
-		$res = $this->driver->query("SHOW FULL COLUMNS FROM {$this->escapeIdentifier($table)}");
+		$res = $this->driver->query("SHOW FULL COLUMNS FROM {$this->driver->escapeIdentifier($table)}");
 		$columns = [];
 		while ($row = $res->fetch(true)) {
 			$type = explode('(', $row['Type']);
@@ -134,7 +78,7 @@ class MySQLEngine implements Engine
 	 */
 	public function getIndexes(string $table): array
 	{
-		$res = $this->driver->query("SHOW INDEX FROM {$this->escapeIdentifier($table)}");
+		$res = $this->driver->query("SHOW INDEX FROM {$this->driver->escapeIdentifier($table)}");
 		$indexes = [];
 		while ($row = $res->fetch(true)) {
 			$indexes[$row['Key_name']]['name'] = $row['Key_name'];
--- a/src/Dibi/Drivers/MySQLi/Connection.php
+++ b/src/Dibi/Drivers/MySQLi/Connection.php
@@ -7,12 +7,9 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\MySQLi;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
-use function in_array;
-use const MYSQLI_REPORT_OFF, MYSQLI_STORE_RESULT, MYSQLI_USE_RESULT, PREG_SET_ORDER;


 /**
@@ -33,23 +30,21 @@ use const MYSQLI_REPORT_OFF, MYSQLI_STORE_RESULT, MYSQLI_USE_RESULT, PREG_SET_OR
 *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
 *   - resource (mysqli) => existing connection resource
 */
-class Connection implements Drivers\Connection
+class MySqliDriver implements Dibi\Driver
 {
-	public const ErrorAccessDenied = 1045;
-	public const ErrorDuplicateEntry = 1062;
-	public const ErrorDataTruncated = 1265;
+	use Dibi\Strict;

-	#[\Deprecated('use MySqliDriver::ErrorAccessDenied')]
-	public const ERROR_ACCESS_DENIED = self::ErrorAccessDenied;
+	public const ERROR_ACCESS_DENIED = 1045;

-	#[\Deprecated('use MySqliDriver::ErrorDuplicateEntry')]
-	public const ERROR_DUPLICATE_ENTRY = self::ErrorDuplicateEntry;
+	public const ERROR_DUPLICATE_ENTRY = 1062;

-	#[\Deprecated('use MySqliDriver::ErrorDataTruncated')]
-	public const ERROR_DATA_TRUNCATED = self::ErrorDataTruncated;
+	public const ERROR_DATA_TRUNCATED = 1265;

-	private \mysqli $connection;
-	private bool $buffered = false;
+	/** @var \mysqli */
+	private $connection;
+
+	/** @var bool  Is buffered (seekable and countable)? */
+	private $buffered;


 	/** @throws Dibi\NotSupportedException */
@@ -101,7 +96,7 @@ class Connection implements Drivers\Connection
 				$config['database'] ?? '',
 				$config['port'] ?? 0,
 				$config['socket'],
-				$config['flags'] ?? 0,
+				$config['flags'] ?? 0
 			);

 			if ($this->connection->connect_errno) {
@@ -149,7 +144,7 @@ class Connection implements Drivers\Connection
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		$res = @$this->connection->query($sql, $this->buffered ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT); // intentionally @

@@ -164,7 +159,10 @@ class Connection implements Drivers\Connection
 	}


-	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);
@@ -266,18 +264,18 @@ class Connection implements Drivers\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
-		return new Drivers\Engines\MySQLEngine($this);
+		return new MySqlReflector($this);
 	}


 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\mysqli_result $result): Result
+	public function createResultDriver(\mysqli_result $result): MySqliResult
 	{
-		return new Result($result, $this->buffered);
+		return new MySqliResult($result, $this->buffered);
 	}


@@ -297,4 +295,64 @@ class Connection implements Drivers\Connection
 	{
 		return "_binary'" . $this->connection->escape_string($value) . "'";
 	}
+
+
+	public function escapeIdentifier(string $value): string
+	{
+		return '`' . str_replace('`', '``', $value) . '`';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d H:i:s.u'");
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		if ($value->y || $value->m || $value->d) {
+			throw new Dibi\NotSupportedException('Only time interval is supported.');
+		}
+
+		return $value->format("'%r%H:%I:%S.%f'");
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== null || $offset) {
+			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
+			$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
+				. ($offset ? ' OFFSET ' . $offset : '');
+		}
+	}
 }
--- a/src/Dibi/Drivers/MySQLi/Result.php
+++ b/src/Dibi/Drivers/MySQLi/Result.php
@@ -7,22 +7,29 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\MySQLi;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
-use const MYSQLI_TYPE_LONG, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_TIME, MYSQLI_TYPE_TINY;


 /**
 * The driver for MySQL result set.
 */
-class Result implements Drivers\Result
+class MySqliResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		private readonly \mysqli_result $resultSet,
-		private readonly bool $buffered,
-	) {
+	use Dibi\Strict;
+
+	/** @var \mysqli_result */
+	private $resultSet;
+
+	/** @var bool  Is buffered (seekable and countable)? */
+	private $buffered;
+
+
+	public function __construct(\mysqli_result $resultSet, bool $buffered)
+	{
+		$this->resultSet = $resultSet;
+		$this->buffered = $buffered;
 	}


@@ -101,7 +108,7 @@ class Result implements Drivers\Result
 				'table' => $row['orgtable'],
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
 				'nativetype' => $types[$row['type']] ?? $row['type'],
-				'type' => $row['type'] === MYSQLI_TYPE_TIME ? Dibi\Type::TimeInterval : null,
+				'type' => $row['type'] === MYSQLI_TYPE_TIME ? Dibi\Type::TIME_INTERVAL : null,
 				'vendor' => $row,
 			];
 		}
--- a/src/Dibi/Drivers/NoDataResult.php
+++ b/src/Dibi/Drivers/NoDataResult.php
@@ -7,19 +7,25 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Dummy;
+namespace Dibi\Drivers;

-use Dibi\Drivers;
+use Dibi;


 /**
 * The driver for no result set.
 */
-class Result implements Drivers\Result
+class NoDataResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		private readonly int $rows,
-	) {
+	use Dibi\Strict;
+
+	/** @var int */
+	private $rows;
+
+
+	public function __construct(int $rows)
+	{
+		$this->rows = $rows;
 	}


@@ -55,7 +61,7 @@ class Result implements Drivers\Result
 	}


-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
 		return null;
 	}
--- a/src/Dibi/Drivers/ODBC/Connection.php
+++ b/src/Dibi/Drivers/ODBC/Connection.php
@@ -7,11 +7,9 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\ODBC;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
-use function is_resource;


 /**
@@ -25,12 +23,18 @@ use function is_resource;
 *   - resource (resource) => existing connection resource
 *   - microseconds (bool) => use microseconds in datetime format?
 */
-class Connection implements Drivers\Connection
+class OdbcDriver implements Dibi\Driver
 {
+	use Dibi\Strict;
+
 	/** @var resource */
 	private $connection;
-	private ?int $affectedRows;
-	private bool $microseconds = true;
+
+	/** @var int|null  Affected rows */
+	private $affectedRows;
+
+	/** @var bool */
+	private $microseconds = true;


 	/** @throws Dibi\NotSupportedException */
@@ -78,7 +82,7 @@ class Connection implements Drivers\Connection
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		$this->affectedRows = null;
 		$res = @odbc_exec($this->connection, $sql); // intentionally @
@@ -121,7 +125,7 @@ class Connection implements Drivers\Connection
 	 */
 	public function begin(?string $savepoint = null): void
 	{
-		if (!odbc_autocommit($this->connection)) {
+		if (!odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 0 : false)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
 	}
@@ -137,7 +141,7 @@ class Connection implements Drivers\Connection
 			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);
 	}


@@ -151,7 +155,7 @@ class Connection implements Drivers\Connection
 			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);
 	}


@@ -168,7 +172,7 @@ class Connection implements Drivers\Connection
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}
@@ -177,9 +181,9 @@ class Connection implements Drivers\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
-		return new Drivers\Engines\ODBCEngine($this);
+		return new OdbcReflector($this);
 	}


@@ -187,9 +191,9 @@ class Connection implements Drivers\Connection
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): Result
+	public function createResultDriver($resource): OdbcResult
 	{
-		return new Result($resource);
+		return new OdbcResult($resource);
 	}


@@ -209,4 +213,61 @@ class Connection implements Drivers\Connection
 	{
 		return "'" . str_replace("'", "''", $value) . "'";
 	}
+
+
+	public function escapeIdentifier(string $value): string
+	{
+		return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format('#m/d/Y#');
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format($this->microseconds ? '#m/d/Y H:i:s.u#' : '#m/d/Y H:i:s#');
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($offset) {
+			throw new Dibi\NotSupportedException('Offset is not supported by this database.');
+
+		} elseif ($limit < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== null) {
+			$sql = 'SELECT TOP ' . $limit . ' * FROM (' . $sql . ') t';
+		}
+	}
 }
--- a/src/Dibi/Drivers/Engines/ODBCEngine.php
+++ b/src/Dibi/Drivers/Engines/ODBCEngine.php
@@ -7,78 +7,25 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Engines;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers\Connection;
-use Dibi\Drivers\Engine;


 /**
 * The reflector for ODBC connections.
 */
-class ODBCEngine implements Engine
+class OdbcReflector implements Dibi\Reflector
 {
-	public function __construct(
-		private readonly Connection $driver,
-	) {
-	}
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;


-	public function escapeIdentifier(string $value): string
+	public function __construct(Dibi\Driver $driver)
 	{
-		return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format('#m/d/Y#');
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format($this->microseconds ? '#m/d/Y H:i:s.u#' : '#m/d/Y H:i:s#'); // TODO
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($offset) {
-			throw new Dibi\NotSupportedException('Offset is not supported by this database.');
-
-		} elseif ($limit < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null) {
-			$sql = 'SELECT TOP ' . $limit . ' * FROM (' . $sql . ') t';
-		}
+		$this->driver = $driver;
 	}


--- a/src/Dibi/Drivers/ODBC/Result.php
+++ b/src/Dibi/Drivers/ODBC/Result.php
@@ -7,25 +7,31 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\ODBC;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
-use function is_resource;


 /**
 * The driver interacting with result set via ODBC connections.
 */
-class Result implements Drivers\Result
+class OdbcResult implements Dibi\ResultDriver
 {
-	private int $row = 0;
+	use Dibi\Strict;
+
+	/** @var resource */
+	private $resultSet;
+
+	/** @var int  Cursor */
+	private $row = 0;


-	public function __construct(
-		/** @var resource */
-		private $resultSet,
-	) {
+	/**
+	 * @param  resource  $resultSet
+	 */
+	public function __construct($resultSet)
+	{
+		$this->resultSet = $resultSet;
 	}


@@ -107,7 +113,7 @@ class Result implements Drivers\Result
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
--- a/src/Dibi/Drivers/OCI8/Connection.php
+++ b/src/Dibi/Drivers/OCI8/Connection.php
@@ -7,11 +7,9 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\OCI8;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
-use function in_array, is_resource;


 /**
@@ -27,13 +25,21 @@ use function in_array, is_resource;
 *   - resource (resource) => existing connection resource
 *   - persistent => Creates persistent connections with oci_pconnect instead of oci_new_connect
 */
-class Connection implements Drivers\Connection
+class OracleDriver implements Dibi\Driver
 {
+	use Dibi\Strict;
+
 	/** @var resource */
 	private $connection;
-	private bool $autocommit = true;
-	private bool $nativeDate;
-	private ?int $affectedRows;
+
+	/** @var bool */
+	private $autocommit = true;
+
+	/** @var bool  use native datetime format */
+	private $nativeDate;
+
+	/** @var int|null Number of affected rows */
+	private $affectedRows;


 	/** @throws Dibi\NotSupportedException */
@@ -78,7 +84,7 @@ class Connection implements Drivers\Connection
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		$this->affectedRows = null;
 		$res = oci_parse($this->connection, $sql);
@@ -182,7 +188,7 @@ class Connection implements Drivers\Connection
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}
@@ -191,9 +197,9 @@ class Connection implements Drivers\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
-		return new Drivers\Engines\OracleEngine($this);
+		return new OracleReflector($this);
 	}


@@ -201,9 +207,9 @@ class Connection implements Drivers\Connection
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): Result
+	public function createResultDriver($resource): OracleResult
 	{
-		return new Result($resource);
+		return new OracleResult($resource);
 	}


@@ -223,4 +229,70 @@ class Connection implements Drivers\Connection
 	{
 		return "'" . str_replace("'", "''", $value) . "'"; // TODO: not tested
 	}
+
+
+	public function escapeIdentifier(string $value): string
+	{
+		// @see http://download.oracle.com/docs/cd/B10500_01/server.920/a96540/sql_elements9a.htm
+		return '"' . str_replace('"', '""', $value) . '"';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $this->nativeDate
+			? "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')"
+			: $value->format('U');
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $this->nativeDate
+			? "to_date('" . $value->format('Y-m-d G:i:s') . "', 'YYYY-mm-dd hh24:mi:ss')"
+			: $value->format('U');
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
+		$value = str_replace("'", "''", $value);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($offset) {
+			// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
+			$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
+				. ($limit !== null ? 'WHERE ROWNUM <= ' . ($offset + $limit) : '')
+				. ') WHERE "__rnum" > ' . $offset;
+
+		} elseif ($limit !== null) {
+			$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
+		}
+	}
 }
--- a/src/Dibi/Drivers/OracleReflector.php
+++ b/src/Dibi/Drivers/OracleReflector.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+use Dibi;
+
+
+/**
+ * The reflector for Oracle database.
+ */
+class OracleReflector implements Dibi\Reflector
+{
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;
+
+
+	public function __construct(Dibi\Driver $driver)
+	{
+		$this->driver = $driver;
+	}
+
+
+	/**
+	 * Returns list of tables.
+	 */
+	public function getTables(): array
+	{
+		$res = $this->driver->query('SELECT * FROM cat');
+		$tables = [];
+		while ($row = $res->fetch(false)) {
+			if ($row[1] === 'TABLE' || $row[1] === 'VIEW') {
+				$tables[] = [
+					'name' => $row[0],
+					'view' => $row[1] === 'VIEW',
+				];
+			}
+		}
+
+		return $tables;
+	}
+
+
+	/**
+	 * Returns metadata for all columns in a table.
+	 */
+	public function getColumns(string $table): array
+	{
+		$res = $this->driver->query('SELECT * FROM "ALL_TAB_COLUMNS" WHERE "TABLE_NAME" = ' . $this->driver->escapeText($table));
+		$columns = [];
+		while ($row = $res->fetch(true)) {
+			$columns[] = [
+				'table' => $row['TABLE_NAME'],
+				'name' => $row['COLUMN_NAME'],
+				'nativetype' => $row['DATA_TYPE'],
+				'size' => $row['DATA_LENGTH'] ?? null,
+				'nullable' => $row['NULLABLE'] === 'Y',
+				'default' => $row['DATA_DEFAULT'],
+				'vendor' => $row,
+			];
+		}
+
+		return $columns;
+	}
+
+
+	/**
+	 * Returns metadata for all indexes in a table.
+	 */
+	public function getIndexes(string $table): array
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Returns metadata for all foreign keys in a table.
+	 */
+	public function getForeignKeys(string $table): array
+	{
+		throw new Dibi\NotImplementedException;
+	}
+}
--- a/src/Dibi/Drivers/OracleResult.php
+++ b/src/Dibi/Drivers/OracleResult.php
@@ -7,22 +7,28 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\OCI8;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
-use function is_resource;


 /**
 * The driver for Oracle result set.
 */
-class Result implements Drivers\Result
+class OracleResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		/** @var resource */
-		private $resultSet,
-	) {
+	use Dibi\Strict;
+
+	/** @var resource */
+	private $resultSet;
+
+
+	/**
+	 * @param  resource  $resultSet
+	 */
+	public function __construct($resultSet)
+	{
+		$this->resultSet = $resultSet;
 	}


@@ -76,7 +82,7 @@ class Result implements Drivers\Result
 				'name' => oci_field_name($this->resultSet, $i),
 				'table' => null,
 				'fullname' => oci_field_name($this->resultSet, $i),
-				'type' => $type === 'LONG' ? Dibi\Type::Text : null,
+				'type' => $type === 'LONG' ? Dibi\Type::TEXT : null,
 				'nativetype' => $type === 'NUMBER' && oci_field_scale($this->resultSet, $i) === 0 ? 'INTEGER' : $type,
 			];
 		}
@@ -89,7 +95,7 @@ class Result implements Drivers\Result
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
--- a/src/Dibi/Drivers/PDO/Connection.php
+++ b/src/Dibi/Drivers/PDO/Connection.php
@@ -1,223 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers\PDO;
-
-use Dibi;
-use Dibi\Drivers;
-use Dibi\Drivers\Engines;
-use Dibi\Helpers;
-use PDO;
-use function sprintf;
-
-
-/**
- * The driver for PDO.
- *
- * Driver options:
- *   - dsn => driver specific DSN
- *   - username (or user)
- *   - password (or pass)
- *   - options (array) => driver specific options {@see PDO::__construct}
- *   - resource (PDO) => existing connection
- */
-class Connection implements Drivers\Connection
-{
-	private ?PDO $connection;
-	private ?int $affectedRows;
-	private string $driverName;
-
-
-	/** @throws Dibi\NotSupportedException */
-	public function __construct(array $config)
-	{
-		if (!extension_loaded('pdo')) {
-			throw new Dibi\NotSupportedException("PHP extension 'pdo' is not loaded.");
-		}
-
-		$foo = &$config['dsn'];
-		$foo = &$config['options'];
-		Helpers::alias($config, 'resource', 'pdo');
-
-		if ($config['resource'] instanceof PDO) {
-			$this->connection = $config['resource'];
-			unset($config['resource'], $config['pdo']);
-
-			if ($this->connection->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_SILENT) {
-				throw new Dibi\DriverException('PDO connection in exception or warning error mode is not supported.');
-			}
-		} else {
-			try {
-				$this->connection = new PDO($config['dsn'], $config['username'], $config['password'], $config['options']);
-				$this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
-			} catch (\PDOException $e) {
-				if ($e->getMessage() === 'could not find driver') {
-					throw new Dibi\NotSupportedException('PHP extension for PDO is not loaded.');
-				}
-
-				throw new Dibi\DriverException($e->getMessage(), $e->getCode());
-			}
-		}
-
-		$this->driverName = $this->connection->getAttribute(PDO::ATTR_DRIVER_NAME);
-	}
-
-
-	/**
-	 * Disconnects from a database.
-	 */
-	public function disconnect(): void
-	{
-		$this->connection = null;
-	}
-
-
-	/**
-	 * Executes the SQL query.
-	 * @throws Dibi\DriverException
-	 */
-	public function query(string $sql): ?Result
-	{
-		$res = $this->connection->query($sql);
-		if ($res) {
-			$this->affectedRows = $res->rowCount();
-			return $res->columnCount() ? $this->createResultDriver($res) : null;
-		}
-
-		$this->affectedRows = null;
-
-		[$sqlState, $code, $message] = $this->connection->errorInfo();
-		$code ??= 0;
-		$message = "SQLSTATE[$sqlState]: $message";
-		throw match ($this->driverName) {
-			'mysql' => Drivers\MySQLi\Connection::createException($message, $code, $sql),
-			'oci' => Drivers\OCI8\Connection::createException($message, $code, $sql),
-			'pgsql' => Drivers\PgSQL\Connection::createException($message, $sqlState, $sql),
-			'sqlite' => Drivers\SQLite3\Connection::createException($message, $code, $sql),
-			default => new Dibi\DriverException($message, $code, $sql),
-		};
-	}
-
-
-	/**
-	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 */
-	public function getAffectedRows(): ?int
-	{
-		return $this->affectedRows;
-	}
-
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 */
-	public function getInsertId(?string $sequence): ?int
-	{
-		return Helpers::intVal($this->connection->lastInsertId($sequence));
-	}
-
-
-	/**
-	 * Begins a transaction (if supported).
-	 * @throws Dibi\DriverException
-	 */
-	public function begin(?string $savepoint = null): void
-	{
-		if (!$this->connection->beginTransaction()) {
-			$err = $this->connection->errorInfo();
-			throw new Dibi\DriverException("SQLSTATE[$err[0]]: $err[2]", $err[1] ?? 0);
-		}
-	}
-
-
-	/**
-	 * Commits statements in a transaction.
-	 * @throws Dibi\DriverException
-	 */
-	public function commit(?string $savepoint = null): void
-	{
-		if (!$this->connection->commit()) {
-			$err = $this->connection->errorInfo();
-			throw new Dibi\DriverException("SQLSTATE[$err[0]]: $err[2]", $err[1] ?? 0);
-		}
-	}
-
-
-	/**
-	 * Rollback changes in a transaction.
-	 * @throws Dibi\DriverException
-	 */
-	public function rollback(?string $savepoint = null): void
-	{
-		if (!$this->connection->rollBack()) {
-			$err = $this->connection->errorInfo();
-			throw new Dibi\DriverException("SQLSTATE[$err[0]]: $err[2]", $err[1] ?? 0);
-		}
-	}
-
-
-	/**
-	 * Returns the connection resource.
-	 */
-	public function getResource(): ?PDO
-	{
-		return $this->connection;
-	}
-
-
-	/**
-	 * Returns the connection reflector.
-	 */
-	public function getReflector(): Drivers\Engine
-	{
-		return match ($this->driverName) {
-			'mysql' => new Engines\MySQLEngine($this),
-			'oci' => new Engines\OracleEngine($this),
-			'pgsql' => new Engines\PostgreSQLEngine($this),
-			'sqlite' => new Engines\SQLiteEngine($this),
-			'mssql', 'dblib', 'sqlsrv' => new Engines\SQLServerEngine($this),
-			default => throw new Dibi\NotSupportedException,
-		};
-	}
-
-
-	/**
-	 * Result set driver factory.
-	 */
-	public function createResultDriver(\PDOStatement $result): Result
-	{
-		return new Result($result, $this->driverName);
-	}
-
-
-	/********************* SQL ****************d*g**/
-
-
-	/**
-	 * Encodes data for use in a SQL statement.
-	 */
-	public function escapeText(string $value): string
-	{
-		return match ($this->driverName) {
-			'odbc' => "'" . str_replace("'", "''", $value) . "'",
-			'sqlsrv' => "N'" . str_replace("'", "''", $value) . "'",
-			default => $this->connection->quote($value, PDO::PARAM_STR),
-		};
-	}
-
-
-	public function escapeBinary(string $value): string
-	{
-		return match ($this->driverName) {
-			'odbc' => "'" . str_replace("'", "''", $value) . "'",
-			'sqlsrv' => '0x' . bin2hex($value),
-			default => $this->connection->quote($value, PDO::PARAM_LOB),
-		};
-	}
-}
--- a/src/Dibi/Drivers/PdoDriver.php
+++ b/src/Dibi/Drivers/PdoDriver.php
@@ -0,0 +1,431 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+use Dibi;
+use Dibi\Helpers;
+use PDO;
+
+
+/**
+ * The driver for PDO.
+ *
+ * Driver options:
+ *   - dsn => driver specific DSN
+ *   - username (or user)
+ *   - password (or pass)
+ *   - options (array) => driver specific options {@see PDO::__construct}
+ *   - resource (PDO) => existing connection
+ *   - version
+ */
+class PdoDriver implements Dibi\Driver
+{
+	use Dibi\Strict;
+
+	/** @var PDO|null  Connection resource */
+	private $connection;
+
+	/** @var int|null  Affected rows */
+	private $affectedRows;
+
+	/** @var string */
+	private $driverName;
+
+	/** @var string */
+	private $serverVersion = '';
+
+
+	/** @throws Dibi\NotSupportedException */
+	public function __construct(array $config)
+	{
+		if (!extension_loaded('pdo')) {
+			throw new Dibi\NotSupportedException("PHP extension 'pdo' is not loaded.");
+		}
+
+		$foo = &$config['dsn'];
+		$foo = &$config['options'];
+		Helpers::alias($config, 'resource', 'pdo');
+
+		if ($config['resource'] instanceof PDO) {
+			$this->connection = $config['resource'];
+			unset($config['resource'], $config['pdo']);
+
+			if ($this->connection->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_SILENT) {
+				throw new Dibi\DriverException('PDO connection in exception or warning error mode is not supported.');
+			}
+		} else {
+			try {
+				$this->connection = new PDO($config['dsn'], $config['username'], $config['password'], $config['options']);
+				$this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
+			} catch (\PDOException $e) {
+				if ($e->getMessage() === 'could not find driver') {
+					throw new Dibi\NotSupportedException('PHP extension for PDO is not loaded.');
+				}
+
+				throw new Dibi\DriverException($e->getMessage(), $e->getCode());
+			}
+		}
+
+		$this->driverName = $this->connection->getAttribute(PDO::ATTR_DRIVER_NAME);
+		$this->serverVersion = (string) ($config['version'] ?? @$this->connection->getAttribute(PDO::ATTR_SERVER_VERSION)); // @ - may be not supported
+	}
+
+
+	/**
+	 * Disconnects from a database.
+	 */
+	public function disconnect(): void
+	{
+		$this->connection = null;
+	}
+
+
+	/**
+	 * Executes the SQL query.
+	 * @throws Dibi\DriverException
+	 */
+	public function query(string $sql): ?Dibi\ResultDriver
+	{
+		$res = $this->connection->query($sql);
+		if ($res) {
+			$this->affectedRows = $res->rowCount();
+			return $res->columnCount() ? $this->createResultDriver($res) : null;
+		}
+
+		$this->affectedRows = null;
+
+		[$sqlState, $code, $message] = $this->connection->errorInfo();
+		$message = "SQLSTATE[$sqlState]: $message";
+		switch ($this->driverName) {
+			case 'mysql':
+				throw MySqliDriver::createException($message, $code, $sql);
+
+			case 'oci':
+				throw OracleDriver::createException($message, $code, $sql);
+
+			case 'pgsql':
+				throw PostgreDriver::createException($message, $sqlState, $sql);
+
+			case 'sqlite':
+				throw SqliteDriver::createException($message, $code, $sql);
+
+			default:
+				throw new Dibi\DriverException($message, $code, $sql);
+		}
+	}
+
+
+	/**
+	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
+	 */
+	public function getAffectedRows(): ?int
+	{
+		return $this->affectedRows;
+	}
+
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
+	 */
+	public function getInsertId(?string $sequence): ?int
+	{
+		return Helpers::intVal($this->connection->lastInsertId($sequence));
+	}
+
+
+	/**
+	 * Begins a transaction (if supported).
+	 * @throws Dibi\DriverException
+	 */
+	public function begin(?string $savepoint = null): void
+	{
+		if (!$this->connection->beginTransaction()) {
+			$err = $this->connection->errorInfo();
+			throw new Dibi\DriverException("SQLSTATE[$err[0]]: $err[2]", $err[1]);
+		}
+	}
+
+
+	/**
+	 * Commits statements in a transaction.
+	 * @throws Dibi\DriverException
+	 */
+	public function commit(?string $savepoint = null): void
+	{
+		if (!$this->connection->commit()) {
+			$err = $this->connection->errorInfo();
+			throw new Dibi\DriverException("SQLSTATE[$err[0]]: $err[2]", $err[1]);
+		}
+	}
+
+
+	/**
+	 * Rollback changes in a transaction.
+	 * @throws Dibi\DriverException
+	 */
+	public function rollback(?string $savepoint = null): void
+	{
+		if (!$this->connection->rollBack()) {
+			$err = $this->connection->errorInfo();
+			throw new Dibi\DriverException("SQLSTATE[$err[0]]: $err[2]", $err[1]);
+		}
+	}
+
+
+	/**
+	 * Returns the connection resource.
+	 */
+	public function getResource(): ?PDO
+	{
+		return $this->connection;
+	}
+
+
+	/**
+	 * Returns the connection reflector.
+	 */
+	public function getReflector(): Dibi\Reflector
+	{
+		switch ($this->driverName) {
+			case 'mysql':
+				return new MySqlReflector($this);
+
+			case 'oci':
+				return new OracleReflector($this);
+
+			case 'pgsql':
+				return new PostgreReflector($this, $this->connection->getAttribute(PDO::ATTR_SERVER_VERSION));
+
+			case 'sqlite':
+				return new SqliteReflector($this);
+
+			case 'mssql':
+			case 'dblib':
+			case 'sqlsrv':
+				return new SqlsrvReflector($this);
+
+			default:
+				throw new Dibi\NotSupportedException;
+		}
+	}
+
+
+	/**
+	 * Result set driver factory.
+	 */
+	public function createResultDriver(\PDOStatement $result): PdoResult
+	{
+		return new PdoResult($result, $this->driverName);
+	}
+
+
+	/********************* SQL ****************d*g**/
+
+
+	/**
+	 * Encodes data for use in a SQL statement.
+	 */
+	public function escapeText(string $value): string
+	{
+		return $this->driverName === 'odbc'
+			? "'" . str_replace("'", "''", $value) . "'"
+			: $this->connection->quote($value, PDO::PARAM_STR);
+	}
+
+
+	public function escapeBinary(string $value): string
+	{
+		return $this->driverName === 'odbc'
+			? "'" . str_replace("'", "''", $value) . "'"
+			: $this->connection->quote($value, PDO::PARAM_LOB);
+	}
+
+
+	public function escapeIdentifier(string $value): string
+	{
+		switch ($this->driverName) {
+			case 'mysql':
+				return '`' . str_replace('`', '``', $value) . '`';
+
+			case 'oci':
+			case 'pgsql':
+				return '"' . str_replace('"', '""', $value) . '"';
+
+			case 'sqlite':
+				return '[' . strtr($value, '[]', '  ') . ']';
+
+			case 'odbc':
+			case 'mssql':
+				return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
+
+			case 'dblib':
+			case 'sqlsrv':
+				return '[' . str_replace(']', ']]', $value) . ']';
+
+			default:
+				return $value;
+		}
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		if ($this->driverName === 'pgsql') {
+			return $value ? 'TRUE' : 'FALSE';
+		} else {
+			return $value ? '1' : '0';
+		}
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format($this->driverName === 'odbc' ? '#m/d/Y#' : "'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		switch ($this->driverName) {
+			case 'odbc':
+				return $value->format('#m/d/Y H:i:s.u#');
+			case 'mssql':
+			case 'dblib':
+			case 'sqlsrv':
+				return 'CONVERT(DATETIME2(7), ' . $value->format("'Y-m-d H:i:s.u'") . ')';
+			default:
+				return $value->format("'Y-m-d H:i:s.u'");
+		}
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		switch ($this->driverName) {
+			case 'mysql':
+				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+
+			case 'oci':
+				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
+				$value = str_replace("'", "''", $value);
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+
+			case 'pgsql':
+				$bs = substr($this->connection->quote('\\', PDO::PARAM_STR), 1, -1); // standard_conforming_strings = on/off
+				$value = substr($this->connection->quote($value, PDO::PARAM_STR), 1, -1);
+				$value = strtr($value, ['%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\']);
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+
+			case 'sqlite':
+				$value = addcslashes(substr($this->connection->quote($value, PDO::PARAM_STR), 1, -1), '%_\\');
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
+
+			case 'odbc':
+			case 'mssql':
+			case 'dblib':
+			case 'sqlsrv':
+				$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+
+			default:
+				throw new Dibi\NotImplementedException;
+		}
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+		}
+
+		switch ($this->driverName) {
+			case 'mysql':
+				if ($limit !== null || $offset) {
+					// see http://dev.mysql.com/doc/refman/5.0/en/select.html
+					$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
+						. ($offset ? ' OFFSET ' . $offset : '');
+				}
+
+				break;
+
+			case 'pgsql':
+				if ($limit !== null) {
+					$sql .= ' LIMIT ' . $limit;
+				}
+
+				if ($offset) {
+					$sql .= ' OFFSET ' . $offset;
+				}
+
+				break;
+
+			case 'sqlite':
+				if ($limit !== null || $offset) {
+					$sql .= ' LIMIT ' . ($limit ?? '-1')
+						. ($offset ? ' OFFSET ' . $offset : '');
+				}
+
+				break;
+
+			case 'oci':
+				if ($offset) {
+					// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
+					$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
+						. ($limit !== null ? 'WHERE ROWNUM <= ' . ($offset + $limit) : '')
+						. ') WHERE "__rnum" > ' . $offset;
+
+				} elseif ($limit !== null) {
+					$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
+				}
+
+				break;
+
+			case 'mssql':
+			case 'sqlsrv':
+			case 'dblib':
+				if (version_compare($this->serverVersion, '11.0') >= 0) { // 11 == SQL Server 2012
+					// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+					if ($limit !== null) {
+						$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
+					} elseif ($offset) {
+						$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
+					}
+
+					break;
+				}
+				// break omitted
+			case 'odbc':
+				if ($offset) {
+					throw new Dibi\NotSupportedException('Offset is not supported by this database.');
+
+				} elseif ($limit !== null) {
+					$sql = 'SELECT TOP ' . $limit . ' * FROM (' . $sql . ') t';
+					break;
+				}
+				// break omitted
+			default:
+				throw new Dibi\NotSupportedException('PDO or driver does not support applying limit or offset.');
+		}
+	}
+}
--- a/src/Dibi/Drivers/PDO/Result.php
+++ b/src/Dibi/Drivers/PDO/Result.php
@@ -7,10 +7,9 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\PDO;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
 use Dibi\Helpers;
 use PDO;

@@ -18,12 +17,21 @@ use PDO;
 /**
 * The driver for PDO result set.
 */
-class Result implements Drivers\Result
+class PdoResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		private ?\PDOStatement $resultSet,
-		private readonly string $driverName,
-	) {
+	use Dibi\Strict;
+
+	/** @var \PDOStatement|null */
+	private $resultSet;
+
+	/** @var string */
+	private $driverName;
+
+
+	public function __construct(\PDOStatement $resultSet, string $driverName)
+	{
+		$this->resultSet = $resultSet;
+		$this->driverName = $driverName;
 	}


@@ -87,7 +95,7 @@ class Result implements Drivers\Result
 				'name' => $row['name'],
 				'table' => $row['table'],
 				'nativetype' => $row['native_type'],
-				'type' => $row['native_type'] === 'TIME' && $this->driverName === 'mysql' ? Dibi\Type::TimeInterval : null,
+				'type' => $row['native_type'] === 'TIME' && $this->driverName === 'mysql' ? Dibi\Type::TIME_INTERVAL : null,
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
 				'vendor' => $row,
 			];
--- a/src/Dibi/Drivers/PgSQL/Connection.php
+++ b/src/Dibi/Drivers/PgSQL/Connection.php
@@ -7,13 +7,11 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\PgSQL;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
 use Dibi\Helpers;
 use PgSql;
-use function in_array, is_array, is_resource, strlen;


 /**
@@ -25,13 +23,18 @@ use function in_array, is_array, is_resource, strlen;
 *   - schema => the schema search path
 *   - charset => character encoding to set (default is utf8)
 *   - persistent (bool) => try to find a persistent link?
- *   - resource (PgSql\Connection) => existing connection resource
+ *   - resource (resource) => existing connection resource
 *   - connect_type (int) => see pg_connect()
 */
-class Connection implements Drivers\Connection
+class PostgreDriver implements Dibi\Driver
 {
-	private PgSql\Connection $connection;
-	private ?int $affectedRows;
+	use Dibi\Strict;
+
+	/** @var resource|PgSql\Connection */
+	private $connection;
+
+	/** @var int|null  Affected rows */
+	private $affectedRows;


 	/** @throws Dibi\NotSupportedException */
@@ -73,7 +76,7 @@ class Connection implements Drivers\Connection
 			restore_error_handler();
 		}

-		if (!$this->connection instanceof PgSql\Connection) {
+		if (!is_resource($this->connection) && !$this->connection instanceof PgSql\Connection) {
 			throw new Dibi\DriverException($error ?: 'Connecting error.');
 		}

@@ -111,7 +114,7 @@ class Connection implements Drivers\Connection
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		$this->affectedRows = null;
 		$res = @pg_query($this->connection, $sql); // intentionally @
@@ -119,7 +122,7 @@ class Connection implements Drivers\Connection
 		if ($res === false) {
 			throw static::createException(pg_last_error($this->connection), null, $sql);

-		} elseif ($res instanceof PgSql\Result) {
+		} elseif (is_resource($res) || $res instanceof PgSql\Result) {
 			$this->affectedRows = Helpers::false2Null(pg_affected_rows($res));
 			if (pg_num_fields($res)) {
 				return $this->createResultDriver($res);
@@ -137,7 +140,7 @@ class Connection implements Drivers\Connection
 			$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') {
@@ -223,28 +226,32 @@ class Connection implements Drivers\Connection

 	/**
 	 * Returns the connection resource.
+	 * @return resource|null
 	 */
-	public function getResource(): PgSql\Connection
+	public function getResource()
 	{
-		return $this->connection;
+		return is_resource($this->connection) || $this->connection instanceof PgSql\Connection
+			? $this->connection
+			: null;
 	}


 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
-		return new Drivers\Engines\PostgreSQLEngine($this);
+		return new PostgreReflector($this, pg_parameter_status($this->connection, 'server_version'));
 	}


 	/**
 	 * Result set driver factory.
+	 * @param  resource  $resource
 	 */
-	public function createResultDriver(PgSql\Result $resource): Result
+	public function createResultDriver($resource): PostgreResult
 	{
-		return new Result($resource);
+		return new PostgreResult($resource);
 	}


@@ -272,4 +279,66 @@ class Connection implements Drivers\Connection

 		return "'" . pg_escape_bytea($this->connection, $value) . "'";
 	}
+
+
+	public function escapeIdentifier(string $value): string
+	{
+		// @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+		return '"' . str_replace('"', '""', $value) . '"';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? 'TRUE' : 'FALSE';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d H:i:s.u'");
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$bs = pg_escape_string($this->connection, '\\'); // standard_conforming_strings = on/off
+		$value = pg_escape_string($this->connection, $value);
+		$value = strtr($value, ['%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\']);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+		}
+
+		if ($limit !== null) {
+			$sql .= ' LIMIT ' . $limit;
+		}
+
+		if ($offset) {
+			$sql .= ' OFFSET ' . $offset;
+		}
+	}
 }
--- a/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
+++ b/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
@@ -7,83 +7,29 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Engines;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers\Connection;
-use Dibi\Drivers\Engine;


 /**
 * The reflector for PostgreSQL database.
 */
-class PostgreSQLEngine implements Engine
+class PostgreReflector implements Dibi\Reflector
 {
-	public function __construct(
-		private readonly Connection $driver,
-	) {
-	}
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;
+
+	/** @var string */
+	private $version;


-	public function escapeIdentifier(string $value): string
+	public function __construct(Dibi\Driver $driver, string $version)
 	{
-		// @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? 'TRUE' : 'FALSE';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d H:i:s.u'");
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$bs = $this->driver->escapeText('\\'); // standard_conforming_strings = on/off
-		$value = $this->driver->escapeText($value);
-		$value = strtr($value, ['%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\']);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-		}
-
-		if ($limit !== null) {
-			$sql .= ' LIMIT ' . $limit;
-		}
-
-		if ($offset) {
-			$sql .= ' OFFSET ' . $offset;
-		}
+		$this->driver = $driver;
+		$this->version = $version;
 	}


@@ -102,15 +48,18 @@ class PostgreSQLEngine implements Engine
 			FROM
 				information_schema.tables
 			WHERE
-				table_schema = ANY (current_schemas(false))
+				table_schema = ANY (current_schemas(false))";

-			UNION ALL
-			SELECT
-				matviewname, 1
-			FROM
-				pg_matviews
-			WHERE
-				schemaname = ANY (current_schemas(false))";
+		if ($this->version >= 9.3) {
+			$query .= '
+				UNION ALL
+				SELECT
+					matviewname, 1
+				FROM
+					pg_matviews
+				WHERE
+					schemaname = ANY (current_schemas(false))';
+		}

 		$res = $this->driver->query($query);
 		$tables = [];
@@ -127,7 +76,14 @@ class PostgreSQLEngine implements Engine
 	 */
 	public function getColumns(string $table): array
 	{
-		$_table = $this->driver->escapeText($this->escapeIdentifier($table));
+		$_table = $this->driver->escapeText($this->driver->escapeIdentifier($table));
+		$res = $this->driver->query("
+			SELECT indkey
+			FROM pg_class
+			LEFT JOIN pg_index on pg_class.oid = pg_index.indrelid AND pg_index.indisprimary
+			WHERE pg_class.oid = $_table::regclass
+		");
+		$primary = (int) $res->fetch(true)['indkey'];

 		$res = $this->driver->query("
 			SELECT *
@@ -147,8 +103,7 @@ class PostgreSQLEngine implements Engine
 					a.atttypmod-4 AS character_maximum_length,
 					NOT a.attnotnull AS is_nullable,
 					a.attnum AS ordinal_position,
-					pg_get_expr(adef.adbin, adef.adrelid) AS column_default,
-					CASE WHEN a.attidentity IN ('a', 'd') THEN 'YES' ELSE 'NO' END AS is_identity
+					pg_get_expr(adef.adbin, adef.adrelid) AS column_default
 				FROM
 					pg_attribute a
 					JOIN pg_type ON a.atttypid = pg_type.oid
@@ -173,7 +128,7 @@ class PostgreSQLEngine implements Engine
 				'size' => $size > 0 ? $size : null,
 				'nullable' => $row['is_nullable'] === 'YES' || $row['is_nullable'] === 't' || $row['is_nullable'] === true,
 				'default' => $row['column_default'],
-				'autoincrement' => $row['is_identity'] === 'YES' || str_starts_with($row['column_default'] ?? '', 'nextval('),
+				'autoincrement' => (int) $row['ordinal_position'] === $primary && substr($row['column_default'] ?? '', 0, 7) === 'nextval',
 				'vendor' => $row,
 			];
 		}
@@ -187,7 +142,7 @@ class PostgreSQLEngine implements Engine
 	 */
 	public function getIndexes(string $table): array
 	{
-		$_table = $this->driver->escapeText($this->escapeIdentifier($table));
+		$_table = $this->driver->escapeText($this->driver->escapeIdentifier($table));
 		$res = $this->driver->query("
 			SELECT
 				a.attnum AS ordinal_position,
@@ -237,7 +192,7 @@ class PostgreSQLEngine implements Engine
 	 */
 	public function getForeignKeys(string $table): array
 	{
-		$_table = $this->driver->escapeText($this->escapeIdentifier($table));
+		$_table = $this->driver->escapeText($this->driver->escapeIdentifier($table));

 		$res = $this->driver->query("
 			SELECT
--- a/src/Dibi/Drivers/PostgreResult.php
+++ b/src/Dibi/Drivers/PostgreResult.php
@@ -7,9 +7,9 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\PgSQL;
+namespace Dibi\Drivers;

-use Dibi\Drivers;
+use Dibi;
 use Dibi\Helpers;
 use PgSql;

@@ -17,11 +17,20 @@ use PgSql;
 /**
 * The driver for PostgreSQL result set.
 */
-class Result implements Drivers\Result
+class PostgreResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		private readonly PgSql\Result $resultSet,
-	) {
+	use Dibi\Strict;
+
+	/** @var resource|PgSql\Result */
+	private $resultSet;
+
+
+	/**
+	 * @param  resource|PgSql\Result  $resultSet
+	 */
+	public function __construct($resultSet)
+	{
+		$this->resultSet = $resultSet;
 	}


@@ -87,10 +96,13 @@ class Result implements Drivers\Result

 	/**
 	 * Returns the result set resource.
+	 * @return resource|PgSql\Result|null
 	 */
-	public function getResultResource(): PgSql\Result
+	public function getResultResource()
 	{
-		return $this->resultSet;
+		return is_resource($this->resultSet) || $this->resultSet instanceof PgSql\Result
+			? $this->resultSet
+			: null;
 	}


--- a/src/Dibi/Drivers/Result.php
+++ b/src/Dibi/Drivers/Result.php
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers;
-
-use Dibi\Exception;
-
-
-/**
- * Database result driver.
- */
-interface Result
-{
-	/**
-	 * Returns the number of rows in a result set.
-	 */
-	function getRowCount(): int;
-
-	/**
-	 * Moves cursor position without fetching row.
-	 * @throws Exception
-	 */
-	function seek(int $row): bool;
-
-	/**
-	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool  $type  true for associative array, false for numeric
-	 * @internal
-	 */
-	function fetch(bool $type): ?array;
-
-	/**
-	 * Frees the resources allocated for this result set.
-	 */
-	function free(): void;
-
-	/**
-	 * Returns metadata for all columns in a result set.
-	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
-	 */
-	function getResultColumns(): array;
-
-	/**
-	 * Returns the result set resource.
-	 */
-	function getResultResource(): mixed;
-
-	/**
-	 * Decodes data from result set.
-	 */
-	function unescapeBinary(string $value): string;
-}
--- a/src/Dibi/Drivers/Sqlite3Driver.php
+++ b/src/Dibi/Drivers/Sqlite3Driver.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+
+/**
+ * Alias for SqliteDriver driver.
+ */
+class Sqlite3Driver extends SqliteDriver
+{
+}
--- a/src/Dibi/Drivers/Sqlite3Result.php
+++ b/src/Dibi/Drivers/Sqlite3Result.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+
+/**
+ * Alias for SqliteResult driver.
+ */
+class Sqlite3Result extends SqliteResult
+{
+}
--- a/src/Dibi/Drivers/SQLite3/Connection.php
+++ b/src/Dibi/Drivers/SQLite3/Connection.php
@@ -7,10 +7,9 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\SQLite3;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
 use Dibi\Helpers;
 use SQLite3;

@@ -24,11 +23,18 @@ use SQLite3;
 *   - formatDateTime => how to format datetime in SQL (@see date)
 *   - resource (SQLite3) => existing connection resource
 */
-class Connection implements Drivers\Connection
+class SqliteDriver implements Dibi\Driver
 {
-	private SQLite3 $connection;
-	private string $fmtDate;
-	private string $fmtDateTime;
+	use Dibi\Strict;
+
+	/** @var SQLite3 */
+	private $connection;
+
+	/** @var string  Date format */
+	private $fmtDate;
+
+	/** @var string  Datetime format */
+	private $fmtDateTime;


 	/** @throws Dibi\NotSupportedException */
@@ -57,7 +63,10 @@ class Connection implements Drivers\Connection
 		}

 		// enable foreign keys support (defaultly disabled; if disabled then foreign key constraints are not enforced)
-		$this->query('PRAGMA foreign_keys = ON');
+		$version = SQLite3::version();
+		if ($version['versionNumber'] >= '3006019') {
+			$this->query('PRAGMA foreign_keys = ON');
+		}
 	}


@@ -74,7 +83,7 @@ class Connection implements Drivers\Connection
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		$res = @$this->connection->query($sql); // intentionally @
 		if ($code = $this->connection->lastErrorCode()) {
@@ -93,19 +102,19 @@ class Connection implements Drivers\Connection
 		if ($code !== 19) {
 			return new Dibi\DriverException($message, $code, $sql);

-		} elseif (str_contains($message, 'must be unique')
-			|| str_contains($message, 'is not unique')
-			|| str_contains($message, 'UNIQUE constraint failed')
+		} elseif (strpos($message, 'must be unique') !== false
+			|| strpos($message, 'is not unique') !== false
+			|| strpos($message, 'UNIQUE constraint failed') !== false
 		) {
 			return new Dibi\UniqueConstraintViolationException($message, $code, $sql);

-		} elseif (str_contains($message, 'may not be null')
-			|| str_contains($message, 'NOT NULL constraint failed')
+		} elseif (strpos($message, 'may not be null') !== false
+			|| strpos($message, 'NOT NULL constraint failed') !== false
 		) {
 			return new Dibi\NotNullConstraintViolationException($message, $code, $sql);

-		} elseif (str_contains($message, 'foreign key constraint failed')
-			|| str_contains($message, 'FOREIGN KEY constraint failed')
+		} elseif (strpos($message, 'foreign key constraint failed') !== false
+			|| strpos($message, 'FOREIGN KEY constraint failed') !== false
 		) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);

@@ -175,18 +184,18 @@ class Connection implements Drivers\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
-		return new Drivers\Engines\SQLiteEngine($this);
+		return new SqliteReflector($this);
 	}


 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\SQLite3Result $result): Result
+	public function createResultDriver(\SQLite3Result $result): SqliteResult
 	{
-		return new Result($result);
+		return new SqliteResult($result);
 	}


@@ -208,6 +217,61 @@ class Connection implements Drivers\Connection
 	}


+	public function escapeIdentifier(string $value): string
+	{
+		return '[' . strtr($value, '[]', '  ') . ']';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format($this->fmtDate);
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format($this->fmtDateTime);
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes($this->connection->escapeString($value), '%_\\');
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== null || $offset) {
+			$sql .= ' LIMIT ' . ($limit ?? '-1')
+				. ($offset ? ' OFFSET ' . $offset : '');
+		}
+	}
+
+
 	/********************* user defined functions ****************d*g**/


@@ -227,7 +291,7 @@ class Connection implements Drivers\Connection
 		string $name,
 		callable $rowCallback,
 		callable $agrCallback,
-		int $numArgs = -1,
+		int $numArgs = -1
 	): void
 	{
 		$this->connection->createAggregate($name, $rowCallback, $agrCallback, $numArgs);
--- a/src/Dibi/Drivers/Engines/SQLiteEngine.php
+++ b/src/Dibi/Drivers/Engines/SQLiteEngine.php
@@ -7,76 +7,25 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Engines;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers\Connection;
-use Dibi\Drivers\Engine;


 /**
 * The reflector for SQLite database.
 */
-class SQLiteEngine implements Engine
+class SqliteReflector implements Dibi\Reflector
 {
-	public function __construct(
-		private readonly Connection $driver,
-	) {
-	}
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;


-	public function escapeIdentifier(string $value): string
+	public function __construct(Dibi\Driver $driver)
 	{
-		return '[' . strtr($value, '[]', '  ') . ']';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format($this->fmtDate); // TODO
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format($this->fmtDateTime); // TODO
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes($this->driver->escapeText($value), '%_\\');
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null || $offset) {
-			$sql .= ' LIMIT ' . ($limit ?? '-1')
-				. ($offset ? ' OFFSET ' . $offset : '');
-		}
+		$this->driver = $driver;
 	}


@@ -105,7 +54,7 @@ class SQLiteEngine implements Engine
 	 */
 	public function getColumns(string $table): array
 	{
-		$res = $this->driver->query("PRAGMA table_info({$this->escapeIdentifier($table)})");
+		$res = $this->driver->query("PRAGMA table_info({$this->driver->escapeIdentifier($table)})");
 		$columns = [];
 		while ($row = $res->fetch(true)) {
 			$column = $row['name'];
@@ -132,7 +81,7 @@ class SQLiteEngine implements Engine
 	 */
 	public function getIndexes(string $table): array
 	{
-		$res = $this->driver->query("PRAGMA index_list({$this->escapeIdentifier($table)})");
+		$res = $this->driver->query("PRAGMA index_list({$this->driver->escapeIdentifier($table)})");
 		$indexes = [];
 		while ($row = $res->fetch(true)) {
 			$indexes[$row['name']]['name'] = $row['name'];
@@ -140,7 +89,7 @@ class SQLiteEngine implements Engine
 		}

 		foreach ($indexes as $index => $values) {
-			$res = $this->driver->query("PRAGMA index_info({$this->escapeIdentifier($index)})");
+			$res = $this->driver->query("PRAGMA index_info({$this->driver->escapeIdentifier($index)})");
 			while ($row = $res->fetch(true)) {
 				$indexes[$index]['columns'][$row['seqno']] = $row['name'];
 			}
@@ -183,7 +132,7 @@ class SQLiteEngine implements Engine
 	 */
 	public function getForeignKeys(string $table): array
 	{
-		$res = $this->driver->query("PRAGMA foreign_key_list({$this->escapeIdentifier($table)})");
+		$res = $this->driver->query("PRAGMA foreign_key_list({$this->driver->escapeIdentifier($table)})");
 		$keys = [];
 		while ($row = $res->fetch(true)) {
 			$keys[$row['id']]['name'] = $row['id']; // foreign key name
--- a/src/Dibi/Drivers/SQLite3/Result.php
+++ b/src/Dibi/Drivers/SQLite3/Result.php
@@ -7,22 +7,26 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\SQLite3;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
 use Dibi\Helpers;
-use const SQLITE3_ASSOC, SQLITE3_BLOB, SQLITE3_FLOAT, SQLITE3_INTEGER, SQLITE3_NULL, SQLITE3_NUM, SQLITE3_TEXT;


 /**
 * The driver for SQLite result set.
 */
-class Result implements Drivers\Result
+class SqliteResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		private readonly \SQLite3Result $resultSet,
-	) {
+	use Dibi\Strict;
+
+	/** @var \SQLite3Result */
+	private $resultSet;
+
+
+	public function __construct(\SQLite3Result $resultSet)
+	{
+		$this->resultSet = $resultSet;
 	}


@@ -72,7 +76,7 @@ class Result implements Drivers\Result
 	{
 		$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),
--- a/src/Dibi/Drivers/SQLSrv/Connection.php
+++ b/src/Dibi/Drivers/SQLSrv/Connection.php
@@ -7,12 +7,10 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\SQLSrv;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
 use Dibi\Helpers;
-use function is_resource, sprintf;


 /**
@@ -27,11 +25,18 @@ use function is_resource, sprintf;
 *   - charset => character encoding to set (default is UTF-8)
 *   - resource (resource) => existing connection resource
 */
-class Connection implements Drivers\Connection
+class SqlsrvDriver implements Dibi\Driver
 {
+	use Dibi\Strict;
+
 	/** @var resource */
 	private $connection;
-	private ?int $affectedRows;
+
+	/** @var int|null  Affected rows */
+	private $affectedRows;
+
+	/** @var string */
+	private $version = '';


 	/** @throws Dibi\NotSupportedException */
@@ -55,7 +60,7 @@ class Connection implements Drivers\Connection
 			$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'];
@@ -69,6 +74,8 @@ class Connection implements Drivers\Connection

 			sqlsrv_configure('WarningsReturnAsErrors', 1);
 		}
+
+		$this->version = sqlsrv_server_info($this->connection)['SQLServerVersion'];
 	}


@@ -85,7 +92,7 @@ class Connection implements Drivers\Connection
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		$this->affectedRows = null;
 		$res = sqlsrv_query($this->connection, $sql);
@@ -163,7 +170,7 @@ class Connection implements Drivers\Connection
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource(): mixed
+	public function getResource()
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}
@@ -172,9 +179,9 @@ class Connection implements Drivers\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Drivers\Engine
+	public function getReflector(): Dibi\Reflector
 	{
-		return new Drivers\Engines\SQLServerEngine($this);
+		return new SqlsrvReflector($this);
 	}


@@ -182,9 +189,9 @@ class Connection implements Drivers\Connection
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): Result
+	public function createResultDriver($resource): SqlsrvResult
 	{
-		return new Result($resource);
+		return new SqlsrvResult($resource);
 	}


@@ -204,4 +211,70 @@ class Connection implements Drivers\Connection
 	{
 		return '0x' . bin2hex($value);
 	}
+
+
+	public function escapeIdentifier(string $value): string
+	{
+		// @see https://msdn.microsoft.com/en-us/library/ms176027.aspx
+		return '[' . str_replace(']', ']]', $value) . ']';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return 'CONVERT(DATETIME2(7), ' . $value->format("'Y-m-d H:i:s.u'") . ')';
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif (version_compare($this->version, '11', '<')) { // 11 == SQL Server 2012
+			if ($offset) {
+				throw new Dibi\NotSupportedException('Offset is not supported by this database.');
+
+			} elseif ($limit !== null) {
+				$sql = sprintf('SELECT TOP (%d) * FROM (%s) t', $limit, $sql);
+			}
+		} elseif ($limit !== null) {
+			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+			$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
+		} elseif ($offset) {
+			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+			$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
+		}
+	}
 }
--- a/src/Dibi/Drivers/Engines/SQLServerEngine.php
+++ b/src/Dibi/Drivers/Engines/SQLServerEngine.php
@@ -7,80 +7,25 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\Engines;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers\Connection;
-use Dibi\Drivers\Engine;


 /**
 * The reflector for Microsoft SQL Server and SQL Azure databases.
 */
-class SQLServerEngine implements Engine
+class SqlsrvReflector implements Dibi\Reflector
 {
-	public function __construct(
-		private readonly Connection $driver,
-	) {
-	}
+	use Dibi\Strict;
+
+	/** @var Dibi\Driver */
+	private $driver;


-	public function escapeIdentifier(string $value): string
+	public function __construct(Dibi\Driver $driver)
 	{
-		// @see https://msdn.microsoft.com/en-us/library/ms176027.aspx
-		return '[' . str_replace(']', ']]', $value) . ']';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return 'CONVERT(DATETIME2(7), ' . $value->format("'Y-m-d H:i:s.u'") . ')';
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null) {
-			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-			$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
-		} elseif ($offset) {
-			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-			$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
-		}
+		$this->driver = $driver;
 	}


--- a/src/Dibi/Drivers/SQLSrv/Result.php
+++ b/src/Dibi/Drivers/SQLSrv/Result.php
@@ -7,22 +7,28 @@

 declare(strict_types=1);

-namespace Dibi\Drivers\SQLSrv;
+namespace Dibi\Drivers;

 use Dibi;
-use Dibi\Drivers;
-use function is_resource;


 /**
 * The driver for Microsoft SQL Server and SQL Azure result set.
 */
-class Result implements Drivers\Result
+class SqlsrvResult implements Dibi\ResultDriver
 {
-	public function __construct(
-		/** @var resource */
-		private $resultSet,
-	) {
+	use Dibi\Strict;
+
+	/** @var resource */
+	private $resultSet;
+
+
+	/**
+	 * @param  resource  $resultSet
+	 */
+	public function __construct($resultSet)
+	{
+		$this->resultSet = $resultSet;
 	}


@@ -85,7 +91,7 @@ class Result implements Drivers\Result
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource(): mixed
+	public function getResultResource()
 	{
 		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
--- a/src/Dibi/Event.php
+++ b/src/Dibi/Event.php
@@ -9,15 +9,14 @@ declare(strict_types=1);

 namespace Dibi;

-use function count, dirname, microtime, preg_match, str_starts_with, strtoupper, trim;
-use const DIRECTORY_SEPARATOR;
-

 /**
 * Profiler & logger event.
 */
 class Event
 {
+	use Strict;
+
 	/** event type */
 	public const
 		CONNECT = 1,
@@ -32,13 +31,26 @@ class Event
 		TRANSACTION = 448, // BEGIN | COMMIT | ROLLBACK
 		ALL = 1023;

-	public readonly Connection $connection;
-	public int $type;
-	public readonly string $sql;
-	public readonly Result|DriverException|null $result;
-	public float $time;
-	public ?int $count = null;
-	public ?array $source = null;
+	/** @var Connection */
+	public $connection;
+
+	/** @var int */
+	public $type;
+
+	/** @var string */
+	public $sql;
+
+	/** @var Result|DriverException|null */
+	public $result;
+
+	/** @var float */
+	public $time;
+
+	/** @var int|null */
+	public $count;
+
+	/** @var array|null */
+	public $source;


 	public function __construct(Connection $connection, int $type, ?string $sql = null)
@@ -49,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,
 			];
@@ -61,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;
@@ -74,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 {
--- a/src/Dibi/Expression.php
+++ b/src/Dibi/Expression.php
@@ -15,7 +15,10 @@ namespace Dibi;
 */
 class Expression
 {
-	private readonly array $values;
+	use Strict;
+
+	/** @var array */
+	private $values;


 	public function __construct(...$values)
--- a/src/Dibi/Fluent.php
+++ b/src/Dibi/Fluent.php
@@ -9,8 +9,6 @@ declare(strict_types=1);

 namespace Dibi;

-use function array_key_exists, count, func_get_args, is_array, is_string;
-

 /**
 * SQL builder via fluent interfaces.
@@ -47,15 +45,12 @@ use function array_key_exists, count, func_get_args, is_array, is_string;
 */
 class Fluent implements IDataSource
 {
-	public const
-		AffectedRows = 'a',
-		Identifier = 'n',
-		Remove = false;
+	use Strict;

-	#[\Deprecated('use Fluent::Remove')]
-	public const REMOVE = self::Remove;
+	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'],
@@ -63,8 +58,8 @@ class Fluent implements IDataSource
 		'DELETE' => ['DELETE', 'FROM', 'USING', 'WHERE', 'ORDER BY', 'LIMIT'],
 	];

-	/** default modifiers for arrays */
-	public static array $modifiers = [
+	/** @var array  default modifiers for arrays */
+	public static $modifiers = [
 		'SELECT' => '%n',
 		'FROM' => '%n',
 		'IN' => '%in',
@@ -76,8 +71,8 @@ class Fluent implements IDataSource
 		'GROUP BY' => '%by',
 	];

-	/** clauses separators */
-	public static array $separators = [
+	/** @var array  clauses separators */
+	public static $separators = [
 		'SELECT' => ',',
 		'FROM' => ',',
 		'WHERE' => 'AND',
@@ -91,31 +86,42 @@ class Fluent implements IDataSource
 		'INTO' => false,
 	];

-	/** clauses */
-	public static array $clauseSwitches = [
+	/** @var array  clauses */
+	public static $clauseSwitches = [
 		'JOIN' => 'FROM',
 		'INNER JOIN' => 'FROM',
 		'LEFT JOIN' => 'FROM',
 		'RIGHT JOIN' => 'FROM',
 	];

-	private readonly Connection $connection;
-	private array $setups = [];
-	private ?string $command = null;
-	private array $clauses = [];
-	private array $flags = [];
+	/** @var Connection */
+	private $connection;
+
+	/** @var array */
+	private $setups = [];
+
+	/** @var string|null */
+	private $command;
+
+	/** @var array */
+	private $clauses = [];
+
+	/** @var array */
+	private $flags = [];
+
+	/** @var array|null */
 	private $cursor;

-	/** normalized clauses */
-	private static HashMap $normalizer;
+	/** @var HashMap  normalized clauses */
+	private static $normalizer;


 	public function __construct(Connection $connection)
 	{
 		$this->connection = $connection;

-		if (!isset(self::$normalizer)) {
-			self::$normalizer = new HashMap(self::_formatClause(...));
+		if (self::$normalizer === null) {
+			self::$normalizer = new HashMap([self::class, '_formatClause']);
 		}
 	}

@@ -123,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;

@@ -148,7 +154,7 @@ class Fluent implements IDataSource
 			$this->cursor = &$this->clauses[$clause];

 			// TODO: really delete?
-			if ($args === [self::Remove]) {
+			if ($args === [self::REMOVE]) {
 				$this->cursor = null;
 				return $this;
 			}
@@ -164,7 +170,7 @@ class Fluent implements IDataSource
 			}
 		} else {
 			// append to currect flow
-			if ($args === [self::Remove]) {
+			if ($args === [self::REMOVE]) {
 				return $this;
 			}

@@ -210,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) {
@@ -224,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;
@@ -234,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) {
@@ -274,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;
@@ -286,25 +292,28 @@ class Fluent implements IDataSource

 	/**
 	 * Generates and executes SQL query.
-	 * Returns result set or number of affected rows
-	 * @return ($return is self::Identifier|self::AffectedRows ? int : Result)
+	 * @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());
-		return match ($return) {
-			self::Identifier => $this->connection->getInsertId(),
-			self::AffectedRows => $this->connection->getAffectedRows(),
-			default => $res,
-		};
+		switch ($return) {
+			case \dibi::IDENTIFIER:
+				return $this->connection->getInsertId();
+			case \dibi::AFFECTED_ROWS:
+				return $this->connection->getAffectedRows();
+			default:
+				return $res;
+		}
 	}


 	/**
 	 * 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()
@@ -314,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()
@@ -404,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 '';
+		}
 	}


--- a/src/Dibi/HashMap.php
+++ b/src/Dibi/HashMap.php
@@ -46,7 +46,7 @@ abstract class HashMapBase
 */
 final class HashMap extends HashMapBase
 {
-	public function __set(string $nm, mixed $val): void
+	public function __set(string $nm, $val)
 	{
 		if ($nm === '') {
 			$nm = "\xFF";
@@ -56,7 +56,7 @@ final class HashMap extends HashMapBase
 	}


-	public function __get(string $nm): mixed
+	public function __get(string $nm)
 	{
 		if ($nm === '') {
 			$nm = "\xFF";
--- a/src/Dibi/Helpers.php
+++ b/src/Dibi/Helpers.php
@@ -9,23 +9,24 @@ declare(strict_types=1);

 namespace Dibi;

-use function array_map, array_unique, explode, fclose, fgets, fopen, fstat, getenv, htmlspecialchars, is_float, is_int, is_string, levenshtein, max, mb_strlen, ob_end_flush, ob_get_clean, ob_start, preg_match, preg_replace, preg_replace_callback, rtrim, set_time_limit, str_ends_with, str_repeat, str_starts_with, strlen, strtoupper, substr, trim, wordwrap;
-use const PHP_SAPI;
-

 class Helpers
 {
-	private static HashMap $types;
+	use Strict;
+
+	/** @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) {
@@ -74,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';
-			$keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
+			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';
+			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 ";
@@ -90,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";
@@ -159,15 +160,15 @@ class Helpers


 	/** @internal */
-	public static function escape(Drivers\Connection $driver, $value, string $type): string
+	public static function escape(Driver $driver, $value, string $type): string
 	{
-		$types = [
-			Type::Text => 'text',
-			Type::Binary => 'binary',
-			Type::Bool => 'bool',
-			Type::Date => 'date',
-			Type::DateTime => 'datetime',
-			Fluent::Identifier => 'identifier',
+		static $types = [
+			Type::TEXT => 'text',
+			Type::BINARY => 'binary',
+			Type::BOOL => 'bool',
+			Type::DATE => 'date',
+			Type::DATETIME => 'datetime',
+			\dibi::IDENTIFIER => 'identifier',
 		];
 		if (isset($types[$type])) {
 			return $driver->{'escape' . $types[$type]}($value);
@@ -183,17 +184,17 @@ class Helpers
 	 */
 	public static function detectType(string $type): ?string
 	{
-		$patterns = [
-			'^_' => Type::Text, // PostgreSQL arrays
-			'RANGE$' => Type::Text, // PostgreSQL range types
-			'BYTEA|BLOB|BIN' => Type::Binary,
-			'TEXT|CHAR|POINT|INTERVAL|STRING' => Type::Text,
-			'YEAR|BYTE|COUNTER|SERIAL|INT|LONG|SHORT|^TINY$' => Type::Integer,
-			'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => Type::Float,
-			'^TIME$' => Type::Time,
-			'TIME' => Type::DateTime, // DATETIME, TIMESTAMP
-			'DATE' => Type::Date,
-			'BOOL' => Type::Bool,
+		static $patterns = [
+			'^_' => Type::TEXT, // PostgreSQL arrays
+			'RANGE$' => Type::TEXT, // PostgreSQL range types
+			'BYTEA|BLOB|BIN' => Type::BINARY,
+			'TEXT|CHAR|POINT|INTERVAL|STRING' => Type::TEXT,
+			'YEAR|BYTE|COUNTER|SERIAL|INT|LONG|SHORT|^TINY$' => Type::INTEGER,
+			'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => Type::FLOAT,
+			'^TIME$' => Type::TIME,
+			'TIME' => Type::DATETIME, // DATETIME, TIMESTAMP
+			'DATE' => Type::DATE,
+			'BOOL' => Type::BOOL,
 			'JSON' => Type::JSON,
 		];

@@ -210,8 +211,8 @@ class Helpers
 	/** @internal */
 	public static function getTypeCache(): HashMap
 	{
-		if (!isset(self::$types)) {
-			self::$types = new HashMap(self::detectType(...));
+		if (self::$types === null) {
+			self::$types = new HashMap([self::class, 'detectType']);
 		}

 		return self::$types;
@@ -237,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
 	{
@@ -258,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 = '';
@@ -285,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;
--- a/src/Dibi/IDataSource.php
+++ b/src/Dibi/IDataSource.php
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi;
-
-
-/**
- * Provides an interface between a dataset and data-aware components.
- */
-interface IDataSource extends \Countable, \IteratorAggregate
-{
-	//function \IteratorAggregate::getIterator();
-	//function \Countable::count();
-}
--- a/src/Dibi/Literal.php
+++ b/src/Dibi/Literal.php
@@ -15,7 +15,10 @@ namespace Dibi;
 */
 class Literal
 {
-	private readonly string $value;
+	use Strict;
+
+	/** @var string */
+	private $value;


 	public function __construct($value)
--- a/src/Dibi/Loggers/FileLogger.php
+++ b/src/Dibi/Loggers/FileLogger.php
@@ -10,8 +10,6 @@ declare(strict_types=1);
 namespace Dibi\Loggers;

 use Dibi;
-use function sprintf;
-use const FILE_APPEND, LOCK_EX;


 /**
@@ -19,11 +17,23 @@ use const FILE_APPEND, LOCK_EX;
 */
 class FileLogger
 {
-	public function __construct(
-		public string $file,
-		public int $filter = Dibi\Event::QUERY,
-		private bool $errorsOnly = false,
-	) {
+	use Dibi\Strict;
+
+	/** @var string  Name of the file where SQL errors should be logged */
+	public $file;
+
+	/** @var int */
+	public $filter;
+
+	/** @var bool */
+	private $errorsOnly;
+
+
+	public function __construct(string $file, ?int $filter = null, bool $errorsOnly = false)
+	{
+		$this->file = $file;
+		$this->filter = $filter ?: Dibi\Event::QUERY;
+		$this->errorsOnly = $errorsOnly;
 	}


@@ -48,7 +58,7 @@ class FileLogger
 			$this->writeToFile(
 				$event,
 				"ERROR: $message"
-					. "\n-- SQL: " . $event->sql,
+					. "\n-- SQL: " . $event->sql
 			);
 		} else {
 			$this->writeToFile(
@@ -56,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)
 			);
 		}
 	}
@@ -66,7 +76,7 @@ class FileLogger
 	{
 		$driver = $event->connection->getConfig('driver');
 		$message .=
-			"\n-- driver: " . get_debug_type($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);
--- a/src/Dibi/Reflection/Column.php
+++ b/src/Dibi/Reflection/Column.php
@@ -27,10 +27,19 @@ use Dibi;
 */
 class Column
 {
-	public function __construct(
-		private readonly ?Dibi\Drivers\Engine $reflector,
-		private array $info,
-	) {
+	use Dibi\Strict;
+
+	/** @var Dibi\Reflector|null when created by Result */
+	private $reflector;
+
+	/** @var array (name, nativetype, [table], [fullname], [size], [nullable], [default], [autoincrement], [vendor]) */
+	private $info;
+
+
+	public function __construct(?Dibi\Reflector $reflector, array $info)
+	{
+		$this->reflector = $reflector;
+		$this->info = $info;
 	}


@@ -100,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;
 	}
--- a/src/Dibi/Reflection/Database.php
+++ b/src/Dibi/Reflection/Database.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace Dibi\Reflection;

 use Dibi;
-use function array_values, strtolower;


 /**
@@ -22,14 +21,22 @@ use function array_values, strtolower;
 */
 class Database
 {
-	/** @var Table[] */
-	private array $tables;
+	use Dibi\Strict;
+
+	/** @var Dibi\Reflector */
+	private $reflector;
+
+	/** @var string|null */
+	private $name;
+
+	/** @var Table[]|null */
+	private $tables;


-	public function __construct(
-		private readonly Dibi\Drivers\Engine $reflector,
-		private ?string $name = null,
-	) {
+	public function __construct(Dibi\Reflector $reflector, ?string $name = null)
+	{
+		$this->reflector = $reflector;
+		$this->name = $name;
 	}


@@ -82,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);
--- a/src/Dibi/Reflection/ForeignKey.php
+++ b/src/Dibi/Reflection/ForeignKey.php
@@ -9,6 +9,7 @@ declare(strict_types=1);

 namespace Dibi\Reflection;

+use Dibi;


 /**
@@ -19,10 +20,19 @@ namespace Dibi\Reflection;
 */
 class ForeignKey
 {
-	public function __construct(
-		private readonly string $name,
-		private readonly array $references,
-	) {
+	use Dibi\Strict;
+
+	/** @var string */
+	private $name;
+
+	/** @var array of [local, foreign, onDelete, onUpdate] */
+	private $references;
+
+
+	public function __construct(string $name, array $references)
+	{
+		$this->name = $name;
+		$this->references = $references;
 	}


--- a/src/Dibi/Reflection/Index.php
+++ b/src/Dibi/Reflection/Index.php
@@ -9,6 +9,7 @@ declare(strict_types=1);

 namespace Dibi\Reflection;

+use Dibi;


 /**
@@ -21,9 +22,15 @@ namespace Dibi\Reflection;
 */
 class Index
 {
-	public function __construct(
-		private readonly array $info,
-	) {
+	use Dibi\Strict;
+
+	/** @var array (name, columns, [unique], [primary]) */
+	private $info;
+
+
+	public function __construct(array $info)
+	{
+		$this->info = $info;
 	}


--- a/src/Dibi/Reflection/Result.php
+++ b/src/Dibi/Reflection/Result.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace Dibi\Reflection;

 use Dibi;
-use function array_values, strtolower;


 /**
@@ -21,16 +20,21 @@ use function array_values, strtolower;
 */
 class Result
 {
-	/** @var Column[]|null */
-	private ?array $columns;
+	use Dibi\Strict;
+
+	/** @var Dibi\ResultDriver */
+	private $driver;

 	/** @var Column[]|null */
-	private ?array $names;
+	private $columns;
+
+	/** @var Column[]|null */
+	private $names;


-	public function __construct(
-		private readonly Dibi\Drivers\Result $driver,
-	) {
+	public function __construct(Dibi\ResultDriver $driver)
+	{
+		$this->driver = $driver;
 	}


@@ -77,9 +81,9 @@ class Result

 	protected function initColumns(): void
 	{
-		if (!isset($this->columns)) {
+		if ($this->columns === null) {
 			$this->columns = [];
-			$reflector = $this->driver instanceof Dibi\Drivers\Engine
+			$reflector = $this->driver instanceof Dibi\Reflector
 				? $this->driver
 				: null;
 			foreach ($this->driver->getResultColumns() as $info) {
--- a/src/Dibi/Reflection/Table.php
+++ b/src/Dibi/Reflection/Table.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace Dibi\Reflection;

 use Dibi;
-use function array_values, strtolower;


 /**
@@ -26,22 +25,31 @@ use function array_values, strtolower;
 */
 class Table
 {
-	private readonly Dibi\Drivers\Engine $reflector;
-	private string $name;
-	private bool $view;
+	use Dibi\Strict;

-	/** @var Column[] */
-	private array $columns;
+	/** @var Dibi\Reflector */
+	private $reflector;

-	/** @var ForeignKey[] */
-	private array $foreignKeys;
+	/** @var string */
+	private $name;

-	/** @var Index[] */
-	private array $indexes;
-	private ?Index $primaryKey;
+	/** @var bool */
+	private $view;
+
+	/** @var Column[]|null */
+	private $columns;
+
+	/** @var ForeignKey[]|null */
+	private $foreignKeys;
+
+	/** @var Index[]|null */
+	private $indexes;
+
+	/** @var Index|null */
+	private $primaryKey;


-	public function __construct(Dibi\Drivers\Engine $reflector, array $info)
+	public function __construct(Dibi\Reflector $reflector, array $info)
 	{
 		$this->reflector = $reflector;
 		$this->name = $info['name'];
@@ -127,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);
@@ -138,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) {
--- a/src/Dibi/Result.php
+++ b/src/Dibi/Result.php
@@ -9,9 +9,6 @@ declare(strict_types=1);

 namespace Dibi;

-use function array_keys, array_pop, count, explode, is_float, is_string, json_decode, ltrim, preg_match, preg_split, property_exists, reset, rtrim, str_contains, str_replace, str_starts_with, strpos;
-use const PREG_SPLIT_DELIM_CAPTURE, PREG_SPLIT_NO_EMPTY;
-

 /**
 * Query result.
@@ -20,24 +17,31 @@ use const PREG_SPLIT_DELIM_CAPTURE, PREG_SPLIT_NO_EMPTY;
 */
 class Result implements IDataSource
 {
-	private ?Drivers\Result $driver;
+	use Strict;

-	/** Translate table */
-	private array $types = [];
-	private ?Reflection\Result $meta;
+	/** @var ResultDriver|null */
+	private $driver;

-	/** Already fetched? Used for allowance for first seek(0) */
-	private bool $fetched = false;
+	/** @var array  Translate table */
+	private $types = [];

-	/** returned object class */
-	private ?string $rowClass = Row::class;
+	/** @var Reflection\Result|null */
+	private $meta;
+
+	/** @var bool  Already fetched? Used for allowance for first seek(0) */
+	private $fetched = false;
+
+	/** @var string|null  returned object class */
+	private $rowClass = Row::class;

 	/** @var callable|null  returned object factory */
 	private $rowFactory;
-	private array $formats = [];
+
+	/** @var array  format */
+	private $formats = [];


-	public function __construct(Drivers\Result $driver, bool $normalize = true)
+	public function __construct(ResultDriver $driver, bool $normalize = true)
 	{
 		$this->driver = $driver;
 		if ($normalize) {
@@ -62,7 +66,7 @@ class Result implements IDataSource
 	 * Safe access to property $driver.
 	 * @throws \RuntimeException
 	 */
-	final public function getResultDriver(): Drivers\Result
+	final public function getResultDriver(): ResultDriver
 	{
 		if ($this->driver === null) {
 			throw new \RuntimeException('Result-set was released from memory.');
@@ -129,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;
@@ -148,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;
@@ -158,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) {
@@ -180,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) {
@@ -201,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) {
@@ -233,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);
 		}

@@ -460,22 +465,16 @@ class Result implements IDataSource
 			if ($type === null || $format === 'native') {
 				$row[$key] = $value;

-			} elseif ($type === Type::Text) {
+			} elseif ($type === Type::TEXT) {
 				$row[$key] = (string) $value;

-			} elseif ($type === Type::Integer) {
+			} elseif ($type === Type::INTEGER) {
 				$row[$key] = is_float($tmp = $value * 1)
 					? (is_string($value) ? $value : (int) $value)
 					: $tmp;

-			} elseif ($type === Type::Float) {
-				if (!is_string($value)) {
-					$row[$key] = (float) $value;
-					continue;
-				}
-
-				$negative = ($value[0] ?? null) === '-';
-				$value = ltrim($value, '0-');
+			} elseif ($type === Type::FLOAT) {
+				$value = ltrim((string) $value, '0');
 				$p = strpos($value, '.');
 				$e = strpos($value, 'e');
 				if ($p !== false && $e === false) {
@@ -488,31 +487,27 @@ class Result implements IDataSource
 					$value = '0' . $value;
 				}

-				if ($negative) {
-					$value = '-' . $value;
-				}
-
 				$row[$key] = $value === str_replace(',', '.', (string) ($float = (float) $value))
 					? $float
 					: $value;

-			} elseif ($type === Type::Bool) {
+			} elseif ($type === Type::BOOL) {
 				$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', ...
+			} elseif ($type === Type::DATETIME || $type === Type::DATE || $type === Type::TIME) {
+				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 {
 					$row[$key] = null;
 				}
-			} elseif ($type === Type::TimeInterval) {
+			} elseif ($type === Type::TIME_INTERVAL) {
 				preg_match('#^(-?)(\d+)\D(\d+)\D(\d+)\z#', $value, $m);
 				$value = new \DateInterval("PT$m[2]H$m[3]M$m[4]S");
 				$value->invert = (int) (bool) $m[1];
 				$row[$key] = $format ? $value->format($format) : $value;

-			} elseif ($type === Type::Binary) {
+			} elseif ($type === Type::BINARY) {
 				$row[$key] = is_string($value)
 					? $this->getResultDriver()->unescapeBinary($value)
 					: $value;
@@ -534,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;
@@ -562,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;
@@ -572,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;
@@ -596,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());
 		}

--- a/src/Dibi/ResultIterator.php
+++ b/src/Dibi/ResultIterator.php
@@ -15,13 +15,21 @@ namespace Dibi;
 */
 class ResultIterator implements \Iterator, \Countable
 {
-	private mixed $row;
-	private int $pointer = 0;
+	use Strict;
+
+	/** @var Result */
+	private $result;
+
+	/** @var mixed */
+	private $row;
+
+	/** @var int */
+	private $pointer = 0;


-	public function __construct(
-		private readonly Result $result,
-	) {
+	public function __construct(Result $result)
+	{
+		$this->result = $result;
 	}


@@ -38,9 +46,10 @@ class ResultIterator implements \Iterator, \Countable

 	/**
 	 * Returns the key of the current element.
+	 * @return mixed
 	 */
 	#[\ReturnTypeWillChange]
-	public function key(): mixed
+	public function key()
 	{
 		return $this->pointer;
 	}
@@ -48,9 +57,10 @@ class ResultIterator implements \Iterator, \Countable

 	/**
 	 * Returns the current element.
+	 * @return mixed
 	 */
 	#[\ReturnTypeWillChange]
-	public function current(): mixed
+	public function current()
 	{
 		return $this->row;
 	}
--- a/src/Dibi/Row.php
+++ b/src/Dibi/Row.php
@@ -9,8 +9,6 @@ declare(strict_types=1);

 namespace Dibi;

-use function array_keys, count, str_starts_with;
-

 /**
 * Result set single row.
@@ -34,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;
 			}

@@ -50,11 +49,13 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 	}


-	public function __get(string $key): mixed
+	/**
+	 * @return mixed
+	 */
+	public function __get(string $key)
 	{
 		$hint = Helpers::getSuggestion(array_keys((array) $this), $key);
 		trigger_error("Attempt to read missing column '$key'" . ($hint ? ", did you mean '$hint'?" : '.'), E_USER_NOTICE);
-		return null;
 	}


@@ -85,7 +86,8 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 	}


-	final public function offsetGet($nm): mixed
+	#[\ReturnTypeWillChange]
+	final public function offsetGet($nm)
 	{
 		return $this->$nm;
 	}
--- a/src/Dibi/Strict.php
+++ b/src/Dibi/Strict.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi;
+
+use ReflectionClass;
+use ReflectionMethod;
+use ReflectionProperty;
+
+
+/**
+ * Better OOP experience.
+ */
+trait Strict
+{
+	/** @var array [method => [type => callback]] */
+	private static $extMethods;
+
+
+	/**
+	 * Call to undefined method.
+	 * @throws \LogicException
+	 */
+	public function __call(string $name, array $args)
+	{
+		$class = method_exists($this, $name) ? 'parent' : static::class;
+		$items = (new ReflectionClass($this))->getMethods(ReflectionMethod::IS_PUBLIC);
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
+		$hint = ($t = Helpers::getSuggestion($items, $name))
+			? ", did you mean $t()?"
+			: '.';
+		throw new \LogicException("Call to undefined method $class::$name()$hint");
+	}
+
+
+	/**
+	 * Call to undefined static method.
+	 * @throws \LogicException
+	 */
+	public static function __callStatic(string $name, array $args)
+	{
+		$rc = new ReflectionClass(static::class);
+		$items = array_filter($rc->getMethods(\ReflectionMethod::IS_STATIC), function ($m) { return $m->isPublic(); });
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
+		$hint = ($t = Helpers::getSuggestion($items, $name))
+			? ", did you mean $t()?"
+			: '.';
+		throw new \LogicException("Call to undefined static method {$rc->getName()}::$name()$hint");
+	}
+
+
+	/**
+	 * Access to undeclared property.
+	 * @throws \LogicException
+	 */
+	public function &__get(string $name)
+	{
+		if ((method_exists($this, $m = 'get' . $name) || method_exists($this, $m = 'is' . $name))
+			&& (new ReflectionMethod($this, $m))->isPublic()
+		) { // back compatiblity
+			$ret = $this->$m();
+			return $ret;
+		}
+
+		$rc = new ReflectionClass($this);
+		$items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), function ($p) { return !$p->isStatic(); });
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
+		$hint = ($t = Helpers::getSuggestion($items, $name))
+			? ", did you mean $$t?"
+			: '.';
+		throw new \LogicException("Attempt to read undeclared property {$rc->getName()}::$$name$hint");
+	}
+
+
+	/**
+	 * Access to undeclared property.
+	 * @throws \LogicException
+	 */
+	public function __set(string $name, $value)
+	{
+		$rc = new ReflectionClass($this);
+		$items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), function ($p) { return !$p->isStatic(); });
+		$items = array_map(function ($item) { return $item->getName(); }, $items);
+		$hint = ($t = Helpers::getSuggestion($items, $name))
+			? ", did you mean $$t?"
+			: '.';
+		throw new \LogicException("Attempt to write to undeclared property {$rc->getName()}::$$name$hint");
+	}
+
+
+	public function __isset(string $name): bool
+	{
+		return false;
+	}
+
+
+	/**
+	 * Access to undeclared property.
+	 * @throws \LogicException
+	 */
+	public function __unset(string $name)
+	{
+		$class = static::class;
+		throw new \LogicException("Attempt to unset undeclared property $class::$$name.");
+	}
+}
--- a/src/Dibi/Translator.php
+++ b/src/Dibi/Translator.php
@@ -9,36 +9,53 @@ declare(strict_types=1);

 namespace Dibi;

-use function array_filter, array_keys, array_splice, array_values, count, explode, get_debug_type, gettype, implode, is_array, is_bool, is_float, is_int, is_numeric, is_object, is_scalar, is_string, iterator_to_array, key, ltrim, number_format, preg_last_error, preg_match, preg_replace_callback, reset, rtrim, str_contains, str_replace, strcspn, strlen, strncasecmp, strtoupper, substr, trim;
-

 /**
 * SQL translator.
 */
 final class Translator
 {
-	private readonly Connection $connection;
-	private readonly Drivers\Connection $driver;
-	private readonly Drivers\Engine $engine;
-	private int $cursor = 0;
-	private array $args;
+	use Strict;
+
+	/** @var Connection */
+	private $connection;
+
+	/** @var Driver */
+	private $driver;
+
+	/** @var int */
+	private $cursor = 0;
+
+	/** @var array */
+	private $args;

 	/** @var string[] */
-	private array $errors;
-	private bool $comment = false;
-	private int $ifLevel = 0;
-	private int $ifLevelStart = 0;
-	private ?int $limit = null;
-	private ?int $offset = null;
-	private HashMap $identifiers;
+	private $errors;
+
+	/** @var bool */
+	private $comment = false;
+
+	/** @var int */
+	private $ifLevel = 0;
+
+	/** @var int */
+	private $ifLevelStart = 0;
+
+	/** @var int|null */
+	private $limit;
+
+	/** @var int|null */
+	private $offset;
+
+	/** @var HashMap */
+	private $identifiers;


 	public function __construct(Connection $connection)
 	{
 		$this->connection = $connection;
 		$this->driver = $connection->getDriver();
-		$this->engine = $connection->getDatabaseEngine();
-		$this->identifiers = new HashMap($this->delimite(...));
+		$this->identifiers = new HashMap([$this, 'delimite']);
 	}


@@ -79,21 +96,22 @@ final class Translator
 						// note: this can change $this->args & $this->cursor & ...
 						. preg_replace_callback(
 							<<<'XX'
-								/
-								(?=[`['":%?])                       ## speed-up
-								(?:
-									`(.+?)`|                        ## 1) `identifier`
-									\[(.+?)\]|                      ## 2) [identifier]
-									(')((?:''|[^'])*)'|             ## 3,4) string
-									(")((?:""|[^"])*)"|             ## 5,6) "string"
-									('|")|                          ## 7) lone quote
-									:(\S*?:)([a-zA-Z0-9._]?)|       ## 8,9) :substitution:
-									%([a-zA-Z~][a-zA-Z0-9~]{0,5})|  ## 10) modifier
-									(\?)                            ## 11) placeholder
-								)/xs
-								XX,
-							$this->cb(...),
-							substr($arg, $toSkip),
+							/
+							(?=[`['":%?])                       ## speed-up
+							(?:
+								`(.+?)`|                        ## 1) `identifier`
+								\[(.+?)\]|                      ## 2) [identifier]
+								(')((?:''|[^'])*)'|             ## 3,4) string
+								(")((?:""|[^"])*)"|             ## 5,6) "string"
+								('|")|                          ## 7) lone quote
+								:(\S*?:)([a-zA-Z0-9._]?)|       ## 8,9) :substitution:
+								%([a-zA-Z~][a-zA-Z0-9~]{0,5})|  ## 10) modifier
+								(\?)                            ## 11) placeholder
+							)/xs
+XX
+							,
+							[$this, 'cb'],
+							substr($arg, $toSkip)
 						);
 					if (preg_last_error()) {
 						throw new PcreException;
@@ -146,7 +164,7 @@ final class Translator

 		// apply limit
 		if ($this->limit !== null || $this->offset !== null) {
-			$this->engine->applyLimit($sql, $this->limit, $this->offset);
+			$this->driver->applyLimit($sql, $this->limit, $this->offset);
 		}

 		return $sql;
@@ -155,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 '...';
@@ -191,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 ';
@@ -211,7 +230,7 @@ final class Translator
 				case 'n':  // key, key, ... identifier names
 					foreach ($value as $k => $v) {
 						if (is_string($k)) {
-							$vx[] = $this->identifiers->$k . (empty($v) ? '' : ' AS ' . $this->engine->escapeIdentifier($v));
+							$vx[] = $this->identifiers->$k . (empty($v) ? '' : ' AS ' . $this->driver->escapeIdentifier($v));
 						} else {
 							$pair = explode('%', $v, 2); // split into identifier & modifier
 							$vx[] = $this->identifiers->{$pair[0]};
@@ -223,7 +242,7 @@ final class Translator

 				case 'a': // key=val, key=val, ...
 					foreach ($value as $k => $v) {
-						$pair = explode('%', (string) $k, 2); // split into identifier & modifier
+						$pair = explode('%', $k, 2); // split into identifier & modifier
 						$vx[] = $this->identifiers->{$pair[0]} . '='
 							. $this->formatValue($v, $pair[1] ?? (is_array($v) ? 'ex!' : null));
 					}
@@ -261,7 +280,7 @@ final class Translator
 								$proto = array_keys($v);
 							}
 						} else {
-							return $this->errors[] = '**Unexpected type ' . get_debug_type($v) . '**';
+							return $this->errors[] = '**Unexpected type ' . (is_object($v) ? get_class($v) : gettype($v)) . '**';
 						}

 						$pair = explode('%', $k, 2); // split into identifier & modifier
@@ -307,15 +326,6 @@ final class Translator
 			}
 		}

-		if (is_object($value)
-			&& $modifier === null
-			&& !$value instanceof Literal
-			&& !$value instanceof Expression
-			&& $result = $this->connection->translateObject($value)
-		) {
-			return $this->connection->translate(...$result->getValues());
-		}
-
 		// object-to-scalar procession
 		if ($value instanceof \BackedEnum && is_scalar($value->value)) {
 			$value = $value->value;
@@ -339,7 +349,7 @@ final class Translator
 				) {
 					// continue
 				} else {
-					$type = get_debug_type($value);
+					$type = is_object($value) ? get_class($value) : gettype($value);
 					return $this->errors[] = "**Invalid combination of type $type and modifier %$modifier**";
 				}
 			}
@@ -348,7 +358,7 @@ final class Translator
 				case 's':  // string
 					return $value === null
 						? 'NULL'
-						: $this->engine->escapeText((string) $value);
+						: $this->driver->escapeText((string) $value);

 				case 'bin':// binary
 					return $value === null
@@ -358,7 +368,7 @@ final class Translator
 				case 'b':  // boolean
 					return $value === null
 						? 'NULL'
-						: $this->engine->escapeBool((bool) $value);
+						: $this->driver->escapeBool((bool) $value);

 				case 'sN': // string or null
 				case 'sn':
@@ -408,15 +418,15 @@ final class Translator
 					}

 					return $modifier === 'd'
-						? $this->engine->escapeDate($value)
-						: $this->engine->escapeDateTime($value);
+						? $this->driver->escapeDate($value)
+						: $this->driver->escapeDateTime($value);

 				case 'by':
 				case 'n':  // composed identifier name
 					return $this->identifiers->$value;

 				case 'N':  // identifier name
-					return $this->engine->escapeIdentifier($value);
+					return $this->driver->escapeIdentifier($value);

 				case 'ex':
 				case 'sql': // preserve as dibi-SQL  (TODO: leave only %ex)
@@ -427,19 +437,20 @@ final class Translator
 						$value = substr($value, 0, $toSkip)
 							. preg_replace_callback(
 								<<<'XX'
-									/
-									(?=[`['":])
-									(?:
-										`(.+?)`|
-										\[(.+?)]|
-										(')((?:''|[^'])*)'|
-										(")((?:""|[^"])*)"|
-										(['"])|
-										:(\S*?:)([a-zA-Z0-9._]?)
-									)/sx
-									XX,
-								$this->cb(...),
-								substr($value, $toSkip),
+								/
+								(?=[`['":])
+								(?:
+									`(.+?)`|
+									\[(.+?)\]|
+									(')((?:''|[^'])*)'|
+									(")((?:""|[^"])*)"|
+									('|")|
+									:(\S*?:)([a-zA-Z0-9._]?)
+								)/sx
+XX
+								,
+								[$this, 'cb'],
+								substr($value, $toSkip)
 							);
 						if (preg_last_error()) {
 							throw new PcreException;
@@ -452,16 +463,16 @@ final class Translator
 					return (string) $value;

 				case 'like~':  // LIKE string%
-					return $this->engine->escapeLike($value, 2);
+					return $this->driver->escapeLike($value, 2);

 				case '~like':  // LIKE %string
-					return $this->engine->escapeLike($value, 1);
+					return $this->driver->escapeLike($value, 1);

 				case '~like~': // LIKE %string%
-					return $this->engine->escapeLike($value, 3);
+					return $this->driver->escapeLike($value, 3);

 				case 'like': // LIKE string
-					return $this->engine->escapeLike($value, 0);
+					return $this->driver->escapeLike($value, 0);

 				case 'and':
 				case 'or':
@@ -487,16 +498,16 @@ final class Translator
 			return rtrim(rtrim(number_format($value, 10, '.', ''), '0'), '.');

 		} elseif (is_bool($value)) {
-			return $this->engine->escapeBool($value);
+			return $this->driver->escapeBool($value);

 		} elseif ($value === null) {
 			return 'NULL';

 		} elseif ($value instanceof \DateTimeInterface) {
-			return $this->engine->escapeDateTime($value);
+			return $this->driver->escapeDateTime($value);

 		} elseif ($value instanceof \DateInterval) {
-			return $this->engine->escapeDateInterval($value);
+			return $this->driver->escapeDateInterval($value);

 		} elseif ($value instanceof Literal) {
 			return (string) $value;
@@ -505,7 +516,7 @@ final class Translator
 			return $this->connection->translate(...$value->getValues());

 		} else {
-			$type = get_debug_type($value);
+			$type = is_object($value) ? get_class($value) : gettype($value);
 			return $this->errors[] = "**Unexpected $type**";
 		}
 	}
@@ -655,7 +666,7 @@ final class Translator
 		$parts = explode('.', $value);
 		foreach ($parts as &$v) {
 			if ($v !== '*') {
-				$v = $this->engine->escapeIdentifier($v);
+				$v = $this->driver->escapeIdentifier($v);
 			}
 		}

--- a/src/Dibi/Type.php
+++ b/src/Dibi/Type.php
@@ -16,43 +16,16 @@ namespace Dibi;
 class Type
 {
 	public const
-		Text = 's', // as 'string'
-		Binary = 'bin',
+		TEXT = 's', // as 'string'
+		BINARY = 'bin',
 		JSON = 'json',
-		Bool = 'b',
-		Integer = 'i',
-		Float = 'f',
-		Date = 'd',
-		DateTime = 'dt',
-		Time = 't',
-		TimeInterval = 'ti';
-
-	#[\Deprecated('use Type::Text')]
-	public const TEXT = self::Text;
-
-	#[\Deprecated('use Type::Binary')]
-	public const BINARY = self::Binary;
-
-	#[\Deprecated('use Type::Bool')]
-	public const BOOL = self::Bool;
-
-	#[\Deprecated('use Type::Integer')]
-	public const INTEGER = self::Integer;
-
-	#[\Deprecated('use Type::Float')]
-	public const FLOAT = self::Float;
-
-	#[\Deprecated('use Type::Date')]
-	public const DATE = self::Date;
-
-	#[\Deprecated('use Type::DateTime')]
-	public const DATETIME = self::DateTime;
-
-	#[\Deprecated('use Type::Time')]
-	public const TIME = self::Time;
-
-	#[\Deprecated('use Type::TimeInterval')]
-	public const TIME_INTERVAL = self::TimeInterval;
+		BOOL = 'b',
+		INTEGER = 'i',
+		FLOAT = 'f',
+		DATE = 'd',
+		DATETIME = 'dt',
+		TIME = 't',
+		TIME_INTERVAL = 'ti';


 	final public function __construct()
--- a/src/Dibi/dibi.php
+++ b/src/Dibi/dibi.php
@@ -37,36 +37,37 @@ declare(strict_types=1);
 */
 class dibi
 {
-	public const Version = '6.0-dev';
+	use Dibi\Strict;

-	public const VERSION = self::Version;
+	public const
+		AFFECTED_ROWS = 'a',
+		IDENTIFIER = 'n';

-	public const AFFECTED_ROWS = Dibi\Fluent::AffectedRows;
-
-	public const IDENTIFIER = Dibi\Fluent::Identifier;
+	/** version */
+	public const VERSION = '4.2.8';

 	/** sorting order */
 	public const
 		ASC = 'ASC',
 		DESC = 'DESC';

-	/** Last SQL command @see dibi::query() */
-	public static ?string $sql = null;
+	/** @var string|null  Last SQL command @see dibi::query() */
+	public static $sql;

-	/** Elapsed time for last query */
-	public static ?float $elapsedTime = null;
+	/** @var float|null  Elapsed time for last query */
+	public static $elapsedTime;

-	/** Elapsed time for all queries */
-	public static float $totalTime = 0;
+	/** @var float  Elapsed time for all queries */
+	public static $totalTime;

-	/** Number or queries */
-	public static int $numOfQueries = 0;
+	/** @var int  Number or queries */
+	public static $numOfQueries = 0;

 	/** @var Dibi\Connection[]  Connection registry storage for Dibi\Connection objects */
-	private static array $registry = [];
+	private static $registry = [];

-	/** Current connection */
-	private static Dibi\Connection $connection;
+	/** @var Dibi\Connection  Current connection */
+	private static $connection;


 	/**
@@ -86,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);
 	}
@@ -149,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);
 	}
@@ -162,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());
 	}
 }
--- a/src/Dibi/exceptions.php
+++ b/src/Dibi/exceptions.php
@@ -11,19 +11,19 @@ namespace Dibi;


 /**
- * A database operation failed.
+ * Dibi common exception.
 */
 class Exception extends \Exception
 {
-	private ?string $sql;
+	/** @var string|null */
+	private $sql;


-	public function __construct(
-		string $message = '',
-		int|string $code = 0,
-		?string $sql = null,
-		?\Throwable $previous = null,
-	) {
+	/**
+	 * @param  int|string  $code
+	 */
+	public function __construct(string $message = '', $code = 0, ?string $sql = null, ?\Throwable $previous = null)
+	{
 		parent::__construct($message, 0, $previous);
 		$this->code = $code;
 		$this->sql = $sql;
@@ -44,7 +44,7 @@ class Exception extends \Exception


 /**
- * The database server reported an error.
+ * database server exception.
 */
 class DriverException extends Exception
 {
@@ -52,39 +52,42 @@ class DriverException extends Exception


 /**
- * Regular expression pattern or execution failed.
+ * PCRE 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);
 	}
 }


-/**
- * The requested feature is not implemented.
- */
 class NotImplementedException extends Exception
 {
 }


-/**
- * The requested operation is not supported.
- */
 class NotSupportedException extends Exception
 {
 }


 /**
- * A database stored procedure failed.
+ * Database procedure exception.
 */
 class ProcedureException extends Exception
 {
-	protected string $severity;
+	/** @var string */
+	protected $severity;


 	/**
@@ -108,7 +111,7 @@ class ProcedureException extends Exception


 /**
- * A database constraint was violated.
+ * Base class for all constraint violation related exceptions.
 */
 class ConstraintViolationException extends DriverException
 {
@@ -116,7 +119,7 @@ class ConstraintViolationException extends DriverException


 /**
- * The foreign key constraint check failed.
+ * Exception for a foreign key constraint violation.
 */
 class ForeignKeyConstraintViolationException extends ConstraintViolationException
 {
@@ -124,7 +127,7 @@ class ForeignKeyConstraintViolationException extends ConstraintViolationExceptio


 /**
- * The NOT NULL constraint check failed.
+ * Exception for a NOT NULL constraint violation.
 */
 class NotNullConstraintViolationException extends ConstraintViolationException
 {
@@ -132,7 +135,7 @@ class NotNullConstraintViolationException extends ConstraintViolationException


 /**
- * The unique constraint check failed.
+ * Exception for a unique constraint violation.
 */
 class UniqueConstraintViolationException extends ConstraintViolationException
 {
--- a/src/Dibi/interfaces.php
+++ b/src/Dibi/interfaces.php
@@ -0,0 +1,243 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibiphp.com)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi;
+
+
+/**
+ * Provides an interface between a dataset and data-aware components.
+ */
+interface IDataSource extends \Countable, \IteratorAggregate
+{
+	//function \IteratorAggregate::getIterator();
+	//function \Countable::count();
+}
+
+
+/**
+ * Driver interface.
+ */
+interface Driver
+{
+	/**
+	 * Disconnects from a database.
+	 * @throws Exception
+	 */
+	function disconnect(): void;
+
+	/**
+	 * Internal: Executes the SQL query.
+	 * @throws DriverException
+	 */
+	function query(string $sql): ?ResultDriver;
+
+	/**
+	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
+	 */
+	function getAffectedRows(): ?int;
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
+	 */
+	function getInsertId(?string $sequence): ?int;
+
+	/**
+	 * Begins a transaction (if supported).
+	 * @throws DriverException
+	 */
+	function begin(?string $savepoint = null): void;
+
+	/**
+	 * Commits statements in a transaction.
+	 * @throws DriverException
+	 */
+	function commit(?string $savepoint = null): void;
+
+	/**
+	 * Rollback changes in a transaction.
+	 * @throws DriverException
+	 */
+	function rollback(?string $savepoint = null): void;
+
+	/**
+	 * Returns the connection resource.
+	 * @return mixed
+	 */
+	function getResource();
+
+	/**
+	 * Returns the connection reflector.
+	 */
+	function getReflector(): Reflector;
+
+	/**
+	 * Encodes data for use in a SQL statement.
+	 */
+	function escapeText(string $value): string;
+
+	function escapeBinary(string $value): string;
+
+	function escapeIdentifier(string $value): string;
+
+	function escapeBool(bool $value): string;
+
+	function escapeDate(\DateTimeInterface $value): string;
+
+	function escapeDateTime(\DateTimeInterface $value): string;
+
+	function escapeDateInterval(\DateInterval $value): string;
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	function escapeLike(string $value, int $pos): string;
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
+}
+
+
+/**
+ * Result set driver interface.
+ */
+interface ResultDriver
+{
+	/**
+	 * Returns the number of rows in a result set.
+	 */
+	function getRowCount(): int;
+
+	/**
+	 * 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;
+
+	/**
+	 * Fetches the row at current position and moves the internal cursor to the next position.
+	 * @param  bool  $type  true for associative array, false for numeric
+	 * @internal
+	 */
+	function fetch(bool $type): ?array;
+
+	/**
+	 * Frees the resources allocated for this result set.
+	 */
+	function free(): void;
+
+	/**
+	 * Returns metadata for all columns in a result set.
+	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
+	 */
+	function getResultColumns(): array;
+
+	/**
+	 * Returns the result set resource.
+	 * @return mixed
+	 */
+	function getResultResource();
+
+	/**
+	 * Decodes data from result set.
+	 */
+	function unescapeBinary(string $value): string;
+}
+
+
+/**
+ * Reflection driver.
+ */
+interface Reflector
+{
+	/**
+	 * Returns list of tables.
+	 * @return array of {name [, (bool) view ]}
+	 */
+	function getTables(): array;
+
+	/**
+	 * Returns metadata for all columns in a table.
+	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
+	 */
+	function getColumns(string $table): array;
+
+	/**
+	 * Returns metadata for all indexes in a table.
+	 * @return array of {name, (array of names) columns [, (bool) unique, (bool) primary ]}
+	 */
+	function getIndexes(string $table): array;
+
+	/**
+	 * Returns metadata for all foreign keys in a table.
+	 */
+	function getForeignKeys(string $table): array;
+}
+
+
+/**
+ * Dibi connection.
+ */
+interface IConnection
+{
+	/**
+	 * Connects to a database.
+	 */
+	function connect(): void;
+
+	/**
+	 * Disconnects from a database.
+	 */
+	function disconnect(): void;
+
+	/**
+	 * Returns true when connection was established.
+	 */
+	function isConnected(): bool;
+
+	/**
+	 * Returns the driver and connects to a database in lazy mode.
+	 */
+	function getDriver(): Driver;
+
+	/**
+	 * Generates (translates) and executes SQL query.
+	 * @throws Exception
+	 */
+	function query(...$args): Result;
+
+	/**
+	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
+	 * @throws Exception
+	 */
+	function getAffectedRows(): int;
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
+	 * @throws Exception
+	 */
+	function getInsertId(?string $sequence = null): int;
+
+	/**
+	 * Begins a transaction (if supported).
+	 */
+	function begin(?string $savepoint = null): void;
+
+	/**
+	 * Commits statements in a transaction.
+	 */
+	function commit(?string $savepoint = null): void;
+
+	/**
+	 * Rollback changes in a transaction.
+	 */
+	function rollback(?string $savepoint = null): void;
+}
--- a/tests/databases.appveyor.ini
+++ b/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
--- a/tests/databases.sample.ini
+++ b/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
--- a/tests/dibi/Connection.connect.phpt
+++ b/tests/dibi/Connection.connect.phpt
@@ -12,7 +12,7 @@ use Tester\Assert;
 require __DIR__ . '/bootstrap.php';


-test('immediate connection and disconnection state', function () use ($config) {
+test('', function () use ($config) {
 	$conn = new Connection($config);
 	Assert::true($conn->isConnected());

@@ -21,7 +21,7 @@ test('immediate connection and disconnection state', function () use ($config) {
 });


-test('lazy connection initiated on first query', function () use ($config) {
+test('lazy', function () use ($config) {
 	$conn = new Connection($config + ['lazy' => true]);
 	Assert::false($conn->isConnected());

@@ -30,17 +30,17 @@ test('lazy connection initiated on first query', function () use ($config) {
 });


-test('config retrieval and driver instance access', function () use ($config) {
+test('', function () use ($config) {
 	$conn = new Connection($config);
 	Assert::true($conn->isConnected());

 	Assert::null($conn->getConfig('lazy'));
 	Assert::same($config['driver'], $conn->getConfig('driver'));
-	Assert::type(Dibi\Drivers\Connection::class, $conn->getDriver());
+	Assert::type(Dibi\Driver::class, $conn->getDriver());
 });


-test('idempotent disconnect calls', function () use ($config) {
+test('', function () use ($config) {
 	$conn = new Connection($config);
 	Assert::true($conn->isConnected());

@@ -52,7 +52,7 @@ test('idempotent disconnect calls', function () use ($config) {
 });


-test('reconnect after disconnection', function () use ($config) {
+test('', function () use ($config) {
 	$conn = new Connection($config);
 	Assert::equal('hello', $conn->query('SELECT %s', 'hello')->fetchSingle());

@@ -63,7 +63,7 @@ test('reconnect after disconnection', function () use ($config) {
 });


-test('destructor disconnects active connection', function () use ($config) {
+test('', function () use ($config) {
 	$conn = new Connection($config);
 	Assert::true($conn->isConnected());

@@ -72,30 +72,25 @@ test('destructor disconnects active connection', function () use ($config) {
 });


-test('invalid onConnect option triggers exceptions', function () use ($config) {
-	Assert::exception(
-		fn() => new Connection($config + ['onConnect' => '']),
-		InvalidArgumentException::class,
-		"Configuration option 'onConnect' must be array.",
-	);
+test('', function () use ($config) {
+	Assert::exception(function () use ($config) {
+		new Connection($config + ['onConnect' => '']);
+	}, InvalidArgumentException::class, "Configuration option 'onConnect' must be array.");

-	$e = Assert::exception(
-		fn() => new Connection($config + ['onConnect' => ['STOP']]),
-		Dibi\DriverException::class,
-	);
+	$e = Assert::exception(function () use ($config) {
+		new Connection($config + ['onConnect' => ['STOP']]);
+	}, Dibi\DriverException::class);
 	Assert::same('STOP', $e->getSql());

-	$e = Assert::exception(
-		fn() => new Connection($config + ['onConnect' => [['STOP %i', 123]]]),
-		Dibi\DriverException::class,
-	);
+	$e = Assert::exception(function () use ($config) {
+		new Connection($config + ['onConnect' => [['STOP %i', 123]]]);
+	}, Dibi\DriverException::class);
 	Assert::same('STOP 123', $e->getSql());

 	// lazy
 	$conn = new Connection($config + ['lazy' => true, 'onConnect' => ['STOP']]);
-	$e = Assert::exception(
-		fn() => $conn->query('SELECT 1'),
-		Dibi\DriverException::class,
-	);
+	$e = Assert::exception(function () use ($conn) {
+		$conn->query('SELECT 1');
+	}, Dibi\DriverException::class);
 	Assert::same('STOP', $e->getSql());
 });
--- a/tests/dibi/Connection.fetch.phpt
+++ b/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()
 );


--- a/tests/dibi/Connection.objectTranslator.phpt
+++ b/tests/dibi/Connection.objectTranslator.phpt
@@ -1,155 +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(
-		fn() => $conn->translate('?', new Email),
-		Dibi\Exception::class,
-		'SQL translate error: Unexpected Email',
-	);
-});
-
-
-test('Basics', function () use ($conn) {
-	$conn->setObjectTranslator(fn(Email $email) => new Dibi\Expression('?', $email->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->getDatabaseEngine()->escapeDateTime($stamp),
-		$conn->translate('?', $stamp),
-	);
-
-
-	// With object translator
-	$conn->setObjectTranslator(fn(Time $time) => new Dibi\Expression('OwnTime(?)', $time->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->getDatabaseEngine()->escapeDateTime($stamp),
-		$conn->translate('%dt', $stamp),
-	);
-	Assert::same(
-		$conn->getDatabaseEngine()->escapeDateTime($stamp),
-		$conn->translate('%t', $stamp),
-	);
-	Assert::same(
-		$conn->getDatabaseEngine()->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->getDatabaseEngine()->escapeDateTime($dt),
-		$conn->translate('?', $dt),
-	);
-
-	// But DateTime translation can be overloaded
-	$conn->setObjectTranslator(fn(DateTimeInterface $dt) => new Dibi\Expression('OwnDateTime'));
-	Assert::same(
-		'OwnDateTime',
-		$conn->translate('?', $dt),
-	);
-});
-
-
-test('Complex structures', function () use ($conn) {
-	$conn->setObjectTranslator(fn(Email $email) => new Dibi\Expression('?', $email->address));
-	$conn->setObjectTranslator(fn(Time $time) => new Dibi\Expression('OwnTime(?)', $time->format('H:i:s')));
-	$conn->setObjectTranslator(fn(DateTimeInterface $dt) => new Dibi\Expression('OwnDateTime'));
-
-	$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,
-		]),
-	);
-});
-
-
-test('Invalid translator', function () use ($conn) {
-	Assert::exception(
-		fn() => $conn->setObjectTranslator(fn($email) => 'foo'),
-		Dibi\Exception::class,
-		'Object translator must have exactly one parameter with class typehint.',
-	);
-
-	Assert::exception(
-		fn() => $conn->setObjectTranslator(fn(string $email) => 'foo'),
-		Dibi\Exception::class,
-		"Object translator must have exactly one parameter with non-nullable class typehint, got 'string'.",
-	);
-
-	Assert::exception(
-		fn() => $conn->setObjectTranslator(fn(Email|bool $email) => 'foo'),
-		Dibi\Exception::class,
-		"Object translator must have exactly one parameter with non-nullable class typehint, got 'bool'.",
-	);
-
-	Assert::exception(
-		fn() => $conn->setObjectTranslator(fn(Email|null $email) => 'foo'),
-		Dibi\Exception::class,
-		"Object translator must have exactly one parameter with non-nullable class typehint, got '?Email'.",
-	);
-
-	$conn->setObjectTranslator(fn(Email $email) => 'foo');
-	Assert::exception(
-		fn() => $conn->translate('?', new Email),
-		Dibi\Exception::class,
-		"Object translator for class 'Email' returned 'string' but Dibi\\Expression expected.",
-	);
-});
--- a/tests/dibi/Connection.substitutions.phpt
+++ b/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')
 );
--- a/tests/dibi/Connection.transactions.phpt
+++ b/tests/dibi/Connection.transactions.phpt
@@ -15,22 +15,18 @@ $conn = new Dibi\Connection($config);
 $conn->loadFile(__DIR__ . "/data/$config[system].sql");


-/*
-Assert::exception(
-	fn() => $conn->rollback(),
-	Dibi\Exception::class,
-);
+/*Assert::exception(function () use ($conn) {
+	$conn->rollback();
+}, Dibi\Exception::class);

-Assert::exception(
-	fn() => $conn->commit(),
-	Dibi\Exception::class,
-);
+Assert::exception(function () use ($conn) {
+	$conn->commit();
+}, Dibi\Exception::class);

 $conn->begin();
-Assert::exception(
-	fn() => $conn->begin(),
-	Dibi\Exception::class,
-);
+Assert::exception(function () use ($conn) {
+	$conn->begin();
+}, Dibi\Exception::class);
 */


@@ -57,16 +53,14 @@ test('begin() & commit()', function () use ($conn) {


 test('transaction() fail', function () use ($conn) {
-	Assert::exception(
-		fn() => $conn->transaction(function (Dibi\Connection $connection) {
+	Assert::exception(function () use ($conn) {
+		$conn->transaction(function (Dibi\Connection $connection) {
 			$connection->query('INSERT INTO [products]', [
 				'title' => 'Test product',
 			]);
 			throw new Exception('my exception');
-		}),
-		Throwable::class,
-		'my exception',
-	);
+		});
+	}, Throwable::class, 'my exception');
 	Assert::same(4, (int) $conn->query('SELECT COUNT(*) FROM [products]')->fetchSingle());
 });

@@ -82,8 +76,8 @@ test('transaction() success', function () use ($conn) {


 test('nested transaction() call fail', function () use ($conn) {
-	Assert::exception(
-		fn() => $conn->transaction(function (Dibi\Connection $connection) {
+	Assert::exception(function () use ($conn) {
+		$conn->transaction(function (Dibi\Connection $connection) {
 			$connection->query('INSERT INTO [products]', [
 				'title' => 'Test product',
 			]);
@@ -94,10 +88,8 @@ test('nested transaction() call fail', function () use ($conn) {
 				]);
 				throw new Exception('my exception');
 			});
-		}),
-		Throwable::class,
-		'my exception',
-	);
+		});
+	}, Throwable::class, 'my exception');
 	Assert::same(5, (int) $conn->query('SELECT COUNT(*) FROM [products]')->fetchSingle());
 });

@@ -119,27 +111,21 @@ test('nested transaction() call success', function () use ($conn) {


 test('begin(), commit() & rollback() calls are forbidden in transaction()', function () use ($conn) {
-	Assert::exception(
-		fn() => $conn->transaction(function (Dibi\Connection $connection) {
+	Assert::exception(function () use ($conn) {
+		$conn->transaction(function (Dibi\Connection $connection) {
 			$connection->begin();
-		}),
-		LogicException::class,
-		Dibi\Connection::class . '::begin() call is forbidden inside a transaction() callback',
-	);
+		});
+	}, LogicException::class, Dibi\Connection::class . '::begin() call is forbidden inside a transaction() callback');

-	Assert::exception(
-		fn() => $conn->transaction(function (Dibi\Connection $connection) {
+	Assert::exception(function () use ($conn) {
+		$conn->transaction(function (Dibi\Connection $connection) {
 			$connection->commit();
-		}),
-		LogicException::class,
-		Dibi\Connection::class . '::commit() call is forbidden inside a transaction() callback',
-	);
+		});
+	}, LogicException::class, Dibi\Connection::class . '::commit() call is forbidden inside a transaction() callback');

-	Assert::exception(
-		fn() => $conn->transaction(function (Dibi\Connection $connection) {
+	Assert::exception(function () use ($conn) {
+		$conn->transaction(function (Dibi\Connection $connection) {
 			$connection->rollback();
-		}),
-		LogicException::class,
-		Dibi\Connection::class . '::rollback() call is forbidden inside a transaction() callback',
-	);
+		});
+	}, LogicException::class, Dibi\Connection::class . '::rollback() call is forbidden inside a transaction() callback');
 });
--- a/tests/dibi/DataSource.phpt
+++ b/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());
--- a/tests/dibi/DateTime.phpt
+++ b/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)->setTimestamp(254_400_000));
-Assert::same(254_400_000, (new DateTime(254_400_000))->getTimestamp());
+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(254400000));
+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'));
--- a/tests/dibi/Fluent.delete.phpt
+++ b/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
 );
--- a/tests/dibi/Fluent.fetch.limit.mssql.phpt
+++ b/tests/dibi/Fluent.fetch.limit.mssql.phpt
@@ -2,14 +2,12 @@

 declare(strict_types=1);

-use Dibi\Drivers\SQLSrv\Connection;
-use Dibi\Drivers\SQLSrv\Result;
 use Tester\Assert;

 require __DIR__ . '/bootstrap.php';


-class MockDriver extends Connection
+class MockDriver extends Dibi\Drivers\SqlsrvDriver
 {
 	public function __construct()
 	{
@@ -21,14 +19,14 @@ class MockDriver extends Connection
 	}


-	public function query(string $sql): ?Result
+	public function query(string $sql): ?Dibi\ResultDriver
 	{
 		return new MockResult;
 	}
 }


-class MockResult extends Result
+class MockResult extends Dibi\Drivers\SqlsrvResult
 {
 	public function __construct()
 	{
@@ -59,46 +57,46 @@ $fluent = $conn->select('*')
 	->orderBy('customer_id');

 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
-	(string) $fluent,
+	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	(string) $fluent
 );


 $fluent->fetch();
 Assert::same(
-	'SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY',
-	dibi::$sql,
+	'SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t',
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
-	dibi::$sql,
+	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	dibi::$sql
 );
 $fluent->fetchAll(0, 3);
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 3 ROWS ONLY'),
-	dibi::$sql,
+	reformat('SELECT TOP (3) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
-	(string) $fluent,
+	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	(string) $fluent
 );


 $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 0 ROWS ONLY'),
-	dibi::$sql,
+	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 0 ROWS ONLY'),
-	dibi::$sql,
+	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 0 ROWS ONLY'),
-	(string) $fluent,
+	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	(string) $fluent
 );


@@ -106,15 +104,15 @@ $fluent->removeClause('limit');
 $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
-	dibi::$sql,
+	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY'),
-	dibi::$sql,
+	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	dibi::$sql
 );
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id]'),
-	(string) $fluent,
+	(string) $fluent
 );
--- a/tests/dibi/Fluent.fetch.limit.phpt
+++ b/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
 );
--- a/tests/dibi/Fluent.insert.phpt
+++ b/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
 );
--- a/tests/dibi/Fluent.select.phpt
+++ b/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);
+$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,11 +147,9 @@ if ($config['system'] === 'mysql') {
 		->limit(' 1; DROP TABLE users')
 		->offset(' 1; DROP TABLE users');

-	Assert::exception(
-		fn() => (string) $fluent,
-		Dibi\Exception::class,
-		"Expected number, ' 1; DROP TABLE users' given.",
-	);
+	Assert::error(function () use ($fluent) {
+		(string) $fluent;
+	}, E_USER_ERROR, "Expected number, ' 1; DROP TABLE users' given.");
 }


@@ -160,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
 );
--- a/tests/dibi/Fluent.update.phpt
+++ b/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
 );
--- a/tests/dibi/HashMap.phpt
+++ b/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->{''});
--- a/tests/dibi/Helpers.intVal().phpt
+++ b/tests/dibi/Helpers.intVal().phpt
@@ -12,32 +12,22 @@ Assert::same(0, Helpers::intVal(0));
 Assert::same(0, Helpers::intVal('0'));
 Assert::same(-10, Helpers::intVal('-10'));

-Assert::exception(
-	fn() => Helpers::intVal('12345678901234567890123456879'),
-	Dibi\Exception::class,
-	'Number 12345678901234567890123456879 is greater than integer.',
-);
+Assert::exception(function () {
+	Helpers::intVal('12345678901234567890123456879');
+}, Dibi\Exception::class, 'Number 12345678901234567890123456879 is greater than integer.');

-Assert::exception(
-	fn() => Helpers::intVal('-12345678901234567890123456879'),
-	Dibi\Exception::class,
-	'Number -12345678901234567890123456879 is greater than integer.',
-);
+Assert::exception(function () {
+	Helpers::intVal('-12345678901234567890123456879');
+}, Dibi\Exception::class, 'Number -12345678901234567890123456879 is greater than integer.');

-Assert::exception(
-	fn() => Helpers::intVal(''),
-	Dibi\Exception::class,
-	"Expected number, '' given.",
-);
+Assert::exception(function () {
+	Helpers::intVal('');
+}, Dibi\Exception::class, "Expected number, '' given.");

-Assert::exception(
-	fn() => Helpers::intVal('not number'),
-	Dibi\Exception::class,
-	"Expected number, 'not number' given.",
-);
+Assert::exception(function () {
+	Helpers::intVal('not number');
+}, Dibi\Exception::class, "Expected number, 'not number' given.");

-Assert::exception(
-	fn() => Helpers::intVal(null),
-	Dibi\Exception::class,
-	"Expected number, '' given.",
-);
+Assert::exception(function () {
+	Helpers::intVal(null);
+}, Dibi\Exception::class, "Expected number, '' given.");
--- a/tests/dibi/PdoDriver.providedConnection.phpt
+++ b/tests/dibi/PdoDriver.providedConnection.phpt
@@ -14,27 +14,22 @@ function buildPdoDriver(?int $errorMode)
 		$pdo->setAttribute(PDO::ATTR_ERRMODE, $errorMode);
 	}

-	new Dibi\Drivers\PDO\Connection(['resource' => $pdo]);
+	new Dibi\Drivers\PdoDriver(['resource' => $pdo]);
 }


 // PDO error mode: exception
-Assert::exception(
-	fn() => buildPdoDriver(PDO::ERRMODE_EXCEPTION),
-	Dibi\DriverException::class,
-	'PDO connection in exception or warning error mode is not supported.',
-);
+Assert::exception(function () {
+	buildPdoDriver(PDO::ERRMODE_EXCEPTION);
+}, Dibi\DriverException::class, 'PDO connection in exception or warning error mode is not supported.');


 // PDO error mode: warning
-Assert::exception(
-	fn() => buildPdoDriver(PDO::ERRMODE_WARNING),
-	Dibi\DriverException::class,
-	'PDO connection in exception or warning error mode is not supported.',
-);
+Assert::exception(function () {
+	buildPdoDriver(PDO::ERRMODE_WARNING);
+}, Dibi\DriverException::class, 'PDO connection in exception or warning error mode is not supported.');


-test(
-	'PDO error mode: explicitly set silent',
-	fn() => buildPdoDriver(PDO::ERRMODE_SILENT),
-);
+test('PDO error mode: explicitly set silent', function () {
+	buildPdoDriver(PDO::ERRMODE_SILENT);
+});
--- a/tests/dibi/Postgre.like.phpt
+++ b/tests/dibi/Postgre.like.phpt
@@ -18,9 +18,9 @@ $tests = function ($conn) {
 	Assert::false($conn->query("SELECT 'AAxBB' LIKE %~like~", 'A%B')->fetchSingle());
 	Assert::true($conn->query("SELECT 'AA%BB' LIKE %~like~", 'A%B')->fetchSingle());

-	Assert::same('AA\BB', $conn->query("SELECT 'AA\\BB'")->fetchSingle());
-	Assert::false($conn->query("SELECT 'AAxBB' LIKE %~like~", 'A\B')->fetchSingle());
-	Assert::true($conn->query("SELECT 'AA\\BB' LIKE %~like~", 'A\B')->fetchSingle());
+	Assert::same('AA\\BB', $conn->query("SELECT 'AA\\BB'")->fetchSingle());
+	Assert::false($conn->query("SELECT 'AAxBB' LIKE %~like~", 'A\\B')->fetchSingle());
+	Assert::true($conn->query("SELECT 'AA\\BB' LIKE %~like~", 'A\\B')->fetchSingle());
 };

 $conn = new Dibi\Connection($config);
--- a/tests/dibi/Result.meta.phpt
+++ b/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)
 	);
 }

--- a/tests/dibi/Result.normalize.phpt
+++ b/tests/dibi/Result.normalize.phpt
@@ -25,10 +25,10 @@ class MockResult extends Dibi\Result
 }


-test('native text conversion preserves boolean values', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::Text);
-	$result->setFormat(Type::Text, 'native');
+	$result->setType('col', Type::TEXT);
+	$result->setFormat(Type::TEXT, 'native');

 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => true], $result->test(['col' => true]));
@@ -36,9 +36,9 @@ test('native text conversion preserves boolean values', function () {
 });


-test('boolean conversion from diverse representations', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::Bool);
+	$result->setType('col', Type::BOOL);

 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => true], $result->test(['col' => true]));
@@ -58,9 +58,9 @@ test('boolean conversion from diverse representations', function () {
 });


-test('text conversion of booleans and numerics', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::Text);
+	$result->setType('col', Type::TEXT);

 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => '1'], $result->test(['col' => true]));
@@ -74,9 +74,9 @@ test('text conversion of booleans and numerics', function () {
 });


-test('float conversion with various numeric formats', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::Float);
+	$result->setType('col', Type::FLOAT);

 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => 1.0], $result->test(['col' => true]));
@@ -117,37 +117,6 @@ test('float conversion with various numeric formats', function () {
 	Assert::same(['col' => '1.1e+10'], $result->test(['col' => '001.1e+10']));
 	Assert::notSame(['col' => '1.1e+1'], $result->test(['col' => '1.1e+10']));

-	// negative
-	Assert::same(['col' => -0.0], $result->test(['col' => '-']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-0']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-1']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-.0']));
-	Assert::same(['col' => -0.1], $result->test(['col' => '-.1']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-0.0']));
-	Assert::same(['col' => -0.1], $result->test(['col' => '-0.1']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-0.000']));
-	Assert::same(['col' => -0.1], $result->test(['col' => '-0.100']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-1.0']));
-	Assert::same(['col' => -1.1], $result->test(['col' => '-1.1']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-1.000']));
-	Assert::same(['col' => -1.1], $result->test(['col' => '-1.100']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-001.000']));
-	Assert::same(['col' => -1.1], $result->test(['col' => '-001.100']));
-	Assert::same(['col' => -10.0], $result->test(['col' => '-10']));
-	Assert::same(['col' => -11.0], $result->test(['col' => '-11']));
-	Assert::same(['col' => -10.0], $result->test(['col' => '-0010']));
-	Assert::same(['col' => -11.0], $result->test(['col' => '-0011']));
-	Assert::same(['col' => '-0.00000000000000000001'], $result->test(['col' => '-0.00000000000000000001']));
-	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890']));
-	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-012345678901234567890']));
-	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890.000']));
-	Assert::same(['col' => '-12345678901234567890.1'], $result->test(['col' => '-012345678901234567890.100']));
-
-	Assert::same(['col' => '-1.1e+10'], $result->test(['col' => '-1.1e+10']));
-	Assert::same(['col' => '-1.1e-10'], $result->test(['col' => '-1.1e-10']));
-	Assert::same(['col' => '-1.1e+10'], $result->test(['col' => '-001.1e+10']));
-	Assert::notSame(['col' => '-1.1e+1'], $result->test(['col' => '-1.1e+10']));
-
 	setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'deu_deu');
 	Assert::same(['col' => 0.0], $result->test(['col' => '']));
 	Assert::same(['col' => 0.0], $result->test(['col' => '0']));
@@ -178,54 +147,25 @@ test('float conversion with various numeric formats', function () {
 	Assert::same(['col' => 0.0], $result->test(['col' => 0.0]));
 	Assert::same(['col' => 1.0], $result->test(['col' => 1]));
 	Assert::same(['col' => 1.0], $result->test(['col' => 1.0]));
-
-	// Same but negative
-	Assert::same(['col' => -0.0], $result->test(['col' => '-']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-0']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-1']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-.0']));
-	Assert::same(['col' => -0.1], $result->test(['col' => '-.1']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-0.0']));
-	Assert::same(['col' => -0.1], $result->test(['col' => '-0.1']));
-	Assert::same(['col' => -0.0], $result->test(['col' => '-0.000']));
-	Assert::same(['col' => -0.1], $result->test(['col' => '-0.100']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-1.0']));
-	Assert::same(['col' => -1.1], $result->test(['col' => '-1.1']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-1.000']));
-	Assert::same(['col' => -1.1], $result->test(['col' => '-1.100']));
-	Assert::same(['col' => -1.0], $result->test(['col' => '-001.000']));
-	Assert::same(['col' => -1.1], $result->test(['col' => '-001.100']));
-	Assert::same(['col' => -10.0], $result->test(['col' => '-10']));
-	Assert::same(['col' => -11.0], $result->test(['col' => '-11']));
-	Assert::same(['col' => -10.0], $result->test(['col' => '-0010']));
-	Assert::same(['col' => -11.0], $result->test(['col' => '-0011']));
-	Assert::same(['col' => '-0.00000000000000000001'], $result->test(['col' => '-0.00000000000000000001']));
-	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890']));
-	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-012345678901234567890']));
-	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890.000']));
-	Assert::same(['col' => '-12345678901234567890.1'], $result->test(['col' => '-012345678901234567890.100']));
-
-	Assert::same(['col' => -0.0], $result->test(['col' => -0]));
-	Assert::same(['col' => -0.0], $result->test(['col' => -0.0]));
-	Assert::same(['col' => -1.0], $result->test(['col' => -1]));
-	Assert::same(['col' => -1.0], $result->test(['col' => -1.0]));
-
 	setlocale(LC_NUMERIC, 'C');
 });


-test('strict integer conversion with error on empty string', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::Integer);
+	$result->setType('col', Type::INTEGER);

 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => 1], $result->test(['col' => true]));
 	Assert::same(['col' => 0], $result->test(['col' => false]));

-	Assert::exception(
-		fn() => Assert::same(['col' => 0], $result->test(['col' => ''])),
-		TypeError::class,
-	);
+	if (PHP_VERSION_ID < 80000) {
+		Assert::same(['col' => 0], @$result->test(['col' => ''])); // triggers warning since PHP 7.1
+	} else {
+		Assert::exception(function () use ($result) {
+			Assert::same(['col' => 0], $result->test(['col' => '']));
+		}, TypeError::class);
+	}

 	Assert::same(['col' => 0], $result->test(['col' => '0']));
 	Assert::same(['col' => 1], $result->test(['col' => '1']));
@@ -244,15 +184,14 @@ test('strict integer conversion with error on empty string', function () {
 });


-test('dateTime conversion with object instantiation', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::DateTime);
+	$result->setType('col', Type::DATETIME);

 	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::exception(
-		fn() => $result->test(['col' => true]),
-		TypeError::class,
-	);
+	Assert::exception(function () use ($result) {
+		$result->test(['col' => true]);
+	}, TypeError::class);
 	Assert::same(['col' => null], $result->test(['col' => false]));

 	Assert::same(['col' => null], $result->test(['col' => '']));
@@ -263,16 +202,15 @@ test('dateTime conversion with object instantiation', function () {
 });


-test('dateTime conversion using custom format', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::DateTime);
-	$result->setFormat(Type::DateTime, 'Y-m-d H:i:s');
+	$result->setType('col', Type::DATETIME);
+	$result->setFormat(Type::DATETIME, 'Y-m-d H:i:s');

 	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::exception(
-		fn() => $result->test(['col' => true]),
-		TypeError::class,
-	);
+	Assert::exception(function () use ($result) {
+		$result->test(['col' => true]);
+	}, TypeError::class);
 	Assert::same(['col' => null], $result->test(['col' => false]));

 	Assert::same(['col' => null], $result->test(['col' => '']));
@@ -283,15 +221,14 @@ test('dateTime conversion using custom format', function () {
 });


-test('date conversion to DateTime instance', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::Date);
+	$result->setType('col', Type::DATE);

 	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::exception(
-		fn() => $result->test(['col' => true]),
-		TypeError::class,
-	);
+	Assert::exception(function () use ($result) {
+		$result->test(['col' => true]);
+	}, TypeError::class);
 	Assert::same(['col' => null], $result->test(['col' => false]));

 	Assert::same(['col' => null], $result->test(['col' => '']));
@@ -300,15 +237,14 @@ test('date conversion to DateTime instance', function () {
 });


-test('time conversion to DateTime instance', function () {
+test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::Time);
+	$result->setType('col', Type::TIME);

 	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::exception(
-		fn() => $result->test(['col' => true]),
-		TypeError::class,
-	);
+	Assert::exception(function () use ($result) {
+		$result->test(['col' => true]);
+	}, TypeError::class);
 	Assert::same(['col' => null], $result->test(['col' => false]));

 	Assert::same(['col' => null], $result->test(['col' => '']));
--- a/tests/dibi/Result.types.phpt
+++ b/tests/dibi/Result.types.phpt
@@ -12,7 +12,7 @@ $conn->loadFile(__DIR__ . "/data/$config[system].sql");
 $res = $conn->query('SELECT * FROM [customers]');

 // auto-converts this column to integer
-$res->setType('customer_id', Dibi\Type::DateTime);
+$res->setType('customer_id', Dibi\Type::DATETIME);

 Assert::equal(new Dibi\Row([
 	'customer_id' => new Dibi\DateTime('1970-01-01 01:00:01'),
--- a/tests/dibi/Row.phpt
+++ b/tests/dibi/Row.phpt
@@ -24,17 +24,13 @@ Assert::true(isset($row['title']));


 // missing
-Assert::error(
-	fn() => $x = $row->missing,
-	E_USER_NOTICE,
-	"Attempt to read missing column 'missing'.",
-);
+Assert::error(function () use ($row) {
+	$x = $row->missing;
+}, E_USER_NOTICE, "Attempt to read missing column 'missing'.");

-Assert::error(
-	fn() => $x = $row['missing'],
-	E_USER_NOTICE,
-	"Attempt to read missing column 'missing'.",
-);
+Assert::error(function () use ($row) {
+	$x = $row['missing'];
+}, E_USER_NOTICE, "Attempt to read missing column 'missing'.");

 Assert::false(isset($row->missing));
 Assert::false(isset($row['missing']));
@@ -45,17 +41,13 @@ Assert::same(123, $row['missing'] ?? 123);


 // suggestions
-Assert::error(
-	fn() => $x = $row->tilte,
-	E_USER_NOTICE,
-	"Attempt to read missing column 'tilte', did you mean 'title'?",
-);
+Assert::error(function () use ($row) {
+	$x = $row->tilte;
+}, E_USER_NOTICE, "Attempt to read missing column 'tilte', did you mean 'title'?");

-Assert::error(
-	fn() => $x = $row['tilte'],
-	E_USER_NOTICE,
-	"Attempt to read missing column 'tilte', did you mean 'title'?",
-);
+Assert::error(function () use ($row) {
+	$x = $row['tilte'];
+}, E_USER_NOTICE, "Attempt to read missing column 'tilte', did you mean 'title'?");


 // to array
--- a/tests/dibi/Sqlsrv.insert.phpt
+++ b/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');
--- a/tests/dibi/Sqlsrv.limits.phpt
+++ b/tests/dibi/Sqlsrv.limits.phpt
@@ -11,59 +11,81 @@ use Tester\Assert;
 require __DIR__ . '/bootstrap.php';

 $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),
-	);
+	$resource = $conn->getDriver()->getResource();
+	$version = is_resource($resource)
+		? sqlsrv_server_info($resource)['SQLServerVersion']
+		: $resource->getAttribute(PDO::ATTR_SERVER_VERSION);

-	// Limit only
-	Assert::same(
-		'SELECT 1 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
-		$conn->translate('SELECT 1 %lmt', 10),
-	);
+	// MsSQL2012+
+	if (version_compare($version, '11.0') >= 0) {
+		// Limit and offset
+		Assert::same(
+			'SELECT 1 OFFSET 10 ROWS FETCH NEXT 10 ROWS ONLY',
+			$conn->translate('SELECT 1 %ofs %lmt', 10, 10)
+		);

-	// Offset only
-	Assert::same(
-		'SELECT 1 OFFSET 10 ROWS',
-		$conn->translate('SELECT 1 %ofs', 10),
-	);
+		// Limit only
+		Assert::same(
+			'SELECT 1 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
+			$conn->translate('SELECT 1 %lmt', 10)
+		);

-	// Offset invalid
-	Assert::error(
-		function () use ($conn) {
-			$conn->translate('SELECT 1 %ofs', -10);
-		},
-		Dibi\NotSupportedException::class,
-		'Negative offset or limit.',
-	);
+		// Offset only
+		Assert::same(
+			'SELECT 1 OFFSET 10 ROWS',
+			$conn->translate('SELECT 1 %ofs', 10)
+		);

-	// Limit invalid
-	Assert::error(
-		function () use ($conn) {
-			$conn->translate('SELECT 1 %lmt', -10);
-		},
-		Dibi\NotSupportedException::class,
-		'Negative offset or limit.',
-	);
+		// Offset invalid
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %ofs', -10);
+			},
+			Dibi\NotSupportedException::class,
+			'Negative offset or limit.'
+		);

-	// Limit invalid, offset valid
-	Assert::error(
-		function () use ($conn) {
-			$conn->translate('SELECT 1 %ofs %lmt', 10, -10);
-		},
-		Dibi\NotSupportedException::class,
-		'Negative offset or limit.',
-	);
+		// Limit invalid
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %lmt', -10);
+			},
+			Dibi\NotSupportedException::class,
+			'Negative offset or limit.'
+		);

-	// Limit valid, offset invalid
-	Assert::error(
-		function () use ($conn) {
-			$conn->translate('SELECT 1 %ofs %lmt', -10, 10);
-		},
-		Dibi\NotSupportedException::class,
-		'Negative offset or limit.',
-	);
+		// Limit invalid, offset valid
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %ofs %lmt', 10, -10);
+			},
+			Dibi\NotSupportedException::class,
+			'Negative offset or limit.'
+		);
+
+		// Limit valid, offset invalid
+		Assert::error(
+			function () use ($conn) {
+				$conn->translate('SELECT 1 %ofs %lmt', -10, 10);
+			},
+			Dibi\NotSupportedException::class,
+			'Negative offset or limit.'
+		);
+	} else {
+		Assert::same(
+			'SELECT TOP (1) * FROM (SELECT 1) t',
+			$conn->translate('SELECT 1 %lmt', 1)
+		);
+
+		Assert::same(
+			'SELECT 1',
+			$conn->translate('SELECT 1 %lmt', -10)
+		);
+
+		Assert::exception(function () {
+			$conn->translate('SELECT 1 %ofs %lmt', 10, 10);
+		}, Dibi\NotSupportedException::class);
+	}
 };

 $conn = new Dibi\Connection($config);
--- a/tests/dibi/Strict.phpt
+++ b/tests/dibi/Strict.phpt
@@ -0,0 +1,151 @@
+<?php
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+class TestClass
+{
+	use Dibi\Strict;
+
+	public $public;
+
+	public static $publicStatic;
+
+	protected $protected;
+
+
+	public function publicMethod()
+	{
+	}
+
+
+	public static function publicMethodStatic()
+	{
+	}
+
+
+	protected function protectedMethod()
+	{
+	}
+
+
+	protected static function protectedMethodS()
+	{
+	}
+
+
+	public function getBar()
+	{
+		return 123;
+	}
+
+
+	public function isFoo()
+	{
+		return 456;
+	}
+}
+
+class TestChild extends TestClass
+{
+	public function callParent()
+	{
+		parent::callParent();
+	}
+}
+
+
+// calling
+Assert::exception(function () {
+	$obj = new TestClass;
+	$obj->undeclared();
+}, LogicException::class, 'Call to undefined method TestClass::undeclared().');
+
+Assert::exception(function () {
+	TestClass::undeclared();
+}, LogicException::class, 'Call to undefined static method TestClass::undeclared().');
+
+Assert::exception(function () {
+	$obj = new TestChild;
+	$obj->callParent();
+}, LogicException::class, 'Call to undefined method parent::callParent().');
+
+Assert::exception(function () {
+	$obj = new TestClass;
+	$obj->publicMethodX();
+}, LogicException::class, 'Call to undefined method TestClass::publicMethodX(), did you mean publicMethod()?');
+
+Assert::exception(function () { // suggest static method
+	$obj = new TestClass;
+	$obj->publicMethodStaticX();
+}, LogicException::class, 'Call to undefined method TestClass::publicMethodStaticX(), did you mean publicMethodStatic()?');
+
+Assert::exception(function () { // suggest only public method
+	$obj = new TestClass;
+	$obj->protectedMethodX();
+}, LogicException::class, 'Call to undefined method TestClass::protectedMethodX().');
+
+
+// writing
+Assert::exception(function () {
+	$obj = new TestClass;
+	$obj->undeclared = 'value';
+}, LogicException::class, 'Attempt to write to undeclared property TestClass::$undeclared.');
+
+Assert::exception(function () {
+	$obj = new TestClass;
+	$obj->publicX = 'value';
+}, LogicException::class, 'Attempt to write to undeclared property TestClass::$publicX, did you mean $public?');
+
+Assert::exception(function () { // suggest only non-static property
+	$obj = new TestClass;
+	$obj->publicStaticX = 'value';
+}, LogicException::class, 'Attempt to write to undeclared property TestClass::$publicStaticX.');
+
+Assert::exception(function () { // suggest only public property
+	$obj = new TestClass;
+	$obj->protectedX = 'value';
+}, LogicException::class, 'Attempt to write to undeclared property TestClass::$protectedX.');
+
+
+// property getter
+$obj = new TestClass;
+Assert::false(isset($obj->bar));
+Assert::same(123, $obj->bar);
+Assert::false(isset($obj->foo));
+Assert::same(456, $obj->foo);
+
+
+// reading
+Assert::exception(function () {
+	$obj = new TestClass;
+	$val = $obj->undeclared;
+}, LogicException::class, 'Attempt to read undeclared property TestClass::$undeclared.');
+
+Assert::exception(function () {
+	$obj = new TestClass;
+	$val = $obj->publicX;
+}, LogicException::class, 'Attempt to read undeclared property TestClass::$publicX, did you mean $public?');
+
+Assert::exception(function () { // suggest only non-static property
+	$obj = new TestClass;
+	$val = $obj->publicStaticX;
+}, LogicException::class, 'Attempt to read undeclared property TestClass::$publicStaticX.');
+
+Assert::exception(function () { // suggest only public property
+	$obj = new TestClass;
+	$val = $obj->protectedX;
+}, LogicException::class, 'Attempt to read undeclared property TestClass::$protectedX.');
+
+
+// unset/isset
+Assert::exception(function () {
+	$obj = new TestClass;
+	unset($obj->undeclared);
+}, LogicException::class, 'Attempt to unset undeclared property TestClass::$undeclared.');
+
+Assert::false(isset($obj->undeclared));
--- a/tests/dibi/Translator.DateInterval.phpt
+++ b/tests/dibi/Translator.DateInterval.phpt
@@ -13,16 +13,13 @@ switch ($config['system']) {
 	case 'mysql':
 		Assert::equal('10:20:30.0', $translator->formatValue(new DateInterval('PT10H20M30S'), null));
 		Assert::equal('-1:00:00.0', $translator->formatValue(DateInterval::createFromDateString('-1 hour'), null));
-		Assert::exception(
-			fn() => $translator->formatValue(new DateInterval('P2Y4DT6H8M'), null),
-			Dibi\NotSupportedException::class,
-			'Only time interval is supported.',
-		);
+		Assert::exception(function () use ($translator) {
+			$translator->formatValue(new DateInterval('P2Y4DT6H8M'), null);
+		}, Dibi\NotSupportedException::class, 'Only time interval is supported.');
 		break;

 	default:
-		Assert::exception(
-			fn() => $translator->formatValue(new DateInterval('PT10H20M30S'), null),
-			Dibi\Exception::class,
-		);
+		Assert::exception(function () use ($translator) {
+			$translator->formatValue(new DateInterval('PT10H20M30S'), null);
+		}, Dibi\Exception::class);
 }
--- a/Show More
+++ b/Show More