sorting [WIP]

Object translator allows to translate any object passed to Translator into Dibi\Expression.

.github/workflows/coding-style.yml

@@ -0,0 +1,31 @@
+name: Coding Style
+
+on: [push, pull_request]
+
+jobs:
+    nette_cc:
+        name: Nette Code Checker
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.0
+                  coverage: none
+
+            - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
+            - run: php temp/code-checker/code-checker --strict-types --no-progress --ignore "tests/*/fixtures"
+
+
+    nette_cs:
+        name: Nette Coding Standard
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.0
+                  coverage: none
+
+            - run: composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress
+            - run: php temp/coding-standard/ecs check

.github/workflows/static-analysis.yml

@@ -0,0 +1,21 @@
+name: Static Analysis (only informative)
+
+on:
+    push:
+        branches:
+          - master
+
+jobs:
+    phpstan:
+        name: PHPStan
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.0
+                  coverage: none
+
+            - run: composer install --no-progress --prefer-dist
+            - run: composer phpstan -- --no-progress
+              continue-on-error: true # is only informative

.github/workflows/tests.yml

@@ -0,0 +1,121 @@
+name: Tests
+
+on: [push, pull_request]
+
+env:
+    php-extensions: mbstring, intl, mysqli, pgsql, sqlsrv-5.10.0beta2, pdo_sqlsrv-5.10.0beta2
+    php-tools: "composer:v2, pecl"
+
+jobs:
+    tests:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: ['8.0', '8.1', '8.2']
+
+            fail-fast: false
+
+        name: PHP ${{ matrix.php }} tests
+
+        services:
+            mysql57:
+                image: mysql:5.7
+                env:
+                    MYSQL_DATABASE: dibi_test
+                    MYSQL_ROOT_PASSWORD: root
+                ports:
+                    - 3306:3306
+                options: >-
+                    --health-cmd "mysqladmin ping -ppass"
+                    --health-interval 10s
+                    --health-start-period 10s
+                    --health-timeout 5s
+                    --health-retries 10
+
+            mysql80:
+                image: mysql:8.0
+                ports:
+                    - 3307:3306
+                options: >-
+                    --health-cmd="mysqladmin ping -ppass"
+                    --health-interval=10s
+                    --health-timeout=5s
+                    --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
+                env:
+                    POSTGRES_USER: postgres
+                    POSTGRES_PASSWORD: postgres
+                    POSTGRES_DB: dibi_test
+                ports:
+                    - 5432:5432
+                options: >-
+                    --health-cmd pg_isready
+                    --health-interval 10s
+                    --health-timeout 5s
+                    --health-retries 5
+
+            postgres13:
+                image: postgres:13
+                env:
+                    POSTGRES_USER: postgres
+                    POSTGRES_PASSWORD: postgres
+                    POSTGRES_DB: dibi_test
+                ports:
+                    - 5433:5432
+                options: >-
+                    --health-cmd pg_isready
+                    --health-interval 10s
+                    --health-timeout 5s
+                    --health-retries 5
+
+            mssql:
+                image: mcr.microsoft.com/mssql/server:latest
+                env:
+                    ACCEPT_EULA: Y
+                    SA_PASSWORD: YourStrong!Passw0rd
+                    MSSQL_PID: Developer
+                ports:
+                    - 1433:1433
+                options: >-
+                    --name=mssql
+                    --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@v3
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: ${{ env.php-extensions }}
+                  tools: ${{ env.php-tools }}
+                  coverage: none
+
+            - name: Create databases.ini
+              run: cp ./tests/databases.github.ini ./tests/databases.ini
+
+            - name: Create MS SQL Database
+              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@v3
+              with:
+                  name: output
+                  path: tests/**/output
+
+
+            - name: Save Code Coverage
+              if: ${{ matrix.php == '8.0' }}
+              env:
+                  COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.3/php-coveralls.phar
+                  php php-coveralls.phar --verbose --config tests/.coveralls.yml

.travis.yml

@@ -1,76 +0,0 @@
-language: php
-php:
-    - 7.2
-    - 7.3
-    - 7.4
-    - 8.0snapshot
-
-services:
-    - mysql
-    - postgresql
-
-before_install:
-    # turn off XDebug
-    - phpenv config-rm xdebug.ini || return 0
-
-    # Create databases.ini
-    - cp ./tests/databases.travis.ini ./tests/databases.ini
-
-    # Create Postgre database
-    - psql -c 'CREATE DATABASE dibi_test' -U postgres
-
-install:
-    - travis_retry composer install --no-progress --prefer-dist
-
-script:
-    - vendor/bin/tester tests -s
-
-after_failure:
-    # Print *.actual content
-    - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
-
-jobs:
-    include:
-        -   name: Nette Code Checker
-            install:
-                - travis_retry composer create-project nette/code-checker temp/code-checker ^3 --no-progress
-            script:
-                - php temp/code-checker/code-checker --strict-types
-
-
-        -   name: Nette Coding Standard
-            php: 7.4
-            install:
-                - travis_retry composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress
-            script:
-                - php temp/coding-standard/ecs check src tests
-
-
-        -   stage: Static Analysis (informative)
-            php: 7.4
-            script:
-                - composer run-script phpstan
-
-
-        -   stage: Code Coverage
-            php: 7.4
-            script:
-                - vendor/bin/tester -p phpdbg tests -s --coverage ./coverage.xml --coverage-src ./src
-            after_script:
-                - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
-                - php coveralls.phar --verbose --config tests/.coveralls.yml
-
-
-    allow_failures:
-        -   stage: Static Analysis (informative)
-        -   stage: Code Coverage
-
-
-dist: xenial
-
-cache:
-    directories:
-        - $HOME/.composer/cache
-
-notifications:
-    email: false

appveyor.yml

@@ -1,31 +1,34 @@
 build: off
 cache:
-    - c:\php7 -> appveyor.yml
+    - c:\php -> appveyor.yml
     - '%LOCALAPPDATA%\Composer\files -> appveyor.yml'
 
 clone_folder: c:\projects\dibi
 
+environment:
+    MYSQL_PWD: Password12!
+
 services:
     - mssql2012sp1
 #    - mssql2014
     - mysql
 
 init:
-    - SET PATH=c:\php7;%PATH%
+    - SET PATH=c:\php;c:\Program Files\MySQL\MySQL Server 5.7\bin;%PATH%
     - SET ANSICON=121x90 (121x90)
 
 install:
-    # 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
+    # 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
     - 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.8.0/Windows-7.2.zip -L --output sqlsrv.zip
+    - 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 7z x sqlsrv.zip >nul
-    - IF %PHP%==1 copy Windows-7.2\x64\php_sqlsrv_72_ts.dll ext\php_sqlsrv_ts.dll
+    - IF %PHP%==1 copy Windows-8.0\x64\php_sqlsrv_80_ts.dll ext\php_sqlsrv_ts.dll
     - IF %PHP%==1 del /Q *.zip
 
     # Install Microsoft Access Database Engine x64
@@ -40,8 +43,12 @@ 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:\php7\php -c tests\php-win.ini
+    - vendor\bin\tester tests -s -p c:\php\php -c tests\php-win.ini
 
 on_failure:
     # Print *.actual content

composer.json

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

ecs.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Rules for Nette Coding Standard
- * https://github.com/nette/coding-standard
- */
-
-declare(strict_types=1);
-
-
-return function (Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator): void {
-	$containerConfigurator->import(PRESET_DIR . '/php71.php');
-
-	$parameters = $containerConfigurator->parameters();
-
-	$parameters->set('skip', [
-		// issue #260
-		PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer::class => ['src/Dibi/HashMap.php'],
-		SlevomatCodingStandard\Sniffs\ControlStructures\RequireNullCoalesceOperatorSniff::class => ['src/Dibi/HashMap.php'],
-	]);
-};

examples/query-language-and-conditions.php

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

examples/query-language-basic-examples.php

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

examples/using-datetime.php

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

examples/using-substitutions.php

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

readme.md

@@ -2,7 +2,7 @@
 =========================================================
 
 [![Downloads this Month](https://img.shields.io/packagist/dm/dibi/dibi.svg)](https://packagist.org/packages/dibi/dibi)
-[![Build Status](https://travis-ci.org/dg/dibi.svg?branch=master)](https://travis-ci.org/dg/dibi)
+[![Tests](https://github.com/dg/dibi/workflows/Tests/badge.svg?branch=master)](https://github.com/dg/dibi/actions)
 [![Build Status Windows](https://ci.appveyor.com/api/projects/status/github/dg/dibi?branch=master&svg=true)](https://ci.appveyor.com/project/dg/dibi/branch/master)
 [![Latest Stable Version](https://poser.pugx.org/dibi/dibi/v/stable)](https://github.com/dg/dibi/releases)
 [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/dg/dibi/blob/master/license.md)
@@ -34,7 +34,7 @@ Install Dibi via Composer:
 composer require dibi/dibi
 ```
 
-The Dibi 4.2 requires PHP version 7.2 and supports PHP up to 8.0.
+The Dibi 5.0 requires PHP version 8.0 and supports PHP up to 8.2.
 
 
 Usage

src/Dibi/Bridges/Nette/DibiExtension22.php

@@ -19,13 +19,15 @@ use Tracy;
  */
 class DibiExtension22 extends Nette\DI\CompilerExtension
 {
-	/** @var bool|null */
-	private $debugMode;
+	private ?bool $debugMode;
+
+	private ?bool $cliMode;
 
 
-	public function __construct(bool $debugMode = null)
+	public function __construct(?bool $debugMode = null, ?bool $cliMode = null)
 	{
 		$this->debugMode = $debugMode;
+		$this->cliMode = $cliMode;
 	}
 
 
@@ -38,7 +40,11 @@ class DibiExtension22 extends Nette\DI\CompilerExtension
 			$this->debugMode = $container->parameters['debugMode'];
 		}
 
-		$useProfiler = $config['profiler'] ?? (class_exists(Tracy\Debugger::class) && $this->debugMode);
+		if ($this->cliMode === null) {
+			$this->cliMode = $container->parameters['consoleMode'];
+		}
+
+		$useProfiler = $config['profiler'] ?? (class_exists(Tracy\Debugger::class) && $this->debugMode && !$this->cliMode);
 
 		unset($config['profiler']);
 
@@ -47,6 +53,7 @@ class DibiExtension22 extends Nette\DI\CompilerExtension
 			foreach ((array) $config['flags'] as $flag) {
 				$flags |= constant($flag);
 			}
+
 			$config['flags'] = $flags;
 		}
 
@@ -57,9 +64,10 @@ 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']],
 			);
 		}
+
 		if ($useProfiler) {
 			$panel = $container->addDefinition($this->prefix('panel'))
 				->setFactory(Dibi\Bridges\Tracy\Panel::class, [

src/Dibi/Bridges/Tracy/Panel.php

@@ -22,20 +22,17 @@ class Panel implements Tracy\IBarPanel
 {
 	use Dibi\Strict;
 
-	/** @var int maximum SQL length */
-	public static $maxLength = 1000;
+	/** maximum SQL length */
+	public static int $maxLength = 1000;
 
-	/** @var bool|string  explain queries? */
-	public $explain;
+	public bool|string $explain;
 
-	/** @var int */
-	public $filter;
+	public int $filter;
 
-	/** @var array */
-	private $events = [];
+	private array $events = [];
 
 
-	public function __construct($explain = true, int $filter = null)
+	public function __construct(bool $explain = true, ?int $filter = null)
 	{
 		$this->filter = $filter ?: Event::QUERY;
 		$this->explain = $explain;
@@ -58,6 +55,7 @@ class Panel implements Tracy\IBarPanel
 		if (($event->type & $this->filter) === 0) {
 			return;
 		}
+
 		$this->events[] = $event;
 	}
 
@@ -88,9 +86,10 @@ class Panel implements Tracy\IBarPanel
 		foreach ($this->events as $event) {
 			$totalTime += $event->time;
 		}
+
 		return '<span title="dibi"><svg viewBox="0 0 2048 2048" style="vertical-align: bottom; width:1.23em; height:1.55em"><path fill="' . ($count ? '#b079d6' : '#aaa') . '" d="M1024 896q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0 768q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0-384q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0-1152q208 0 385 34.5t280 93.5 103 128v128q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-128q0-69 103-128t280-93.5 385-34.5z"/></svg><span class="tracy-label">'
-			. $count . ' queries'
-			. ($totalTime ? ' / ' . number_format($totalTime * 1000, 1, '.', ' ') . ' ms' : '')
+			. $count . "\u{a0}queries"
+			. ($totalTime ? ' / ' . number_format($totalTime * 1000, 1, '.', "\u{202f}") . "\u{202f}ms" : '')
 			. '</span></span>';
 	}
 
@@ -128,10 +127,11 @@ class Panel implements Tracy\IBarPanel
 					$explain = @Helpers::dump($connection->nativeQuery("$cmd $event->sql"), true);
 				} catch (Dibi\Exception $e) {
 				}
+
 				[$connection->onEvent, \dibi::$numOfQueries, \dibi::$totalTime] = $backup;
 			}
 
-			$s .= '<tr><td data-order="' . $event->time . '">' . number_format($event->time * 1000, 3, '.', ' ');
+			$s .= '<tr><td data-order="' . $event->time . '">' . number_format($event->time * 1000, 3, '.', "\u{202f}");
 			if ($explain) {
 				static $counter;
 				$counter++;
@@ -142,6 +142,7 @@ class Panel implements Tracy\IBarPanel
 			if ($explain) {
 				$s .= "<div id='tracy-debug-DibiProfiler-row-$counter' class='tracy-collapsed'>{$explain}</div>";
 			}
+
 			if ($event->source) {
 				$s .= Tracy\Helpers::editorLink($event->source[0], $event->source[1]); //->class('tracy-DibiProfiler-source');
 			}
@@ -155,8 +156,8 @@ class Panel implements Tracy\IBarPanel
 		return '<style> #tracy-debug td.tracy-DibiProfiler-sql { background: white !important }
 			#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: ' . count($this->events)
-				. ($totalTime === null ? '' : ', time: ' . number_format($totalTime * 1000, 1, '.', ' ') . ' ms') . ', '
+			<h1>Queries:' . "\u{a0}" . count($this->events)
+				. ($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">
@@ -170,8 +171,8 @@ class Panel implements Tracy\IBarPanel
 	private function getConnectionName(Dibi\Connection $connection): string
 	{
 		$driver = $connection->getConfig('driver');
-		return (is_object($driver) ? get_class($driver) : $driver)
+		return (is_object($driver) ? $driver::class : $driver)
 			. ($connection->getConfig('name') ? '/' . $connection->getConfig('name') : '')
-			. ($connection->getConfig('host') ? ' @ ' . $connection->getConfig('host') : '');
+			. ($connection->getConfig('host') ? "\u{202f}@\u{202f}" . $connection->getConfig('host') : '');
 	}
 }

src/Dibi/Connection.php

@@ -22,25 +22,25 @@ class Connection implements IConnection
 {
 	use Strict;
 
-	/** @var array of function (Event $event); Occurs after query is executed */
-	public $onEvent = [];
+	/** function (Event $event); Occurs after query is executed */
+	public ?array $onEvent = [];
 
-	/** @var array  Current connection configuration */
-	private $config;
+	/** Current connection configuration */
+	private array $config;
 
 	/** @var string[]  resultset formats */
-	private $formats;
+	private array $formats;
 
-	/** @var Driver|null */
-	private $driver;
+	private ?Driver $driver = null;
 
-	/** @var Translator|null */
-	private $translator;
+	private ?Translator $translator = null;
 
-	/** @var HashMap Substitutes for identifiers */
-	private $substitutes;
+	/** @var array<string, callable(object): Expression> */
+	private array $translators = [];
 
-	private $transactionDepth = 0;
+	private HashMap $substitutes;
+
+	private int $transactionDepth = 0;
 
 
 	/**
@@ -68,14 +68,14 @@ class Connection implements IConnection
 	 *   - onConnect (array) => list of SQL queries to execute (by Connection::query()) after connection is established
 	 * @throws Exception
 	 */
-	public function __construct(array $config, string $name = null)
+	public function __construct(array $config, ?string $name = null)
 	{
 		Helpers::alias($config, 'username', 'user');
 		Helpers::alias($config, 'password', 'pass');
 		Helpers::alias($config, 'host', 'hostname');
 		Helpers::alias($config, 'result|formatDate', 'resultDate');
 		Helpers::alias($config, 'result|formatDateTime', 'resultDateTime');
-		$config['driver'] = $config['driver'] ?? 'mysqli';
+		$config['driver'] ??= 'mysqli';
 		$config['name'] = $name;
 		$this->config = $config;
 
@@ -93,7 +93,7 @@ class Connection implements IConnection
 			$this->onEvent[] = [new Loggers\FileLogger($config['profiler']['file'], $filter, $errorsOnly), 'logEvent'];
 		}
 
-		$this->substitutes = new HashMap(function (string $expr) { return ":$expr:"; });
+		$this->substitutes = new HashMap(fn(string $expr) => ":$expr:");
 		if (!empty($config['substitutes'])) {
 			foreach ($config['substitutes'] as $key => $value) {
 				$this->substitutes->$key = $value;
@@ -150,16 +150,17 @@ class Connection implements IConnection
 			if ($event) {
 				$this->onEvent($event->done());
 			}
+
 			if (isset($this->config['onConnect'])) {
 				foreach ($this->config['onConnect'] as $sql) {
 					$this->query($sql);
 				}
 			}
-
 		} catch (DriverException $e) {
 			if ($event) {
 				$this->onEvent($event->done($e));
 			}
+
 			throw $e;
 		}
 	}
@@ -189,9 +190,8 @@ class Connection implements IConnection
 	/**
 	 * Returns configuration variable. If no $key is passed, returns the entire array.
 	 * @see self::__construct
-	 * @return mixed
 	 */
-	final public function getConfig(string $key = null, $default = null)
+	final public function getConfig(?string $key = null, $default = null): mixed
 	{
 		return $key === null
 			? $this->config
@@ -207,16 +207,16 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		return $this->driver;
 	}
 
 
 	/**
 	 * Generates (translates) and executes SQL query.
-	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function query(...$args): Result
+	final public function query(mixed ...$args): Result
 	{
 		return $this->nativeQuery($this->translate(...$args));
 	}
@@ -224,23 +224,22 @@ class Connection implements IConnection
 
 	/**
 	 * Generates SQL query.
-	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function translate(...$args): string
+	final public function translate(mixed ...$args): string
 	{
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		return (clone $this->translator)->translate($args);
 	}
 
 
 	/**
 	 * Generates and prints SQL query.
-	 * @param  mixed  ...$args
 	 */
-	final public function test(...$args): bool
+	final public function test(mixed ...$args): bool
 	{
 		try {
 			Helpers::dump($this->translate(...$args));
@@ -250,8 +249,9 @@ class Connection implements IConnection
 			if ($e->getSql()) {
 				Helpers::dump($e->getSql());
 			} else {
-				echo get_class($e) . ': ' . $e->getMessage() . (PHP_SAPI === 'cli' ? "\n" : '<br>');
+				echo $e::class . ': ' . $e->getMessage() . (PHP_SAPI === 'cli' ? "\n" : '<br>');
 			}
+
 			return false;
 		}
 	}
@@ -259,10 +259,9 @@ class Connection implements IConnection
 
 	/**
 	 * Generates (translates) and returns SQL query as DataSource.
-	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	final public function dataSource(...$args): DataSource
+	final public function dataSource(mixed ...$args): DataSource
 	{
 		return new DataSource($this->translate(...$args), $this);
 	}
@@ -287,6 +286,7 @@ class Connection implements IConnection
 			if ($event) {
 				$this->onEvent($event->done($e));
 			}
+
 			throw $e;
 		}
 
@@ -294,6 +294,7 @@ class Connection implements IConnection
 		if ($event) {
 			$this->onEvent($event->done($res));
 		}
+
 		return $res;
 	}
 
@@ -307,10 +308,12 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		$rows = $this->driver->getAffectedRows();
 		if ($rows === null || $rows < 0) {
 			throw new Exception('Cannot retrieve number of affected rows.');
 		}
+
 		return $rows;
 	}
 
@@ -319,15 +322,17 @@ class Connection implements IConnection
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @throws Exception
 	 */
-	public function getInsertId(string $sequence = null): int
+	public function getInsertId(?string $sequence = null): int
 	{
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		$id = $this->driver->getInsertId($sequence);
 		if ($id === null) {
 			throw new Exception('Cannot retrieve last generated ID.');
 		}
+
 		return $id;
 	}
 
@@ -335,7 +340,7 @@ class Connection implements IConnection
 	/**
 	 * Begins a transaction (if supported).
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		if ($this->transactionDepth !== 0) {
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
@@ -344,17 +349,18 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		$event = $this->onEvent ? new Event($this, Event::BEGIN, $savepoint) : null;
 		try {
 			$this->driver->begin($savepoint);
 			if ($event) {
 				$this->onEvent($event->done());
 			}
-
 		} catch (DriverException $e) {
 			if ($event) {
 				$this->onEvent($event->done($e));
 			}
+
 			throw $e;
 		}
 	}
@@ -363,7 +369,7 @@ class Connection implements IConnection
 	/**
 	 * Commits statements in a transaction.
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		if ($this->transactionDepth !== 0) {
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
@@ -372,17 +378,18 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		$event = $this->onEvent ? new Event($this, Event::COMMIT, $savepoint) : null;
 		try {
 			$this->driver->commit($savepoint);
 			if ($event) {
 				$this->onEvent($event->done());
 			}
-
 		} catch (DriverException $e) {
 			if ($event) {
 				$this->onEvent($event->done($e));
 			}
+
 			throw $e;
 		}
 	}
@@ -391,7 +398,7 @@ class Connection implements IConnection
 	/**
 	 * Rollback changes in a transaction.
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		if ($this->transactionDepth !== 0) {
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
@@ -400,26 +407,24 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		$event = $this->onEvent ? new Event($this, Event::ROLLBACK, $savepoint) : null;
 		try {
 			$this->driver->rollback($savepoint);
 			if ($event) {
 				$this->onEvent($event->done());
 			}
-
 		} catch (DriverException $e) {
 			if ($event) {
 				$this->onEvent($event->done($e));
 			}
+
 			throw $e;
 		}
 	}
 
 
-	/**
-	 * @return mixed
-	 */
-	public function transaction(callable $callback)
+	public function transaction(callable $callback): mixed
 	{
 		if ($this->transactionDepth === 0) {
 			$this->begin();
@@ -433,6 +438,7 @@ class Connection implements IConnection
 			if ($this->transactionDepth === 0) {
 				$this->rollback();
 			}
+
 			throw $e;
 		}
 
@@ -484,6 +490,7 @@ class Connection implements IConnection
 		if ($args instanceof Traversable) {
 			$args = iterator_to_array($args);
 		}
+
 		return $this->command()->insert()
 			->into('%n', $table, '(%n)', array_keys($args))->values('%l', $args);
 	}
@@ -512,9 +519,28 @@ class Connection implements IConnection
 	 */
 	public function substitute(string $value): string
 	{
-		return strpos($value, ':') === false
-			? $value
-			: preg_replace_callback('#:([^:\s]*):#', function (array $m) { return $this->substitutes->{$m[1]}; }, $value);
+		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 addObjectTranslator(string $class, callable $translator): self
+	{
+		$this->translators[$class] = $translator;
+		uksort($this->translators, fn($a, $b) => class_exists($a, false) && is_subclass_of($a, $b) ? -1 : 1);
+		return $this;
+	}
+
+
+	/** @return array<string, callable(object): Expression> */
+	public function getObjectTranslators(): array
+	{
+		return $this->translators;
 	}
 
 
@@ -523,10 +549,9 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch result - shortcut for query() & fetch().
-	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	public function fetch(...$args): ?Row
+	public function fetch(mixed ...$args): ?Row
 	{
 		return $this->query($args)->fetch();
 	}
@@ -534,11 +559,10 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch results - shortcut for query() & fetchAll().
-	 * @param  mixed  ...$args
 	 * @return Row[]|array[]
 	 * @throws Exception
 	 */
-	public function fetchAll(...$args): array
+	public function fetchAll(mixed ...$args): array
 	{
 		return $this->query($args)->fetchAll();
 	}
@@ -546,11 +570,9 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch first column - shortcut for query() & fetchSingle().
-	 * @param  mixed  ...$args
-	 * @return mixed
 	 * @throws Exception
 	 */
-	public function fetchSingle(...$args)
+	public function fetchSingle(mixed ...$args): mixed
 	{
 		return $this->query($args)->fetchSingle();
 	}
@@ -558,10 +580,9 @@ class Connection implements IConnection
 
 	/**
 	 * Executes SQL query and fetch pairs - shortcut for query() & fetchPairs().
-	 * @param  mixed  ...$args
 	 * @throws Exception
 	 */
-	public function fetchPairs(...$args): array
+	public function fetchPairs(mixed ...$args): array
 	{
 		return $this->query($args)->fetchPairs();
 	}
@@ -587,7 +608,7 @@ class Connection implements IConnection
 	 * @param  callable  $onProgress  function (int $count, ?float $percent): void
 	 * @return int  count of sql commands
 	 */
-	public function loadFile(string $file, callable $onProgress = null): int
+	public function loadFile(string $file, ?callable $onProgress = null): int
 	{
 		return Helpers::loadFromFile($this, $file, $onProgress);
 	}
@@ -601,6 +622,7 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
+
 		return new Reflection\Database($this->driver->getReflector(), $this->config['database'] ?? null);
 	}
 

src/Dibi/DataSource.php

@@ -17,35 +17,25 @@ class DataSource implements IDataSource
 {
 	use Strict;
 
-	/** @var Connection */
-	private $connection;
+	private Connection $connection;
 
-	/** @var string */
-	private $sql;
+	private string $sql;
 
-	/** @var Result|null */
-	private $result;
+	private ?Result $result = null;
 
-	/** @var int|null */
-	private $count;
+	private ?int $count = null;
 
-	/** @var int|null */
-	private $totalCount;
+	private ?int $totalCount = null;
 
-	/** @var array */
-	private $cols = [];
+	private array $cols = [];
 
-	/** @var array */
-	private $sorting = [];
+	private array $sorting = [];
 
-	/** @var array */
-	private $conds = [];
+	private array $conds = [];
 
-	/** @var int|null */
-	private $offset;
+	private ?int $offset = null;
 
-	/** @var int|null */
-	private $limit;
+	private ?int $limit = null;
 
 
 	/**
@@ -65,13 +55,14 @@ class DataSource implements IDataSource
 	 * @param  string|array  $col  column name or array of column names
 	 * @param  string  $as        column alias
 	 */
-	public function select($col, string $as = null): self
+	public function select(string|array $col, ?string $as = null): static
 	{
 		if (is_array($col)) {
 			$this->cols = $col;
 		} else {
 			$this->cols[$col] = $as;
 		}
+
 		$this->result = null;
 		return $this;
 	}
@@ -80,7 +71,7 @@ class DataSource implements IDataSource
 	/**
 	 * Adds conditions to query.
 	 */
-	public function where($cond): self
+	public function where($cond): static
 	{
 		$this->conds[] = is_array($cond)
 			? $cond // TODO: not consistent with select and orderBy
@@ -94,13 +85,14 @@ class DataSource implements IDataSource
 	 * Selects columns to order by.
 	 * @param  string|array  $row  column name or array of column names
 	 */
-	public function orderBy($row, string $direction = 'ASC'): self
+	public function orderBy(string|array $row, string $direction = 'ASC'): static
 	{
 		if (is_array($row)) {
 			$this->sorting = $row;
 		} else {
 			$this->sorting[$row] = $direction;
 		}
+
 		$this->result = null;
 		return $this;
 	}
@@ -109,7 +101,7 @@ class DataSource implements IDataSource
 	/**
 	 * Limits number of rows.
 	 */
-	public function applyLimit(int $limit, int $offset = null): self
+	public function applyLimit(int $limit, ?int $offset = null): static
 	{
 		$this->limit = $limit;
 		$this->offset = $offset;
@@ -135,6 +127,7 @@ class DataSource implements IDataSource
 		if ($this->result === null) {
 			$this->result = $this->connection->nativeQuery($this->__toString());
 		}
+
 		return $this->result;
 	}
 
@@ -158,7 +151,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()
+	public function fetchSingle(): mixed
 	{
 		return $this->getResult()->fetchSingle();
 	}
@@ -185,7 +178,7 @@ class DataSource implements IDataSource
 	/**
 	 * Fetches all records from table like $key => $value pairs.
 	 */
-	public function fetchPairs(string $key = null, string $value = null): array
+	public function fetchPairs(?string $key = null, ?string $value = null): array
 	{
 		return $this->getResult()->fetchPairs($key, $value);
 	}
@@ -226,24 +219,19 @@ class DataSource implements IDataSource
 	 */
 	public function __toString(): string
 	{
-		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 '';
-		}
+		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,
+		);
 	}
 
 
@@ -258,10 +246,11 @@ 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();
 		}
+
 		return $this->count;
 	}
 
@@ -273,9 +262,10 @@ 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());
 		}
+
 		return $this->totalCount;
 	}
 }

src/Dibi/DateTime.php

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

src/Dibi/Drivers/DummyDriver.php

@@ -42,22 +42,22 @@ class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	}
 
 
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 	}
 
 
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 	}
 
 
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 	}
 
 
-	public function getResource()
+	public function getResource(): mixed
 	{
 		return null;
 	}
@@ -171,8 +171,9 @@ class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	}
 
 
-	public function getResultResource()
+	public function getResultResource(): mixed
 	{
+		return null;
 	}
 
 

src/Dibi/Drivers/FirebirdDriver.php

@@ -33,11 +33,10 @@ class FirebirdDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	/** @var resource|null */
+	/** @var ?resource */
 	private $transaction;
 
-	/** @var bool */
-	private $inTransaction = false;
+	private bool $inTransaction = false;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -101,10 +100,10 @@ class FirebirdDriver implements Dibi\Driver
 			} else {
 				throw new Dibi\DriverException(ibase_errmsg(), ibase_errcode(), $sql);
 			}
-
 		} elseif (is_resource($res)) {
 			return $this->createResultDriver($res);
 		}
+
 		return null;
 	}
 
@@ -131,11 +130,12 @@ class FirebirdDriver implements Dibi\Driver
 	 * Begins a transaction (if supported).
 	 * @throws Dibi\DriverException
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		if ($savepoint !== null) {
 			throw new Dibi\NotSupportedException('Savepoints are not supported in Firebird/Interbase.');
 		}
+
 		$this->transaction = ibase_trans($this->getResource());
 		$this->inTransaction = true;
 	}
@@ -145,7 +145,7 @@ class FirebirdDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		if ($savepoint !== null) {
 			throw new Dibi\NotSupportedException('Savepoints are not supported in Firebird/Interbase.');
@@ -163,7 +163,7 @@ class FirebirdDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		if ($savepoint !== null) {
 			throw new Dibi\NotSupportedException('Savepoints are not supported in Firebird/Interbase.');
@@ -190,7 +190,7 @@ class FirebirdDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource()
+	public function getResource(): mixed
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}

src/Dibi/Drivers/FirebirdReflector.php

@@ -19,8 +19,7 @@ class FirebirdReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Driver */
-	private $driver;
+	private Dibi\Driver $driver;
 
 
 	public function __construct(Dibi\Driver $driver)
@@ -47,6 +46,7 @@ class FirebirdReflector implements Dibi\Reflector
 				'view' => $row[1] === 'TRUE',
 			];
 		}
+
 		return $tables;
 	}
 
@@ -99,6 +99,7 @@ class FirebirdReflector implements Dibi\Reflector
 				'autoincrement' => false,
 			];
 		}
+
 		return $columns;
 	}
 
@@ -131,6 +132,7 @@ class FirebirdReflector implements Dibi\Reflector
 			$indexes[$key]['table'] = $table;
 			$indexes[$key]['columns'][$row['FIELD_POSITION']] = $row['FIELD_NAME'];
 		}
+
 		return $indexes;
 	}
 
@@ -159,6 +161,7 @@ class FirebirdReflector implements Dibi\Reflector
 				'table' => $table,
 			];
 		}
+
 		return $keys;
 	}
 
@@ -179,6 +182,7 @@ class FirebirdReflector implements Dibi\Reflector
 		while ($row = $res->fetch(false)) {
 			$indices[] = $row[0];
 		}
+
 		return $indices;
 	}
 
@@ -201,6 +205,7 @@ class FirebirdReflector implements Dibi\Reflector
 		while ($row = $res->fetch(false)) {
 			$constraints[] = $row[0];
 		}
+
 		return $constraints;
 	}
 
@@ -209,7 +214,7 @@ class FirebirdReflector implements Dibi\Reflector
 	 * Returns metadata for all triggers in a table or database.
 	 * (Only if user has permissions on ALTER TABLE, INSERT/UPDATE/DELETE record in table)
 	 */
-	public function getTriggersMeta(string $table = null): array
+	public function getTriggersMeta(?string $table = null): array
 	{
 		$res = $this->driver->query(
 			"
@@ -236,7 +241,7 @@ class FirebirdReflector implements Dibi\Reflector
 				END AS TRIGGER_ENABLED
 			FROM RDB\$TRIGGERS
 			WHERE RDB\$SYSTEM_FLAG = 0"
-			. ($table === null ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table');")
+			. ($table === null ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table');"),
 		);
 		$triggers = [];
 		while ($row = $res->fetch(true)) {
@@ -248,6 +253,7 @@ class FirebirdReflector implements Dibi\Reflector
 				'enabled' => trim($row['TRIGGER_ENABLED']) === 'TRUE',
 			];
 		}
+
 		return $triggers;
 	}
 
@@ -256,7 +262,7 @@ class FirebirdReflector implements Dibi\Reflector
 	 * Returns list of triggers for given table.
 	 * (Only if user has permissions on ALTER TABLE, INSERT/UPDATE/DELETE record in table)
 	 */
-	public function getTriggers(string $table = null): array
+	public function getTriggers(?string $table = null): array
 	{
 		$q = 'SELECT TRIM(RDB$TRIGGER_NAME)
 			FROM RDB$TRIGGERS
@@ -270,6 +276,7 @@ class FirebirdReflector implements Dibi\Reflector
 		while ($row = $res->fetch(false)) {
 			$triggers[] = $row[0];
 		}
+
 		return $triggers;
 	}
 
@@ -321,6 +328,7 @@ class FirebirdReflector implements Dibi\Reflector
 			$procedures[$key]['params'][$io][$num]['type'] = trim($row['FIELD_TYPE']);
 			$procedures[$key]['params'][$io][$num]['size'] = $row['FIELD_LENGTH'];
 		}
+
 		return $procedures;
 	}
 
@@ -338,6 +346,7 @@ class FirebirdReflector implements Dibi\Reflector
 		while ($row = $res->fetch(false)) {
 			$procedures[] = $row[0];
 		}
+
 		return $procedures;
 	}
 
@@ -356,6 +365,7 @@ class FirebirdReflector implements Dibi\Reflector
 		while ($row = $res->fetch(false)) {
 			$generators[] = $row[0];
 		}
+
 		return $generators;
 	}
 
@@ -374,6 +384,7 @@ class FirebirdReflector implements Dibi\Reflector
 		while ($row = $res->fetch(false)) {
 			$functions[] = $row[0];
 		}
+
 		return $functions;
 	}
 }

src/Dibi/Drivers/FirebirdResult.php

@@ -23,8 +23,7 @@ class FirebirdResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
+	private bool $autoFree = true;
 
 
 	/**
@@ -103,7 +102,7 @@ class FirebirdResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource()
+	public function getResultResource(): mixed
 	{
 		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;
@@ -126,6 +125,7 @@ class FirebirdResult implements Dibi\ResultDriver
 				'nativetype' => $row['type'],
 			];
 		}
+
 		return $columns;
 	}
 

src/Dibi/Drivers/MySqlReflector.php

@@ -20,8 +20,7 @@ class MySqlReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Driver */
-	private $driver;
+	private Dibi\Driver $driver;
 
 
 	public function __construct(Dibi\Driver $driver)
@@ -43,6 +42,7 @@ class MySqlReflector implements Dibi\Reflector
 				'view' => isset($row[1]) && $row[1] === 'VIEW',
 			];
 		}
+
 		return $tables;
 	}
 
@@ -67,6 +67,7 @@ class MySqlReflector implements Dibi\Reflector
 				'vendor' => $row,
 			];
 		}
+
 		return $columns;
 	}
 
@@ -84,6 +85,7 @@ class MySqlReflector implements Dibi\Reflector
 			$indexes[$row['Key_name']]['primary'] = $row['Key_name'] === 'PRIMARY';
 			$indexes[$row['Key_name']]['columns'][$row['Seq_in_index'] - 1] = $row['Column_name'];
 		}
+
 		return array_values($indexes);
 	}
 
@@ -123,6 +125,7 @@ class MySqlReflector implements Dibi\Reflector
 			$foreignKeys[$keyName]['onDelete'] = $row['DELETE_RULE'];
 			$foreignKeys[$keyName]['onUpdate'] = $row['UPDATE_RULE'];
 		}
+
 		return array_values($foreignKeys);
 	}
 }

src/Dibi/Drivers/MySqliDriver.php

@@ -40,11 +40,10 @@ class MySqliDriver implements Dibi\Driver
 
 	public const ERROR_DATA_TRUNCATED = 1265;
 
-	/** @var \mysqli */
-	private $connection;
+	private \mysqli $connection;
 
-	/** @var bool  Is buffered (seekable and countable)? */
-	private $buffered;
+	/** Is buffered (seekable and countable)? */
+	private bool $buffered = false;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -72,7 +71,7 @@ class MySqliDriver implements Dibi\Driver
 				$host = ini_get('mysqli.default_host');
 				if ($host) {
 					$config['host'] = $host;
-					$config['port'] = ini_get('mysqli.default_port');
+					$config['port'] = (int) ini_get('mysqli.default_port');
 				} else {
 					$config['host'] = null;
 					$config['port'] = null;
@@ -88,6 +87,7 @@ class MySqliDriver implements Dibi\Driver
 					$this->connection->options($key, $value);
 				}
 			}
+
 			@$this->connection->real_connect( // intentionally @
 				(empty($config['persistent']) ? '' : 'p:') . $config['host'],
 				$config['username'],
@@ -95,7 +95,7 @@ class MySqliDriver implements Dibi\Driver
 				$config['database'] ?? '',
 				$config['port'] ?? 0,
 				$config['socket'],
-				$config['flags'] ?? 0
+				$config['flags'] ?? 0,
 			);
 
 			if ($this->connection->connect_errno) {
@@ -153,14 +153,12 @@ class MySqliDriver implements Dibi\Driver
 		} elseif ($res instanceof \mysqli_result) {
 			return $this->createResultDriver($res);
 		}
+
 		return null;
 	}
 
 
-	/**
-	 * @param int|string $code
-	 */
-	public static function createException(string $message, $code, string $sql): Dibi\DriverException
+	public static function createException(string $message, int|string $code, string $sql): Dibi\DriverException
 	{
 		if (in_array($code, [1216, 1217, 1451, 1452, 1701], true)) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
@@ -191,6 +189,7 @@ class MySqliDriver implements Dibi\Driver
 		foreach ($matches as $m) {
 			$res[$m[1]] = (int) $m[2];
 		}
+
 		return $res;
 	}
 
@@ -219,7 +218,7 @@ class MySqliDriver implements Dibi\Driver
 	 * Begins a transaction (if supported).
 	 * @throws Dibi\DriverException
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "SAVEPOINT $savepoint" : 'START TRANSACTION');
 	}
@@ -229,7 +228,7 @@ class MySqliDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "RELEASE SAVEPOINT $savepoint" : 'COMMIT');
 	}
@@ -239,7 +238,7 @@ class MySqliDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "ROLLBACK TO SAVEPOINT $savepoint" : 'ROLLBACK');
 	}
@@ -250,7 +249,11 @@ class MySqliDriver implements Dibi\Driver
 	 */
 	public function getResource(): ?\mysqli
 	{
-		return @$this->connection->thread_id ? $this->connection : null;
+		try {
+			return @$this->connection->thread_id ? $this->connection : null;
+		} catch (\Throwable $e) {
+			return null;
+		}
 	}
 
 
@@ -319,6 +322,7 @@ class MySqliDriver implements Dibi\Driver
 		if ($value->y || $value->m || $value->d) {
 			throw new Dibi\NotSupportedException('Only time interval is supported.');
 		}
+
 		return $value->format("'%r%H:%I:%S.%f'");
 	}
 

src/Dibi/Drivers/MySqliResult.php

@@ -19,14 +19,12 @@ class MySqliResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var \mysqli_result */
-	private $resultSet;
+	private \mysqli_result $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
+	private bool $autoFree = true;
 
-	/** @var bool  Is buffered (seekable and countable)? */
-	private $buffered;
+	/** Is buffered (seekable and countable)? */
+	private bool $buffered;
 
 
 	public function __construct(\mysqli_result $resultSet, bool $buffered)
@@ -55,6 +53,7 @@ class MySqliResult implements Dibi\ResultDriver
 		if (!$this->buffered) {
 			throw new Dibi\NotSupportedException('Row count is not available for unbuffered queries.');
 		}
+
 		return $this->resultSet->num_rows;
 	}
 
@@ -80,6 +79,7 @@ class MySqliResult implements Dibi\ResultDriver
 		if (!$this->buffered) {
 			throw new Dibi\NotSupportedException('Cannot seek an unbuffered result set.');
 		}
+
 		return $this->resultSet->data_seek($row);
 	}
 
@@ -107,6 +107,7 @@ class MySqliResult implements Dibi\ResultDriver
 					$types[$value] = substr($key, 12);
 				}
 			}
+
 			$types[MYSQLI_TYPE_TINY] = $types[MYSQLI_TYPE_SHORT] = $types[MYSQLI_TYPE_LONG] = 'INT';
 		}
 
@@ -123,6 +124,7 @@ class MySqliResult implements Dibi\ResultDriver
 				'vendor' => $row,
 			];
 		}
+
 		return $columns;
 	}
 

src/Dibi/Drivers/NoDataResult.php

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

src/Dibi/Drivers/OdbcDriver.php

@@ -30,11 +30,9 @@ class OdbcDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	/** @var int|null  Affected rows */
-	private $affectedRows;
+	private ?int $affectedRows;
 
-	/** @var bool */
-	private $microseconds = true;
+	private bool $microseconds = true;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -96,6 +94,7 @@ class OdbcDriver implements Dibi\Driver
 				? $this->createResultDriver($res)
 				: null;
 		}
+
 		return null;
 	}
 
@@ -122,9 +121,9 @@ class OdbcDriver implements Dibi\Driver
 	 * Begins a transaction (if supported).
 	 * @throws Dibi\DriverException
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
-		if (!odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 0 : false)) {
+		if (!odbc_autocommit($this->connection, false)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
 	}
@@ -134,12 +133,13 @@ class OdbcDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		if (!odbc_commit($this->connection)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
-		odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 1 : true);
+
+		odbc_autocommit($this->connection, true);
 	}
 
 
@@ -147,12 +147,13 @@ class OdbcDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		if (!odbc_rollback($this->connection)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
-		odbc_autocommit($this->connection, PHP_VERSION_ID < 80000 ? 1 : true);
+
+		odbc_autocommit($this->connection, true);
 	}
 
 
@@ -169,7 +170,7 @@ class OdbcDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource()
+	public function getResource(): mixed
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}

src/Dibi/Drivers/OdbcReflector.php

@@ -19,8 +19,7 @@ class OdbcReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Driver */
-	private $driver;
+	private Dibi\Driver $driver;
 
 
 	public function __construct(Dibi\Driver $driver)
@@ -44,6 +43,7 @@ class OdbcReflector implements Dibi\Reflector
 				];
 			}
 		}
+
 		odbc_free_result($res);
 		return $tables;
 	}
@@ -68,6 +68,7 @@ class OdbcReflector implements Dibi\Reflector
 				];
 			}
 		}
+
 		odbc_free_result($res);
 		return $columns;
 	}

src/Dibi/Drivers/OdbcResult.php

@@ -22,11 +22,9 @@ class OdbcResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
+	private bool $autoFree = true;
 
-	/** @var int  Cursor */
-	private $row = 0;
+	private int $row = 0;
 
 
 	/**
@@ -72,11 +70,13 @@ class OdbcResult implements Dibi\ResultDriver
 			if (!odbc_fetch_row($set, ++$this->row)) {
 				return null;
 			}
+
 			$count = odbc_num_fields($set);
 			$cols = [];
 			for ($i = 1; $i <= $count; $i++) {
 				$cols[] = odbc_result($set, $i);
 			}
+
 			return $cols;
 		}
 	}
@@ -116,6 +116,7 @@ class OdbcResult implements Dibi\ResultDriver
 				'nativetype' => odbc_field_type($this->resultSet, $i),
 			];
 		}
+
 		return $columns;
 	}
 
@@ -124,7 +125,7 @@ class OdbcResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource()
+	public function getResultResource(): mixed
 	{
 		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;

src/Dibi/Drivers/OracleDriver.php

@@ -32,14 +32,12 @@ class OracleDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	/** @var bool */
-	private $autocommit = true;
+	private bool $autocommit = true;
 
-	/** @var bool  use native datetime format */
-	private $nativeDate;
+	/** use native datetime format */
+	private bool $nativeDate;
 
-	/** @var int|null Number of affected rows */
-	private $affectedRows;
+	private ?int $affectedRows;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -104,6 +102,7 @@ class OracleDriver implements Dibi\Driver
 			$err = oci_error($this->connection);
 			throw new Dibi\DriverException($err['message'], $err['code'], $sql);
 		}
+
 		return null;
 	}
 
@@ -147,7 +146,7 @@ class OracleDriver implements Dibi\Driver
 	/**
 	 * Begins a transaction (if supported).
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		$this->autocommit = false;
 	}
@@ -157,12 +156,13 @@ class OracleDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		if (!oci_commit($this->connection)) {
 			$err = oci_error($this->connection);
 			throw new Dibi\DriverException($err['message'], $err['code']);
 		}
+
 		$this->autocommit = true;
 	}
 
@@ -171,12 +171,13 @@ class OracleDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		if (!oci_rollback($this->connection)) {
 			$err = oci_error($this->connection);
 			throw new Dibi\DriverException($err['message'], $err['code']);
 		}
+
 		$this->autocommit = true;
 	}
 
@@ -185,7 +186,7 @@ class OracleDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource()
+	public function getResource(): mixed
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}

src/Dibi/Drivers/OracleReflector.php

@@ -19,8 +19,7 @@ class OracleReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Driver */
-	private $driver;
+	private Dibi\Driver $driver;
 
 
 	public function __construct(Dibi\Driver $driver)
@@ -44,6 +43,7 @@ class OracleReflector implements Dibi\Reflector
 				];
 			}
 		}
+
 		return $tables;
 	}
 
@@ -66,6 +66,7 @@ class OracleReflector implements Dibi\Reflector
 				'vendor' => $row,
 			];
 		}
+
 		return $columns;
 	}
 

src/Dibi/Drivers/OracleResult.php

@@ -22,8 +22,7 @@ class OracleResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
+	private bool $autoFree = true;
 
 
 	/**
@@ -100,6 +99,7 @@ class OracleResult implements Dibi\ResultDriver
 				'nativetype' => $type === 'NUMBER' && oci_field_scale($this->resultSet, $i) === 0 ? 'INTEGER' : $type,
 			];
 		}
+
 		return $columns;
 	}
 
@@ -108,7 +108,7 @@ class OracleResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource()
+	public function getResultResource(): mixed
 	{
 		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;

src/Dibi/Drivers/PdoDriver.php

@@ -29,17 +29,13 @@ class PdoDriver implements Dibi\Driver
 {
 	use Dibi\Strict;
 
-	/** @var PDO|null  Connection resource */
-	private $connection;
+	private ?PDO $connection;
 
-	/** @var int|null  Affected rows */
-	private $affectedRows;
+	private ?int $affectedRows;
 
-	/** @var string */
-	private $driverName;
+	private string $driverName;
 
-	/** @var string */
-	private $serverVersion = '';
+	private string $serverVersion = '';
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -60,7 +56,6 @@ class PdoDriver implements Dibi\Driver
 			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']);
@@ -69,6 +64,7 @@ class PdoDriver implements Dibi\Driver
 				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());
 			}
 		}
@@ -144,7 +140,7 @@ class PdoDriver implements Dibi\Driver
 	 * Begins a transaction (if supported).
 	 * @throws Dibi\DriverException
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		if (!$this->connection->beginTransaction()) {
 			$err = $this->connection->errorInfo();
@@ -157,7 +153,7 @@ class PdoDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		if (!$this->connection->commit()) {
 			$err = $this->connection->errorInfo();
@@ -170,7 +166,7 @@ class PdoDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		if (!$this->connection->rollBack()) {
 			$err = $this->connection->errorInfo();
@@ -366,15 +362,18 @@ class PdoDriver implements Dibi\Driver
 					$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
 						. ($offset ? ' OFFSET ' . $offset : '');
 				}
+
 				break;
 
 			case 'pgsql':
 				if ($limit !== null) {
 					$sql .= ' LIMIT ' . $limit;
 				}
+
 				if ($offset) {
 					$sql .= ' OFFSET ' . $offset;
 				}
+
 				break;
 
 			case 'sqlite':
@@ -382,6 +381,7 @@ class PdoDriver implements Dibi\Driver
 					$sql .= ' LIMIT ' . ($limit ?? '-1')
 						. ($offset ? ' OFFSET ' . $offset : '');
 				}
+
 				break;
 
 			case 'oci':
@@ -394,6 +394,7 @@ class PdoDriver implements Dibi\Driver
 				} elseif ($limit !== null) {
 					$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
 				}
+
 				break;
 
 			case 'mssql':
@@ -406,10 +407,10 @@ class PdoDriver implements Dibi\Driver
 					} 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.');
@@ -419,7 +420,6 @@ class PdoDriver implements Dibi\Driver
 					break;
 				}
 				// break omitted
-
 			default:
 				throw new Dibi\NotSupportedException('PDO or driver does not support applying limit or offset.');
 		}

src/Dibi/Drivers/PdoResult.php

@@ -21,11 +21,9 @@ class PdoResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var \PDOStatement|null */
-	private $resultSet;
+	private ?\PDOStatement $resultSet;
 
-	/** @var string */
-	private $driverName;
+	private string $driverName;
 
 
 	public function __construct(\PDOStatement $resultSet, string $driverName)
@@ -85,6 +83,7 @@ class PdoResult implements Dibi\ResultDriver
 			if ($row === false) {
 				throw new Dibi\NotSupportedException('Driver does not support meta data.');
 			}
+
 			$row += [
 				'table' => null,
 				'native_type' => 'VAR_STRING',
@@ -99,6 +98,7 @@ class PdoResult implements Dibi\ResultDriver
 				'vendor' => $row,
 			];
 		}
+
 		return $columns;
 	}
 

src/Dibi/Drivers/PostgreDriver.php

@@ -11,6 +11,7 @@ namespace Dibi\Drivers;
 
 use Dibi;
 use Dibi\Helpers;
+use PgSql;
 
 
 /**
@@ -29,11 +30,10 @@ class PostgreDriver implements Dibi\Driver
 {
 	use Dibi\Strict;
 
-	/** @var resource */
+	/** @var resource|PgSql\Connection */
 	private $connection;
 
-	/** @var int|null  Affected rows */
-	private $affectedRows;
+	private ?int $affectedRows;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -63,6 +63,7 @@ class PostgreDriver implements Dibi\Driver
 					}
 				}
 			}
+
 			$connectType = $config['connect_type'] ?? PGSQL_CONNECT_FORCE_NEW;
 
 			set_error_handler(function (int $severity, string $message) use (&$error) {
@@ -74,7 +75,7 @@ class PostgreDriver implements Dibi\Driver
 			restore_error_handler();
 		}
 
-		if (!is_resource($this->connection)) {
+		if (!is_resource($this->connection) && !$this->connection instanceof PgSql\Connection) {
 			throw new Dibi\DriverException($error ?: 'Connecting error.');
 		}
 
@@ -120,24 +121,25 @@ class PostgreDriver implements Dibi\Driver
 		if ($res === false) {
 			throw static::createException(pg_last_error($this->connection), null, $sql);
 
-		} elseif (is_resource($res)) {
+		} 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);
 			}
 		}
+
 		return null;
 	}
 
 
-	public static function createException(string $message, $code = null, string $sql = null): Dibi\DriverException
+	public static function createException(string $message, $code = null, ?string $sql = null): Dibi\DriverException
 	{
 		if ($code === null && preg_match('#^ERROR:\s+(\S+):\s*#', $message, $m)) {
 			$code = $m[1];
 			$message = substr($message, strlen($m[0]));
 		}
 
-		if ($code === '0A000' && strpos($message, 'truncate') !== false) {
+		if ($code === '0A000' && str_contains($message, 'truncate')) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
 		} elseif ($code === '23502') {
@@ -186,7 +188,7 @@ class PostgreDriver implements Dibi\Driver
 	 * Begins a transaction (if supported).
 	 * @throws Dibi\DriverException
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "SAVEPOINT {$this->escapeIdentifier($savepoint)}" : 'START TRANSACTION');
 	}
@@ -196,7 +198,7 @@ class PostgreDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "RELEASE SAVEPOINT {$this->escapeIdentifier($savepoint)}" : 'COMMIT');
 	}
@@ -206,7 +208,7 @@ class PostgreDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "ROLLBACK TO SAVEPOINT {$this->escapeIdentifier($savepoint)}" : 'ROLLBACK');
 	}
@@ -225,9 +227,11 @@ class PostgreDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource()
+	public function getResource(): mixed
 	{
-		return is_resource($this->connection) ? $this->connection : null;
+		return is_resource($this->connection) || $this->connection instanceof PgSql\Connection
+			? $this->connection
+			: null;
 	}
 
 
@@ -258,18 +262,20 @@ class PostgreDriver implements Dibi\Driver
 	 */
 	public function escapeText(string $value): string
 	{
-		if (!is_resource($this->connection)) {
+		if (!$this->getResource()) {
 			throw new Dibi\Exception('Lost connection to server.');
 		}
+
 		return "'" . pg_escape_string($this->connection, $value) . "'";
 	}
 
 
 	public function escapeBinary(string $value): string
 	{
-		if (!is_resource($this->connection)) {
+		if (!$this->getResource()) {
 			throw new Dibi\Exception('Lost connection to server.');
 		}
+
 		return "'" . pg_escape_bytea($this->connection, $value) . "'";
 	}
 
@@ -325,9 +331,11 @@ class PostgreDriver implements Dibi\Driver
 		if ($limit < 0 || $offset < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 		}
+
 		if ($limit !== null) {
 			$sql .= ' LIMIT ' . $limit;
 		}
+
 		if ($offset) {
 			$sql .= ' OFFSET ' . $offset;
 		}

src/Dibi/Drivers/PostgreReflector.php

@@ -19,11 +19,9 @@ class PostgreReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Driver */
-	private $driver;
+	private Dibi\Driver $driver;
 
-	/** @var string */
-	private $version;
+	private string $version;
 
 
 	public function __construct(Dibi\Driver $driver, string $version)
@@ -66,6 +64,7 @@ class PostgreReflector implements Dibi\Reflector
 		while ($row = $res->fetch(true)) {
 			$tables[] = $row;
 		}
+
 		return $tables;
 	}
 
@@ -102,7 +101,7 @@ class PostgreReflector implements Dibi\Reflector
 					a.atttypmod-4 AS character_maximum_length,
 					NOT a.attnotnull AS is_nullable,
 					a.attnum AS ordinal_position,
-					adef.adsrc AS column_default
+					pg_get_expr(adef.adbin, adef.adrelid) AS column_default
 				FROM
 					pg_attribute a
 					JOIN pg_type ON a.atttypid = pg_type.oid
@@ -127,10 +126,11 @@ class PostgreReflector implements Dibi\Reflector
 				'size' => $size > 0 ? $size : null,
 				'nullable' => $row['is_nullable'] === 'YES' || $row['is_nullable'] === 't' || $row['is_nullable'] === true,
 				'default' => $row['column_default'],
-				'autoincrement' => (int) $row['ordinal_position'] === $primary && substr($row['column_default'] ?? '', 0, 7) === 'nextval',
+				'autoincrement' => (int) $row['ordinal_position'] === $primary && str_starts_with($row['column_default'] ?? '', 'nextval'),
 				'vendor' => $row,
 			];
 		}
+
 		return $columns;
 	}
 
@@ -180,6 +180,7 @@ class PostgreReflector implements Dibi\Reflector
 				}
 			}
 		}
+
 		return array_values($indexes);
 	}
 

src/Dibi/Drivers/PostgreResult.php

@@ -11,6 +11,7 @@ namespace Dibi\Drivers;
 
 use Dibi;
 use Dibi\Helpers;
+use PgSql;
 
 
 /**
@@ -20,15 +21,14 @@ class PostgreResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource */
+	/** @var resource|PgSql\Result */
 	private $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
+	private bool $autoFree = true;
 
 
 	/**
-	 * @param  resource  $resultSet
+	 * @param  resource|PgSql\Result  $resultSet
 	 */
 	public function __construct($resultSet)
 	{
@@ -102,18 +102,21 @@ class PostgreResult implements Dibi\ResultDriver
 				: $row['name'];
 			$columns[] = $row;
 		}
+
 		return $columns;
 	}
 
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|null
+	 * @return resource|PgSql\Result|null
 	 */
-	public function getResultResource()
+	public function getResultResource(): mixed
 	{
 		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : null;
+		return is_resource($this->resultSet) || $this->resultSet instanceof PgSql\Result
+			? $this->resultSet
+			: null;
 	}
 
 

src/Dibi/Drivers/SqliteDriver.php

@@ -27,14 +27,11 @@ class SqliteDriver implements Dibi\Driver
 {
 	use Dibi\Strict;
 
-	/** @var SQLite3 */
-	private $connection;
+	private SQLite3 $connection;
 
-	/** @var string  Date format */
-	private $fmtDate;
+	private string $fmtDate;
 
-	/** @var string  Datetime format */
-	private $fmtDateTime;
+	private string $fmtDateTime;
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -57,7 +54,7 @@ class SqliteDriver implements Dibi\Driver
 		} else {
 			try {
 				$this->connection = new SQLite3($config['database']);
-			} catch (\Exception $e) {
+			} catch (\Throwable $e) {
 				throw new Dibi\DriverException($e->getMessage(), $e->getCode());
 			}
 		}
@@ -92,6 +89,7 @@ class SqliteDriver implements Dibi\Driver
 		} elseif ($res instanceof \SQLite3Result && $res->numColumns()) {
 			return $this->createResultDriver($res);
 		}
+
 		return null;
 	}
 
@@ -101,19 +99,19 @@ class SqliteDriver implements Dibi\Driver
 		if ($code !== 19) {
 			return new Dibi\DriverException($message, $code, $sql);
 
-		} elseif (strpos($message, 'must be unique') !== false
-			|| strpos($message, 'is not unique') !== false
-			|| strpos($message, 'UNIQUE constraint failed') !== false
+		} elseif (str_contains($message, 'must be unique')
+			|| str_contains($message, 'is not unique')
+			|| str_contains($message, 'UNIQUE constraint failed')
 		) {
 			return new Dibi\UniqueConstraintViolationException($message, $code, $sql);
 
-		} elseif (strpos($message, 'may not be null') !== false
-			|| strpos($message, 'NOT NULL constraint failed') !== false
+		} elseif (str_contains($message, 'may not be null')
+			|| str_contains($message, 'NOT NULL constraint failed')
 		) {
 			return new Dibi\NotNullConstraintViolationException($message, $code, $sql);
 
-		} elseif (strpos($message, 'foreign key constraint failed') !== false
-			|| strpos($message, 'FOREIGN KEY constraint failed') !== false
+		} elseif (str_contains($message, 'foreign key constraint failed')
+			|| str_contains($message, 'FOREIGN KEY constraint failed')
 		) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
@@ -145,7 +143,7 @@ class SqliteDriver implements Dibi\Driver
 	 * Begins a transaction (if supported).
 	 * @throws Dibi\DriverException
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "SAVEPOINT $savepoint" : 'BEGIN');
 	}
@@ -155,7 +153,7 @@ class SqliteDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "RELEASE SAVEPOINT $savepoint" : 'COMMIT');
 	}
@@ -165,7 +163,7 @@ class SqliteDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		$this->query($savepoint ? "ROLLBACK TO SAVEPOINT $savepoint" : 'ROLLBACK');
 	}
@@ -290,8 +288,9 @@ class SqliteDriver implements Dibi\Driver
 		string $name,
 		callable $rowCallback,
 		callable $agrCallback,
-		int $numArgs = -1
-	): void {
+		int $numArgs = -1,
+	): void
+	{
 		$this->connection->createAggregate($name, $rowCallback, $agrCallback, $numArgs);
 	}
 }

src/Dibi/Drivers/SqliteReflector.php

@@ -19,8 +19,7 @@ class SqliteReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Driver */
-	private $driver;
+	private Dibi\Driver $driver;
 
 
 	public function __construct(Dibi\Driver $driver)
@@ -44,6 +43,7 @@ class SqliteReflector implements Dibi\Reflector
 		while ($row = $res->fetch(true)) {
 			$tables[] = $row;
 		}
+
 		return $tables;
 	}
 
@@ -70,6 +70,7 @@ class SqliteReflector implements Dibi\Reflector
 				'vendor' => $row,
 			];
 		}
+
 		return $columns;
 	}
 
@@ -103,8 +104,10 @@ class SqliteReflector implements Dibi\Reflector
 					break;
 				}
 			}
+
 			$indexes[$index]['primary'] = (bool) $primary;
 		}
+
 		if (!$indexes) { // @see http://www.sqlite.org/lang_createtable.html#rowid
 			foreach ($columns as $column) {
 				if ($column['vendor']['pk']) {
@@ -142,6 +145,7 @@ class SqliteReflector implements Dibi\Reflector
 				$keys[$row['id']]['foreign'] = null;
 			}
 		}
+
 		return array_values($keys);
 	}
 }

src/Dibi/Drivers/SqliteResult.php

@@ -20,11 +20,9 @@ class SqliteResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var \SQLite3Result */
-	private $resultSet;
+	private \SQLite3Result $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
+	private bool $autoFree = true;
 
 
 	public function __construct(\SQLite3Result $resultSet)
@@ -90,7 +88,7 @@ class SqliteResult implements Dibi\ResultDriver
 	{
 		$count = $this->resultSet->numColumns();
 		$columns = [];
-		static $types = [SQLITE3_INTEGER => 'int', SQLITE3_FLOAT => 'float', SQLITE3_TEXT => 'text', SQLITE3_BLOB => 'blob', SQLITE3_NULL => 'null'];
+		$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),
@@ -99,6 +97,7 @@ class SqliteResult implements Dibi\ResultDriver
 				'nativetype' => $types[$this->resultSet->columnType($i)] ?? null, // buggy in PHP 7.4.4 & 7.3.16, bug 79414
 			];
 		}
+
 		return $columns;
 	}
 

src/Dibi/Drivers/SqlsrvDriver.php

@@ -32,11 +32,9 @@ class SqlsrvDriver implements Dibi\Driver
 	/** @var resource */
 	private $connection;
 
-	/** @var int|null  Affected rows */
-	private $affectedRows;
+	private ?int $affectedRows;
 
-	/** @var string */
-	private $version = '';
+	private string $version = '';
 
 
 	/** @throws Dibi\NotSupportedException */
@@ -53,25 +51,28 @@ class SqlsrvDriver implements Dibi\Driver
 
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
-
+			if (!is_resource($this->connection)) {
+				throw new \InvalidArgumentException("Configuration option 'resource' is not resource.");
+			}
 		} else {
 			$options = $config['options'];
 
 			// Default values
-			$options['CharacterSet'] = $options['CharacterSet'] ?? 'UTF-8';
+			$options['CharacterSet'] ??= 'UTF-8';
 			$options['PWD'] = (string) $options['PWD'];
 			$options['UID'] = (string) $options['UID'];
 			$options['Database'] = (string) $options['Database'];
 
 			sqlsrv_configure('WarningsReturnAsErrors', 0);
 			$this->connection = sqlsrv_connect($config['host'], $options);
+			if (!is_resource($this->connection)) {
+				$info = sqlsrv_errors(SQLSRV_ERR_ERRORS);
+				throw new Dibi\DriverException($info[0]['message'], $info[0]['code']);
+			}
+
 			sqlsrv_configure('WarningsReturnAsErrors', 1);
 		}
 
-		if (!is_resource($this->connection)) {
-			$info = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-			throw new Dibi\DriverException($info[0]['message'], $info[0]['code']);
-		}
 		$this->version = sqlsrv_server_info($this->connection)['SQLServerVersion'];
 	}
 
@@ -104,6 +105,7 @@ class SqlsrvDriver implements Dibi\Driver
 				? $this->createResultDriver($res)
 				: null;
 		}
+
 		return null;
 	}
 
@@ -127,6 +129,7 @@ class SqlsrvDriver implements Dibi\Driver
 			$row = sqlsrv_fetch_array($res, SQLSRV_FETCH_NUMERIC);
 			return Dibi\Helpers::intVal($row[0]);
 		}
+
 		return null;
 	}
 
@@ -135,7 +138,7 @@ class SqlsrvDriver implements Dibi\Driver
 	 * Begins a transaction (if supported).
 	 * @throws Dibi\DriverException
 	 */
-	public function begin(string $savepoint = null): void
+	public function begin(?string $savepoint = null): void
 	{
 		sqlsrv_begin_transaction($this->connection);
 	}
@@ -145,7 +148,7 @@ class SqlsrvDriver implements Dibi\Driver
 	 * Commits statements in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function commit(string $savepoint = null): void
+	public function commit(?string $savepoint = null): void
 	{
 		sqlsrv_commit($this->connection);
 	}
@@ -155,7 +158,7 @@ class SqlsrvDriver implements Dibi\Driver
 	 * Rollback changes in a transaction.
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback(string $savepoint = null): void
+	public function rollback(?string $savepoint = null): void
 	{
 		sqlsrv_rollback($this->connection);
 	}
@@ -165,7 +168,7 @@ class SqlsrvDriver implements Dibi\Driver
 	 * Returns the connection resource.
 	 * @return resource|null
 	 */
-	public function getResource()
+	public function getResource(): mixed
 	{
 		return is_resource($this->connection) ? $this->connection : null;
 	}
@@ -264,7 +267,6 @@ class SqlsrvDriver implements Dibi\Driver
 			} 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);

src/Dibi/Drivers/SqlsrvReflector.php

@@ -19,8 +19,7 @@ class SqlsrvReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Driver */
-	private $driver;
+	private Dibi\Driver $driver;
 
 
 	public function __construct(Dibi\Driver $driver)
@@ -42,6 +41,7 @@ class SqlsrvReflector implements Dibi\Reflector
 				'view' => isset($row[1]) && $row[1] === 'VIEW',
 			];
 		}
+
 		return $tables;
 	}
 
@@ -91,6 +91,7 @@ class SqlsrvReflector implements Dibi\Reflector
 				'vendor' => $row,
 			];
 		}
+
 		return $columns;
 	}
 
@@ -114,6 +115,7 @@ class SqlsrvReflector implements Dibi\Reflector
 			$indexes[$row['name']]['primary'] = $row['is_primary_key'] === 1;
 			$indexes[$row['name']]['columns'] = $keyUsages[$row['name']] ?? [];
 		}
+
 		return array_values($indexes);
 	}
 

src/Dibi/Drivers/SqlsrvResult.php

@@ -22,8 +22,7 @@ class SqlsrvResult implements Dibi\ResultDriver
 	/** @var resource */
 	private $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
+	private bool $autoFree = true;
 
 
 	/**
@@ -96,6 +95,7 @@ class SqlsrvResult implements Dibi\ResultDriver
 				'nativetype' => $fieldMetadata['Type'],
 			];
 		}
+
 		return $columns;
 	}
 
@@ -104,7 +104,7 @@ class SqlsrvResult implements Dibi\ResultDriver
 	 * Returns the result set resource.
 	 * @return resource|null
 	 */
-	public function getResultResource()
+	public function getResultResource(): mixed
 	{
 		$this->autoFree = false;
 		return is_resource($this->resultSet) ? $this->resultSet : null;

src/Dibi/Event.php

@@ -31,29 +31,22 @@ class Event
 		TRANSACTION = 448, // BEGIN | COMMIT | ROLLBACK
 		ALL = 1023;
 
-	/** @var Connection */
-	public $connection;
+	public Connection $connection;
 
-	/** @var int */
-	public $type;
+	public int $type;
 
-	/** @var string */
-	public $sql;
+	public string $sql;
 
-	/** @var Result|DriverException|null */
-	public $result;
+	public Result|DriverException|null $result;
 
-	/** @var float */
-	public $time;
+	public float $time;
 
-	/** @var int|null */
-	public $count;
+	public ?int $count = null;
 
-	/** @var array|null */
-	public $source;
+	public ?array $source = null;
 
 
-	public function __construct(Connection $connection, int $type, string $sql = null)
+	public function __construct(Connection $connection, int $type, ?string $sql = null)
 	{
 		$this->connection = $connection;
 		$this->type = $type;
@@ -61,7 +54,7 @@ class Event
 		$this->time = -microtime(true);
 
 		if ($type === self::QUERY && preg_match('#\(?\s*(SELECT|UPDATE|INSERT|DELETE)#iA', $this->sql, $matches)) {
-			static $types = [
+			$types = [
 				'SELECT' => self::SELECT, 'UPDATE' => self::UPDATE,
 				'INSERT' => self::INSERT, 'DELETE' => self::DELETE,
 			];
@@ -70,7 +63,11 @@ class Event
 
 		$dibiDir = dirname((new \ReflectionClass('dibi'))->getFileName()) . DIRECTORY_SEPARATOR;
 		foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $row) {
-			if (isset($row['file']) && is_file($row['file']) && strpos($row['file'], $dibiDir) !== 0) {
+			if (
+				isset($row['file'])
+				&& preg_match('~\.(php.?|phtml)$~', $row['file'])
+				&& !str_starts_with($row['file'], $dibiDir)
+			) {
 				$this->source = [$row['file'], (int) $row['line']];
 				break;
 			}
@@ -82,10 +79,7 @@ class Event
 	}
 
 
-	/**
-	 * @param  Result|DriverException|null  $result
-	 */
-	public function done($result = null): self
+	public function done(Result|DriverException|null $result = null): static
 	{
 		$this->result = $result;
 		try {

src/Dibi/Expression.php

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

src/Dibi/Fluent.php

@@ -47,8 +47,7 @@ class Fluent implements IDataSource
 
 	public const REMOVE = false;
 
-	/** @var array */
-	public static $masks = [
+	public static array $masks = [
 		'SELECT' => ['SELECT', 'DISTINCT', 'FROM', 'WHERE', 'GROUP BY',
 			'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET', ],
 		'UPDATE' => ['UPDATE', 'SET', 'WHERE', 'ORDER BY', 'LIMIT'],
@@ -56,8 +55,8 @@ class Fluent implements IDataSource
 		'DELETE' => ['DELETE', 'FROM', 'USING', 'WHERE', 'ORDER BY', 'LIMIT'],
 	];
 
-	/** @var array  default modifiers for arrays */
-	public static $modifiers = [
+	/** default modifiers for arrays */
+	public static array $modifiers = [
 		'SELECT' => '%n',
 		'FROM' => '%n',
 		'IN' => '%in',
@@ -69,8 +68,8 @@ class Fluent implements IDataSource
 		'GROUP BY' => '%by',
 	];
 
-	/** @var array  clauses separators */
-	public static $separators = [
+	/** clauses separators */
+	public static array $separators = [
 		'SELECT' => ',',
 		'FROM' => ',',
 		'WHERE' => 'AND',
@@ -84,41 +83,35 @@ class Fluent implements IDataSource
 		'INTO' => false,
 	];
 
-	/** @var array  clauses */
-	public static $clauseSwitches = [
+	/** clauses */
+	public static array $clauseSwitches = [
 		'JOIN' => 'FROM',
 		'INNER JOIN' => 'FROM',
 		'LEFT JOIN' => 'FROM',
 		'RIGHT JOIN' => 'FROM',
 	];
 
-	/** @var Connection */
-	private $connection;
+	private Connection $connection;
 
-	/** @var array */
-	private $setups = [];
+	private array $setups = [];
 
-	/** @var string|null */
-	private $command;
+	private ?string $command = null;
 
-	/** @var array */
-	private $clauses = [];
+	private array $clauses = [];
 
-	/** @var array */
-	private $flags = [];
+	private array $flags = [];
 
-	/** @var array|null */
 	private $cursor;
 
-	/** @var HashMap  normalized clauses */
-	private static $normalizer;
+	/** normalized clauses */
+	private static HashMap $normalizer;
 
 
 	public function __construct(Connection $connection)
 	{
 		$this->connection = $connection;
 
-		if (self::$normalizer === null) {
+		if (!isset(self::$normalizer)) {
 			self::$normalizer = new HashMap([self::class, '_formatClause']);
 		}
 	}
@@ -127,7 +120,7 @@ class Fluent implements IDataSource
 	/**
 	 * Appends new argument to the clause.
 	 */
-	public function __call(string $clause, array $args): self
+	public function __call(string $clause, array $args): static
 	{
 		$clause = self::$normalizer->$clause;
 
@@ -136,6 +129,7 @@ class Fluent implements IDataSource
 			if (isset(self::$masks[$clause])) {
 				$this->clauses = array_fill_keys(self::$masks[$clause], null);
 			}
+
 			$this->cursor = &$this->clauses[$clause];
 			$this->cursor = [];
 			$this->command = $clause;
@@ -165,7 +159,6 @@ class Fluent implements IDataSource
 					$this->cursor[] = $sep;
 				}
 			}
-
 		} else {
 			// append to currect flow
 			if ($args === [self::REMOVE]) {
@@ -203,6 +196,7 @@ class Fluent implements IDataSource
 			if ($arg instanceof self) {
 				$arg = new Literal("($arg)");
 			}
+
 			$this->cursor[] = $arg;
 		}
 
@@ -213,7 +207,7 @@ class Fluent implements IDataSource
 	/**
 	 * Switch to a clause.
 	 */
-	public function clause(string $clause): self
+	public function clause(string $clause): static
 	{
 		$this->cursor = &$this->clauses[self::$normalizer->$clause];
 		if ($this->cursor === null) {
@@ -227,7 +221,7 @@ class Fluent implements IDataSource
 	/**
 	 * Removes a clause.
 	 */
-	public function removeClause(string $clause): self
+	public function removeClause(string $clause): static
 	{
 		$this->clauses[self::$normalizer->$clause] = null;
 		return $this;
@@ -237,7 +231,7 @@ class Fluent implements IDataSource
 	/**
 	 * Change a SQL flag.
 	 */
-	public function setFlag(string $flag, bool $value = true): self
+	public function setFlag(string $flag, bool $value = true): static
 	{
 		$flag = strtoupper($flag);
 		if ($value) {
@@ -245,6 +239,7 @@ class Fluent implements IDataSource
 		} else {
 			unset($this->flags[$flag]);
 		}
+
 		return $this;
 	}
 
@@ -276,7 +271,7 @@ class Fluent implements IDataSource
 	/**
 	 * Adds Result setup.
 	 */
-	public function setupResult(string $method): self
+	public function setupResult(string $method): static
 	{
 		$this->setups[] = func_get_args();
 		return $this;
@@ -288,10 +283,10 @@ class Fluent implements IDataSource
 
 	/**
 	 * Generates and executes SQL query.
-	 * @return Result|int|null  result set or number of affected rows
+	 * Returns result set or number of affected rows
 	 * @throws Exception
 	 */
-	public function execute(string $return = null)
+	public function execute(?string $return = null): Result|int|null
 	{
 		$res = $this->query($this->_export());
 		switch ($return) {
@@ -307,9 +302,8 @@ class Fluent implements IDataSource
 
 	/**
 	 * Generates, executes SQL query and fetches the single row.
-	 * @return Row|array|null
 	 */
-	public function fetch()
+	public function fetch(): Row|array|null
 	{
 		return $this->command === 'SELECT' && !$this->clauses['LIMIT']
 			? $this->query($this->_export(null, ['%lmt', 1]))->fetch()
@@ -319,9 +313,9 @@ class Fluent implements IDataSource
 
 	/**
 	 * Like fetch(), but returns only first field.
-	 * @return mixed  value on success, null if no next record
+	 * Returns value on success, null if no next record
 	 */
-	public function fetchSingle()
+	public function fetchSingle(): mixed
 	{
 		return $this->command === 'SELECT' && !$this->clauses['LIMIT']
 			? $this->query($this->_export(null, ['%lmt', 1]))->fetchSingle()
@@ -332,7 +326,7 @@ class Fluent implements IDataSource
 	/**
 	 * Fetches all records from table.
 	 */
-	public function fetchAll(int $offset = null, int $limit = null): array
+	public function fetchAll(?int $offset = null, ?int $limit = null): array
 	{
 		return $this->query($this->_export(null, ['%ofs %lmt', $offset, $limit]))->fetchAll();
 	}
@@ -351,7 +345,7 @@ class Fluent implements IDataSource
 	/**
 	 * Fetches all records from table like $key => $value pairs.
 	 */
-	public function fetchPairs(string $key = null, string $value = null): array
+	public function fetchPairs(?string $key = null, ?string $value = null): array
 	{
 		return $this->query($this->_export())->fetchPairs($key, $value);
 	}
@@ -360,7 +354,7 @@ class Fluent implements IDataSource
 	/**
 	 * Required by the IteratorAggregate interface.
 	 */
-	public function getIterator(int $offset = null, int $limit = null): ResultIterator
+	public function getIterator(?int $offset = null, ?int $limit = null): ResultIterator
 	{
 		return $this->query($this->_export(null, ['%ofs %lmt', $offset, $limit]))->getIterator();
 	}
@@ -369,7 +363,7 @@ class Fluent implements IDataSource
 	/**
 	 * Generates and prints SQL query or it's part.
 	 */
-	public function test(string $clause = null): bool
+	public function test(?string $clause = null): bool
 	{
 		return $this->connection->test($this->_export($clause));
 	}
@@ -390,6 +384,7 @@ class Fluent implements IDataSource
 			$method = array_shift($setup);
 			$res->$method(...$setup);
 		}
+
 		return $res;
 	}
 
@@ -408,19 +403,14 @@ class Fluent implements IDataSource
 	 */
 	final public function __toString(): string
 	{
-		try {
-			return $this->connection->translate($this->_export());
-		} catch (\Throwable $e) {
-			trigger_error($e->getMessage(), E_USER_ERROR);
-			return '';
-		}
+		return $this->connection->translate($this->_export());
 	}
 
 
 	/**
 	 * Generates parameters for Translator.
 	 */
-	protected function _export(string $clause = null, array $args = []): array
+	protected function _export(?string $clause = null, array $args = []): array
 	{
 		if ($clause === null) {
 			$data = $this->clauses;
@@ -428,7 +418,6 @@ class Fluent implements IDataSource
 				$args = array_merge(['%lmt %ofs', $data['LIMIT'][0] ?? null, $data['OFFSET'][0] ?? null], $args);
 				unset($data['LIMIT'], $data['OFFSET']);
 			}
-
 		} else {
 			$clause = self::$normalizer->$clause;
 			if (array_key_exists($clause, $this->clauses)) {
@@ -444,6 +433,7 @@ class Fluent implements IDataSource
 				if ($clause === $this->command && $this->flags) {
 					$args[] = implode(' ', array_keys($this->flags));
 				}
+
 				foreach ($statement as $arg) {
 					$args[] = $arg;
 				}
@@ -464,6 +454,7 @@ class Fluent implements IDataSource
 			$s .= 'By';
 			trigger_error("Did you mean '$s'?", E_USER_NOTICE);
 		}
+
 		return strtoupper(preg_replace('#[a-z](?=[A-Z])#', '$0 ', $s));
 	}
 
@@ -475,6 +466,7 @@ class Fluent implements IDataSource
 			$this->clauses[$clause] = &$val;
 			unset($val);
 		}
+
 		$this->cursor = &$foo;
 	}
 }

src/Dibi/HashMap.php

@@ -14,6 +14,7 @@ namespace Dibi;
  * Lazy cached storage.
  * @internal
  */
+#[\AllowDynamicProperties]
 abstract class HashMapBase
 {
 	/** @var callable */
@@ -50,6 +51,7 @@ final class HashMap extends HashMapBase
 		if ($nm === '') {
 			$nm = "\xFF";
 		}
+
 		$this->$nm = $val;
 	}
 
@@ -58,7 +60,7 @@ final class HashMap extends HashMapBase
 	{
 		if ($nm === '') {
 			$nm = "\xFF";
-			return isset($this->$nm) ? $this->$nm : $this->$nm = $this->getCallback()('');
+			return isset($this->$nm) && true ? $this->$nm : $this->$nm = $this->getCallback()('');
 		} else {
 			return $this->$nm = $this->getCallback()($nm);
 		}

src/Dibi/Helpers.php

@@ -14,19 +14,17 @@ class Helpers
 {
 	use Strict;
 
-	/** @var HashMap */
-	private static $types;
+	private static HashMap $types;
 
 
 	/**
 	 * Prints out a syntax highlighted version of the SQL command or Result.
-	 * @param  string|Result  $sql
 	 */
-	public static function dump($sql = null, bool $return = false): ?string
+	public static function dump(string|Result|null $sql = null, bool $return = false): ?string
 	{
 		ob_start();
 		if ($sql instanceof Result && PHP_SAPI === 'cli') {
-			$hasColors = (substr((string) getenv('TERM'), 0, 5) === 'xterm');
+			$hasColors = (str_starts_with((string) getenv('TERM'), 'xterm'));
 			$maxLen = 0;
 			foreach ($sql as $i => $row) {
 				if ($i === 0) {
@@ -41,6 +39,7 @@ class Helpers
 					$spaces = $maxLen - mb_strlen($col) + 2;
 					echo "$col" . str_repeat(' ', $spaces) . "$val\n";
 				}
+
 				echo "\n";
 			}
 
@@ -53,6 +52,7 @@ class Helpers
 					foreach ($row as $col => $foo) {
 						echo "\t\t<th>" . htmlspecialchars((string) $col) . "</th>\n";
 					}
+
 					echo "\t</tr>\n</thead>\n<tbody>\n";
 				}
 
@@ -60,6 +60,7 @@ class Helpers
 				foreach ($row as $col) {
 					echo "\t\t<td>", htmlspecialchars((string) $col), "</td>\n";
 				}
+
 				echo "\t</tr>\n";
 			}
 
@@ -72,8 +73,8 @@ class Helpers
 				$sql = \dibi::$sql;
 			}
 
-			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';
+			$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';
 
 			// insert new lines
 			$sql = " $sql ";
@@ -88,7 +89,7 @@ class Helpers
 			// syntax highlight
 			$highlighter = "#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is";
 			if (PHP_SAPI === 'cli') {
-				if (substr((string) getenv('TERM'), 0, 5) === 'xterm') {
+				if (str_starts_with((string) getenv('TERM'), 'xterm')) {
 					$sql = preg_replace_callback($highlighter, function (array $m) {
 						if (!empty($m[1])) { // comment
 							return "\033[1;30m" . $m[1] . "\033[0m";
@@ -104,6 +105,7 @@ class Helpers
 						}
 					}, $sql);
 				}
+
 				echo trim($sql) . "\n\n";
 
 			} else {
@@ -150,6 +152,7 @@ class Helpers
 				$best = $item;
 			}
 		}
+
 		return $best;
 	}
 
@@ -157,7 +160,7 @@ class Helpers
 	/** @internal */
 	public static function escape(Driver $driver, $value, string $type): string
 	{
-		static $types = [
+		$types = [
 			Type::TEXT => 'text',
 			Type::BINARY => 'binary',
 			Type::BOOL => 'bool',
@@ -179,8 +182,9 @@ class Helpers
 	 */
 	public static function detectType(string $type): ?string
 	{
-		static $patterns = [
+		$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,
@@ -197,6 +201,7 @@ class Helpers
 				return $val;
 			}
 		}
+
 		return null;
 	}
 
@@ -204,9 +209,10 @@ class Helpers
 	/** @internal */
 	public static function getTypeCache(): HashMap
 	{
-		if (self::$types === null) {
+		if (!isset(self::$types)) {
 			self::$types = new HashMap([self::class, 'detectType']);
 		}
+
 		return self::$types;
 	}
 
@@ -230,9 +236,9 @@ class Helpers
 
 	/**
 	 * Import SQL dump from file.
-	 * @return int  count of sql commands
+	 * Returns count of sql commands
 	 */
-	public static function loadFromFile(Connection $connection, string $file, callable $onProgress = null): int
+	public static function loadFromFile(Connection $connection, string $file, ?callable $onProgress = null): int
 	{
 		@set_time_limit(0); // intentionally @
 
@@ -251,7 +257,7 @@ class Helpers
 			if (strtoupper(substr($s, 0, 10)) === 'DELIMITER ') {
 				$delimiter = trim(substr($s, 10));
 
-			} elseif (substr($ts = rtrim($s), -strlen($delimiter)) === $delimiter) {
+			} elseif (str_ends_with($ts = rtrim($s), $delimiter)) {
 				$sql .= substr($ts, 0, -strlen($delimiter));
 				$driver->query($sql);
 				$sql = '';
@@ -259,7 +265,6 @@ class Helpers
 				if ($onProgress) {
 					$onProgress($count, isset($stat['size']) ? $size * 100 / $stat['size'] : null);
 				}
-
 			} else {
 				$sql .= $s;
 			}
@@ -272,20 +277,21 @@ class Helpers
 				$onProgress($count, isset($stat['size']) ? 100 : null);
 			}
 		}
+
 		fclose($handle);
 		return $count;
 	}
 
 
 	/** @internal */
-	public static function false2Null($val)
+	public static function false2Null(mixed $val): mixed
 	{
 		return $val === false ? null : $val;
 	}
 
 
 	/** @internal */
-	public static function intVal($value): int
+	public static function intVal(mixed $value): int
 	{
 		if (is_int($value)) {
 			return $value;
@@ -293,6 +299,7 @@ class Helpers
 			if (is_float($value * 1)) {
 				throw new Exception("Number $value is greater than integer.");
 			}
+
 			return (int) $value;
 		} else {
 			throw new Exception("Expected number, '$value' given.");

src/Dibi/Literal.php

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

src/Dibi/Loggers/FileLogger.php

@@ -19,17 +19,15 @@ class FileLogger
 {
 	use Dibi\Strict;
 
-	/** @var string  Name of the file where SQL errors should be logged */
-	public $file;
+	/** Name of the file where SQL errors should be logged */
+	public string $file;
 
-	/** @var int */
-	public $filter;
+	public int $filter;
 
-	/** @var bool */
-	private $errorsOnly;
+	private bool $errorsOnly;
 
 
-	public function __construct(string $file, int $filter = null, bool $errorsOnly = false)
+	public function __construct(string $file, ?int $filter = null, bool $errorsOnly = false)
 	{
 		$this->file = $file;
 		$this->filter = $filter ?: Dibi\Event::QUERY;
@@ -54,10 +52,11 @@ class FileLogger
 			if ($code = $event->result->getCode()) {
 				$message = "[$code] $message";
 			}
+
 			$this->writeToFile(
 				$event,
 				"ERROR: $message"
-					. "\n-- SQL: " . $event->sql
+					. "\n-- SQL: " . $event->sql,
 			);
 		} else {
 			$this->writeToFile(
@@ -65,7 +64,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),
 			);
 		}
 	}
@@ -75,7 +74,7 @@ class FileLogger
 	{
 		$driver = $event->connection->getConfig('driver');
 		$message .=
-			"\n-- driver: " . (is_object($driver) ? get_class($driver) : $driver) . '/' . $event->connection->getConfig('name')
+			"\n-- driver: " . (is_object($driver) ? $driver::class : $driver) . '/' . $event->connection->getConfig('name')
 			. "\n-- " . date('Y-m-d H:i:s')
 			. "\n\n";
 		file_put_contents($this->file, $message, FILE_APPEND | LOCK_EX);

src/Dibi/Reflection/Column.php

@@ -29,14 +29,14 @@ class Column
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Reflector|null when created by Result */
-	private $reflector;
+	/** when created by Result */
+	private ?Dibi\Reflector $reflector;
 
 	/** @var array (name, nativetype, [table], [fullname], [size], [nullable], [default], [autoincrement], [vendor]) */
-	private $info;
+	private array $info;
 
 
-	public function __construct(Dibi\Reflector $reflector = null, array $info)
+	public function __construct(?Dibi\Reflector $reflector, array $info)
 	{
 		$this->reflector = $reflector;
 		$this->info = $info;
@@ -66,6 +66,7 @@ class Column
 		if (empty($this->info['table']) || !$this->reflector) {
 			throw new Dibi\Exception('Table is unknown or not available.');
 		}
+
 		return new Table($this->reflector, ['name' => $this->info['table']]);
 	}
 
@@ -108,15 +109,13 @@ class Column
 	}
 
 
-	/** @return mixed */
-	public function getDefault()
+	public function getDefault(): mixed
 	{
 		return $this->info['default'] ?? null;
 	}
 
 
-	/** @return mixed */
-	public function getVendorInfo(string $key)
+	public function getVendorInfo(string $key): mixed
 	{
 		return $this->info['vendor'][$key] ?? null;
 	}

src/Dibi/Reflection/Database.php

@@ -23,17 +23,15 @@ class Database
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Reflector */
-	private $reflector;
+	private Dibi\Reflector $reflector;
 
-	/** @var string|null */
-	private $name;
+	private ?string $name;
 
-	/** @var Table[]|null */
-	private $tables;
+	/** @var Table[] */
+	private array $tables;
 
 
-	public function __construct(Dibi\Reflector $reflector, string $name = null)
+	public function __construct(Dibi\Reflector $reflector, ?string $name = null)
 	{
 		$this->reflector = $reflector;
 		$this->name = $name;
@@ -62,6 +60,7 @@ class Database
 		foreach ($this->tables as $table) {
 			$res[] = $table->getName();
 		}
+
 		return $res;
 	}
 
@@ -88,7 +87,7 @@ class Database
 
 	protected function init(): void
 	{
-		if ($this->tables === null) {
+		if (!isset($this->tables)) {
 			$this->tables = [];
 			foreach ($this->reflector->getTables() as $info) {
 				$this->tables[strtolower($info['name'])] = new Table($this->reflector, $info);

src/Dibi/Reflection/ForeignKey.php

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

src/Dibi/Reflection/Index.php

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

src/Dibi/Reflection/Result.php

@@ -22,14 +22,13 @@ class Result
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\ResultDriver */
-	private $driver;
+	private Dibi\ResultDriver $driver;
 
 	/** @var Column[]|null */
-	private $columns;
+	private ?array $columns;
 
 	/** @var Column[]|null */
-	private $names;
+	private ?array $names;
 
 
 	public function __construct(Dibi\ResultDriver $driver)
@@ -54,6 +53,7 @@ class Result
 		foreach ($this->columns as $column) {
 			$res[] = $fullNames ? $column->getFullName() : $column->getName();
 		}
+
 		return $res;
 	}
 
@@ -80,7 +80,7 @@ class Result
 
 	protected function initColumns(): void
 	{
-		if ($this->columns === null) {
+		if (!isset($this->columns)) {
 			$this->columns = [];
 			$reflector = $this->driver instanceof Dibi\Reflector
 				? $this->driver

src/Dibi/Reflection/Table.php

@@ -27,26 +27,22 @@ class Table
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Reflector */
-	private $reflector;
+	private Dibi\Reflector $reflector;
 
-	/** @var string */
-	private $name;
+	private string $name;
 
-	/** @var bool */
-	private $view;
+	private bool $view;
 
-	/** @var Column[]|null */
-	private $columns;
+	/** @var Column[] */
+	private array $columns;
 
-	/** @var ForeignKey[]|null */
-	private $foreignKeys;
+	/** @var ForeignKey[] */
+	private array $foreignKeys;
 
-	/** @var Index[]|null */
-	private $indexes;
+	/** @var Index[] */
+	private array $indexes;
 
-	/** @var Index|null */
-	private $primaryKey;
+	private ?Index $primaryKey;
 
 
 	public function __construct(Dibi\Reflector $reflector, array $info)
@@ -85,6 +81,7 @@ class Table
 		foreach ($this->columns as $column) {
 			$res[] = $column->getName();
 		}
+
 		return $res;
 	}
 
@@ -134,7 +131,7 @@ class Table
 
 	protected function initColumns(): void
 	{
-		if ($this->columns === null) {
+		if (!isset($this->columns)) {
 			$this->columns = [];
 			foreach ($this->reflector->getColumns($this->name) as $info) {
 				$this->columns[strtolower($info['name'])] = new Column($this->reflector, $info);
@@ -145,13 +142,14 @@ class Table
 
 	protected function initIndexes(): void
 	{
-		if ($this->indexes === null) {
+		if (!isset($this->indexes)) {
 			$this->initColumns();
 			$this->indexes = [];
 			foreach ($this->reflector->getIndexes($this->name) as $info) {
 				foreach ($info['columns'] as $key => $name) {
 					$info['columns'][$key] = $this->columns[strtolower($name)];
 				}
+
 				$this->indexes[strtolower($info['name'])] = new Index($info);
 				if (!empty($info['primary'])) {
 					$this->primaryKey = $this->indexes[strtolower($info['name'])];

src/Dibi/Result.php

@@ -19,26 +19,23 @@ class Result implements IDataSource
 {
 	use Strict;
 
-	/** @var ResultDriver|null */
-	private $driver;
+	private ?ResultDriver $driver;
 
-	/** @var array  Translate table */
-	private $types = [];
+	/** Translate table */
+	private array $types = [];
 
-	/** @var Reflection\Result|null */
-	private $meta;
+	private ?Reflection\Result $meta;
 
-	/** @var bool  Already fetched? Used for allowance for first seek(0) */
-	private $fetched = false;
+	/** Already fetched? Used for allowance for first seek(0) */
+	private bool $fetched = false;
 
-	/** @var string|null  returned object class */
-	private $rowClass = Row::class;
+	/** returned object class */
+	private ?string $rowClass = Row::class;
 
 	/** @var callable|null  returned object factory */
 	private $rowFactory;
 
-	/** @var array  format */
-	private $formats = [];
+	private array $formats = [];
 
 
 	public function __construct(ResultDriver $driver, bool $normalize = true)
@@ -133,7 +130,7 @@ class Result implements IDataSource
 	/**
 	 * Set fetched object class. This class should extend the Row class.
 	 */
-	public function setRowClass(?string $class): self
+	public function setRowClass(?string $class): static
 	{
 		$this->rowClass = $class;
 		return $this;
@@ -152,7 +149,7 @@ class Result implements IDataSource
 	/**
 	 * Set a factory to create fetched object instances. These should extend the Row class.
 	 */
-	public function setRowFactory(callable $callback): self
+	public function setRowFactory(callable $callback): static
 	{
 		$this->rowFactory = $callback;
 		return $this;
@@ -162,14 +159,14 @@ 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()
+	final public function fetch(): mixed
 	{
 		$row = $this->getResultDriver()->fetch(true);
 		if ($row === null) {
 			return null;
 		}
+
 		$this->fetched = true;
 		$this->normalize($row);
 		if ($this->rowFactory) {
@@ -177,20 +174,22 @@ class Result implements IDataSource
 		} elseif ($this->rowClass) {
 			return new $this->rowClass($row);
 		}
+
 		return $row;
 	}
 
 
 	/**
 	 * Like fetch(), but returns only first field.
-	 * @return mixed value on success, null if no next record
+	 * Returns value on success, null if no next record
 	 */
-	final public function fetchSingle()
+	final public function fetchSingle(): mixed
 	{
 		$row = $this->getResultDriver()->fetch(true);
 		if ($row === null) {
 			return null;
 		}
+
 		$this->fetched = true;
 		$this->normalize($row);
 		return reset($row);
@@ -201,9 +200,9 @@ class Result implements IDataSource
 	 * Fetches all records from table.
 	 * @return Row[]|array[]
 	 */
-	final public function fetchAll(int $offset = null, int $limit = null): array
+	final public function fetchAll(?int $offset = null, ?int $limit = null): array
 	{
-		$limit = $limit ?? -1;
+		$limit ??= -1;
 		$this->seek($offset ?: 0);
 		$row = $this->fetch();
 		if (!$row) {
@@ -215,6 +214,7 @@ class Result implements IDataSource
 			if ($limit === 0) {
 				break;
 			}
+
 			$limit--;
 			$data[] = $row;
 		} while ($row = $this->fetch());
@@ -234,7 +234,7 @@ class Result implements IDataSource
 	 */
 	final public function fetchAssoc(string $assoc): array
 	{
-		if (strpos($assoc, ',') !== false) {
+		if (str_contains($assoc, ',')) {
 			return $this->oldFetchAssoc($assoc);
 		}
 
@@ -287,7 +287,6 @@ class Result implements IDataSource
 					} else {
 						$x = &$x->{$assoc[$i + 1]};
 					}
-
 				} elseif ($as !== '|') { // associative-array node
 					$x = &$x[(string) $row->$as];
 				}
@@ -345,7 +344,6 @@ class Result implements IDataSource
 					} else {
 						$x = &$x[$assoc[$i + 1]];
 					}
-
 				} elseif ($as === '@') { // "object" node
 					if ($x === null) {
 						$x = clone $row;
@@ -354,7 +352,6 @@ class Result implements IDataSource
 					} else {
 						$x = &$x->{$assoc[$i + 1]};
 					}
-
 				} else { // associative-array node
 					$x = &$x[(string) $row->$as];
 				}
@@ -376,7 +373,7 @@ class Result implements IDataSource
 	 * Fetches all records from table like $key => $value pairs.
 	 * @throws \InvalidArgumentException
 	 */
-	final public function fetchPairs(string $key = null, string $value = null): array
+	final public function fetchPairs(?string $key = null, ?string $value = null): array
 	{
 		$this->seek(0);
 		$row = $this->fetch();
@@ -398,6 +395,7 @@ class Result implements IDataSource
 				do {
 					$data[] = $row[$key];
 				} while ($row = $this->fetch());
+
 				return $data;
 			}
 
@@ -412,6 +410,7 @@ class Result implements IDataSource
 				do {
 					$data[] = $row[$value];
 				} while ($row = $this->fetch());
+
 				return $data;
 			}
 
@@ -455,6 +454,7 @@ class Result implements IDataSource
 			if (!isset($row[$key])) { // null
 				continue;
 			}
+
 			$value = $row[$key];
 			$format = $this->formats[$type] ?? null;
 
@@ -478,9 +478,11 @@ class Result implements IDataSource
 				} elseif ($p !== false && $e !== false) {
 					$value = rtrim($value, '.');
 				}
+
 				if ($value === '' || $value[0] === '.') {
 					$value = '0' . $value;
 				}
+
 				$row[$key] = $value === str_replace(',', '.', (string) ($float = (float) $value))
 					? $float
 					: $value;
@@ -489,13 +491,12 @@ class Result implements IDataSource
 				$row[$key] = ((bool) $value) && $value !== 'f' && $value !== 'F';
 
 			} elseif ($type === Type::DATETIME || $type === Type::DATE || $type === Type::TIME) {
-				if ($value && substr((string) $value, 0, 3) !== '000') { // '', null, false, '0000-00-00', ...
+				if ($value && !str_starts_with((string) $value, '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::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");
@@ -513,7 +514,6 @@ class Result implements IDataSource
 				} else {
 					$row[$key] = json_decode($value, $format === 'array');
 				}
-
 			} else {
 				throw new \RuntimeException('Unexpected type ' . $type);
 			}
@@ -525,7 +525,7 @@ class Result implements IDataSource
 	 * Define column type.
 	 * @param  string|null  $type  use constant Type::*
 	 */
-	final public function setType(string $column, ?string $type): self
+	final public function setType(string $column, ?string $type): static
 	{
 		$this->types[$column] = $type;
 		return $this;
@@ -553,7 +553,7 @@ class Result implements IDataSource
 	/**
 	 * Sets type format.
 	 */
-	final public function setFormat(string $type, ?string $format): self
+	final public function setFormat(string $type, ?string $format): static
 	{
 		$this->formats[$type] = $format;
 		return $this;
@@ -563,7 +563,7 @@ class Result implements IDataSource
 	/**
 	 * Sets type formats.
 	 */
-	final public function setFormats(array $formats): self
+	final public function setFormats(array $formats): static
 	{
 		$this->formats = $formats;
 		return $this;
@@ -587,9 +587,10 @@ class Result implements IDataSource
 	 */
 	public function getInfo(): Reflection\Result
 	{
-		if ($this->meta === null) {
+		if (!isset($this->meta)) {
 			$this->meta = new Reflection\Result($this->getResultDriver());
 		}
+
 		return $this->meta;
 	}
 

src/Dibi/ResultIterator.php

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

src/Dibi/Row.php

@@ -13,6 +13,7 @@ namespace Dibi;
 /**
  * Result set single row.
  */
+#[\AllowDynamicProperties]
 class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 {
 	public function __construct(array $arr)
@@ -31,17 +32,18 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 
 	/**
 	 * Converts value to DateTime object.
-	 * @return DateTime|string|null
 	 */
-	public function asDateTime(string $key, string $format = null)
+	public function asDateTime(string $key, ?string $format = null): DateTime|string|null
 	{
 		$time = $this[$key];
 		if (!$time instanceof DateTime) {
-			if (!$time || substr((string) $time, 0, 3) === '000') { // '', null, false, '0000-00-00', ...
+			if (!$time || str_starts_with((string) $time, '0000-00')) { // '', null, false, '0000-00-00', ...
 				return null;
 			}
+
 			$time = new DateTime($time);
 		}
+
 		return $format === null ? $time : $time->format($format);
 	}
 
@@ -62,37 +64,37 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 	/********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
 
 
-	final public function count()
+	final public function count(): int
 	{
 		return count((array) $this);
 	}
 
 
-	final public function getIterator()
+	final public function getIterator(): \ArrayIterator
 	{
 		return new \ArrayIterator($this);
 	}
 
 
-	final public function offsetSet($nm, $val)
+	final public function offsetSet($nm, $val): void
 	{
 		$this->$nm = $val;
 	}
 
 
-	final public function offsetGet($nm)
+	final public function offsetGet($nm): mixed
 	{
 		return $this->$nm;
 	}
 
 
-	final public function offsetExists($nm)
+	final public function offsetExists($nm): bool
 	{
 		return isset($this->$nm);
 	}
 
 
-	final public function offsetUnset($nm)
+	final public function offsetUnset($nm): void
 	{
 		unset($this->$nm);
 	}

src/Dibi/Strict.php

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

src/Dibi/Translator.php

@@ -17,38 +17,28 @@ final class Translator
 {
 	use Strict;
 
-	/** @var Connection */
-	private $connection;
+	private Connection $connection;
 
-	/** @var Driver */
-	private $driver;
+	private Driver $driver;
 
-	/** @var int */
-	private $cursor = 0;
+	private int $cursor = 0;
 
-	/** @var array */
-	private $args;
+	private array $args;
 
 	/** @var string[] */
-	private $errors;
+	private array $errors;
 
-	/** @var bool */
-	private $comment = false;
+	private bool $comment = false;
 
-	/** @var int */
-	private $ifLevel = 0;
+	private int $ifLevel = 0;
 
-	/** @var int */
-	private $ifLevelStart = 0;
+	private int $ifLevelStart = 0;
 
-	/** @var int|null */
-	private $limit;
+	private ?int $limit = null;
 
-	/** @var int|null */
-	private $offset;
+	private ?int $offset = null;
 
-	/** @var HashMap */
-	private $identifiers;
+	private HashMap $identifiers;
 
 
 	public function __construct(Connection $connection)
@@ -69,6 +59,7 @@ final class Translator
 		while (count($args) === 1 && is_array($args[0])) { // implicit array expansion
 			$args = array_values($args[0]);
 		}
+
 		$this->args = $args;
 		$this->errors = [];
 
@@ -95,27 +86,27 @@ 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
-,
+								/
+								(?=[`['":%?])                       ## 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)
+							substr($arg, $toSkip),
 						);
 					if (preg_last_error()) {
 						throw new PcreException;
 					}
 				}
+
 				continue;
 			}
 
@@ -138,8 +129,10 @@ XX
 					if ($lastArr === $cursor - 1) {
 						$sql[] = ',';
 					}
+
 					$sql[] = $this->formatValue($arg, $commandIns ? 'l' : 'a');
 				}
+
 				$lastArr = $cursor;
 				continue;
 			}
@@ -148,7 +141,6 @@ XX
 			$sql[] = $this->formatValue($arg, null);
 		} // while
 
-
 		if ($comment) {
 			$sql[] = '*/';
 		}
@@ -170,9 +162,8 @@ XX
 
 	/**
 	 * Apply modifier to single value.
-	 * @param  mixed  $value
 	 */
-	public function formatValue($value, ?string $modifier): string
+	public function formatValue(mixed $value, ?string $modifier): string
 	{
 		if ($this->comment) {
 			return '...';
@@ -207,20 +198,21 @@ XX
 								$v = $this->formatValue($v, $pair[1]);
 								if ($pair[1] === 'l' || $pair[1] === 'in') {
 									$op = 'IN ';
-								} elseif (strpos($pair[1], 'like') !== false) {
+								} elseif (str_contains($pair[1], 'like')) {
 									$op = 'LIKE ';
 								} elseif ($v === 'NULL') {
 									$op = 'IS ';
 								} else {
 									$op = '= ';
 								}
+
 								$vx[] = $k . $op . $v;
 							}
-
 						} else {
 							$vx[] = $this->formatValue($v, 'ex');
 						}
 					}
+
 					return '(' . implode(') ' . strtoupper($modifier) . ' (', $vx) . ')';
 
 				case 'n':  // key, key, ... identifier names
@@ -232,6 +224,7 @@ XX
 							$vx[] = $this->identifiers->{$pair[0]};
 						}
 					}
+
 					return implode(', ', $vx);
 
 
@@ -241,6 +234,7 @@ XX
 						$vx[] = $this->identifiers->{$pair[0]} . '='
 							. $this->formatValue($v, $pair[1] ?? (is_array($v) ? 'ex!' : null));
 					}
+
 					return implode(', ', $vx);
 
 
@@ -250,6 +244,7 @@ XX
 						$pair = explode('%', (string) $k, 2); // split into identifier & modifier
 						$vx[] = $this->formatValue($v, $pair[1] ?? (is_array($v) ? 'ex!' : null));
 					}
+
 					return '(' . (($vx || $modifier === 'l') ? implode(', ', $vx) : 'NULL') . ')';
 
 
@@ -259,6 +254,7 @@ XX
 						$kx[] = $this->identifiers->{$pair[0]};
 						$vx[] = $this->formatValue($v, $pair[1] ?? (is_array($v) ? 'ex!' : null));
 					}
+
 					return '(' . implode(', ', $kx) . ') VALUES (' . implode(', ', $vx) . ')';
 
 				case 'm': // (key, key, ...) VALUES (val, val, ...), (val, val, ...), ...
@@ -272,7 +268,7 @@ XX
 								$proto = array_keys($v);
 							}
 						} else {
-							return $this->errors[] = '**Unexpected type ' . (is_object($v) ? get_class($v) : gettype($v)) . '**';
+							return $this->errors[] = '**Unexpected type ' . (is_object($v) ? $v::class : gettype($v)) . '**';
 						}
 
 						$pair = explode('%', $k, 2); // split into identifier & modifier
@@ -281,9 +277,11 @@ XX
 							$vx[$k2][] = $this->formatValue($v2, $pair[1] ?? (is_array($v2) ? 'ex!' : null));
 						}
 					}
+
 					foreach ($vx as $k => $v) {
 						$vx[$k] = '(' . implode(', ', $v) . ')';
 					}
+
 					return '(' . implode(', ', $kx) . ') VALUES ' . implode(', ', $vx);
 
 				case 'by': // key ASC, key DESC
@@ -297,6 +295,7 @@ XX
 							$vx[] = $this->identifiers->$v;
 						}
 					}
+
 					return implode(', ', $vx);
 
 				case 'ex!':
@@ -310,10 +309,28 @@ XX
 					foreach ($value as $v) {
 						$vx[] = $this->formatValue($v, $modifier);
 					}
+
 					return implode(', ', $vx);
 			}
 		}
 
+		if (is_object($value)
+			&& $modifier === null
+			&& !$value instanceof Literal
+			&& !$value instanceof Expression
+		) {
+			foreach ($this->connection->getObjectTranslators() as $class => $translator) {
+				if ($value instanceof $class) {
+					$value = $translator($value);
+					return $this->connection->translate(...$value->getValues());
+				}
+			}
+		}
+
+		// object-to-scalar procession
+		if ($value instanceof \BackedEnum && is_scalar($value->value)) {
+			$value = $value->value;
+		}
 
 		// with modifier procession
 		if ($modifier) {
@@ -333,7 +350,7 @@ XX
 				) {
 					// continue
 				} else {
-					$type = is_object($value) ? get_class($value) : gettype($value);
+					$type = is_object($value) ? $value::class : gettype($value);
 					return $this->errors[] = "**Invalid combination of type $type and modifier %$modifier**";
 				}
 			}
@@ -400,6 +417,7 @@ XX
 					} elseif (!$value instanceof \DateTimeInterface) {
 						$value = new DateTime($value);
 					}
+
 					return $modifier === 'd'
 						? $this->driver->escapeDate($value)
 						: $this->driver->escapeDateTime($value);
@@ -420,25 +438,26 @@ XX
 						$value = substr($value, 0, $toSkip)
 							. preg_replace_callback(
 								<<<'XX'
-								/
-								(?=[`['":])
-								(?:
-									`(.+?)`|
-									\[(.+?)\]|
-									(')((?:''|[^'])*)'|
-									(")((?:""|[^"])*)"|
-									('|")|
-									:(\S*?:)([a-zA-Z0-9._]?)
-								)/sx
-XX
-,
+																	/
+																	(?=[`['":])
+																	(?:
+																		`(.+?)`|
+																		\[(.+?)\]|
+																		(')((?:''|[^'])*)'|
+																		(")((?:""|[^"])*)"|
+																		('|")|
+																		:(\S*?:)([a-zA-Z0-9._]?)
+																	)/sx
+									XX
+								,
 								[$this, 'cb'],
-								substr($value, $toSkip)
+								substr($value, $toSkip),
 							);
 						if (preg_last_error()) {
 							throw new PcreException;
 						}
 					}
+
 					return $value;
 
 				case 'SQL': // preserve as real SQL (TODO: rename to %sql)
@@ -469,7 +488,6 @@ XX
 			}
 		}
 
-
 		// without modifier procession
 		if (is_string($value)) {
 			return $this->driver->escapeText($value);
@@ -499,7 +517,7 @@ XX
 			return $this->connection->translate(...$value->getValues());
 
 		} else {
-			$type = is_object($value) ? get_class($value) : gettype($value);
+			$type = is_object($value) ? $value::class : gettype($value);
 			return $this->errors[] = "**Unexpected $type**";
 		}
 	}
@@ -551,6 +569,7 @@ XX
 					$this->comment = true;
 					return '/*';
 				}
+
 				return '';
 
 			} elseif ($mod === 'else') {
@@ -563,7 +582,6 @@ XX
 					$this->comment = true;
 					return '/*';
 				}
-
 			} elseif ($mod === 'end') {
 				$this->ifLevel--;
 				if ($this->ifLevelStart === $this->ifLevel + 1) {
@@ -572,6 +590,7 @@ XX
 					$this->comment = false;
 					return '*/';
 				}
+
 				return '';
 
 			} elseif ($mod === 'ex') { // array expansion
@@ -586,6 +605,7 @@ XX
 				} else {
 					$this->limit = Helpers::intVal($arg);
 				}
+
 				return '';
 
 			} elseif ($mod === 'ofs') { // apply offset
@@ -596,6 +616,7 @@ XX
 				} else {
 					$this->offset = Helpers::intVal($arg);
 				}
+
 				return '';
 
 			} else { // default processing
@@ -649,6 +670,7 @@ XX
 				$v = $this->driver->escapeIdentifier($v);
 			}
 		}
+
 		return implode('.', $parts);
 	}
 }

src/Dibi/dibi.php

@@ -44,31 +44,30 @@ class dibi
 		IDENTIFIER = 'n';
 
 	/** version */
-	public const
-		VERSION = '4.2.2';
+	public const VERSION = '5.0-dev';
 
 	/** sorting order */
 	public const
 		ASC = 'ASC',
 		DESC = 'DESC';
 
-	/** @var string|null  Last SQL command @see dibi::query() */
-	public static $sql;
+	/** Last SQL command @see dibi::query() */
+	public static ?string $sql = null;
 
-	/** @var float|null  Elapsed time for last query */
-	public static $elapsedTime;
+	/** Elapsed time for last query */
+	public static ?float $elapsedTime = null;
 
-	/** @var float  Elapsed time for all queries */
-	public static $totalTime;
+	/** Elapsed time for all queries */
+	public static float $totalTime = 0;
 
-	/** @var int  Number or queries */
-	public static $numOfQueries = 0;
+	/** Number or queries */
+	public static int $numOfQueries = 0;
 
 	/** @var Dibi\Connection[]  Connection registry storage for Dibi\Connection objects */
-	private static $registry = [];
+	private static array $registry = [];
 
-	/** @var Dibi\Connection  Current connection */
-	private static $connection;
+	/** Current connection */
+	private static Dibi\Connection $connection;
 
 
 	/**
@@ -88,7 +87,7 @@ class dibi
 	 * @param  array   $config  connection parameters
 	 * @throws Dibi\Exception
 	 */
-	public static function connect($config = [], string $name = '0'): Dibi\Connection
+	public static function connect(array $config = [], string $name = '0'): Dibi\Connection
 	{
 		return self::$connection = self::$registry[$name] = new Dibi\Connection($config, $name);
 	}
@@ -107,7 +106,7 @@ class dibi
 	 * Retrieve active connection.
 	 * @throws Dibi\Exception
 	 */
-	public static function getConnection(string $name = null): Dibi\Connection
+	public static function getConnection(?string $name = null): Dibi\Connection
 	{
 		if ($name === null) {
 			if (self::$connection === null) {
@@ -151,10 +150,9 @@ 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($sql = null, bool $return = false): ?string
+	public static function dump(string|Dibi\Result|null $sql = null, bool $return = false): ?string
 	{
 		return Dibi\Helpers::dump($sql, $return);
 	}
@@ -163,9 +161,9 @@ class dibi
 	/**
 	 * Strips microseconds part.
 	 */
-	public static function stripMicroseconds(\DateTimeInterface $dt): \DateTimeInterface
+	public static function stripMicroseconds(DateTimeInterface $dt): DateTimeInterface
 	{
-		$class = get_class($dt);
+		$class = $dt::class;
 		return new $class($dt->format('Y-m-d H:i:s'), $dt->getTimezone());
 	}
 }

src/Dibi/exceptions.php

@@ -15,15 +15,15 @@ namespace Dibi;
  */
 class Exception extends \Exception
 {
-	/** @var string|null */
-	private $sql;
+	private ?string $sql;
 
 
-	/**
-	 * @param  int|string  $code
-	 */
-	public function __construct(string $message = '', $code = 0, string $sql = null, \Throwable $previous = null)
-	{
+	public function __construct(
+		string $message = '',
+		int|string $code = 0,
+		?string $sql = null,
+		?\Throwable $previous = null,
+	) {
 		parent::__construct($message, 0, $previous);
 		$this->code = $code;
 		$this->sql = $sql;
@@ -56,17 +56,9 @@ class DriverException extends Exception
  */
 class PcreException extends Exception
 {
-	public function __construct(string $message = '%msg.')
+	public function __construct()
 	{
-		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);
+		parent::__construct(preg_last_error_msg(), preg_last_error());
 	}
 }
 
@@ -86,14 +78,13 @@ class NotSupportedException extends Exception
  */
 class ProcedureException extends Exception
 {
-	/** @var string */
-	protected $severity;
+	protected string $severity;
 
 
 	/**
 	 * Construct the exception.
 	 */
-	public function __construct(string $message = '', int $code = 0, string $severity = '', string $sql = null)
+	public function __construct(string $message = '', int $code = 0, string $severity = '', ?string $sql = null)
 	{
 		parent::__construct($message, $code, $sql);
 		$this->severity = $severity;

src/Dibi/interfaces.php

@@ -51,25 +51,24 @@ interface Driver
 	 * Begins a transaction (if supported).
 	 * @throws DriverException
 	 */
-	function begin(string $savepoint = null): void;
+	function begin(?string $savepoint = null): void;
 
 	/**
 	 * Commits statements in a transaction.
 	 * @throws DriverException
 	 */
-	function commit(string $savepoint = null): void;
+	function commit(?string $savepoint = null): void;
 
 	/**
 	 * Rollback changes in a transaction.
 	 * @throws DriverException
 	 */
-	function rollback(string $savepoint = null): void;
+	function rollback(?string $savepoint = null): void;
 
 	/**
 	 * Returns the connection resource.
-	 * @return mixed
 	 */
-	function getResource();
+	function getResource(): mixed;
 
 	/**
 	 * Returns the connection reflector.
@@ -117,7 +116,6 @@ interface ResultDriver
 
 	/**
 	 * Moves cursor position without fetching row.
-	 * @return bool  true on success, false if unable to seek to specified record
 	 * @throws Exception
 	 */
 	function seek(int $row): bool;
@@ -142,9 +140,8 @@ interface ResultDriver
 
 	/**
 	 * Returns the result set resource.
-	 * @return mixed
 	 */
-	function getResultResource();
+	function getResultResource(): mixed;
 
 	/**
 	 * Decodes data from result set.
@@ -224,20 +221,20 @@ interface IConnection
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @throws Exception
 	 */
-	function getInsertId(string $sequence = null): int;
+	function getInsertId(?string $sequence = null): int;
 
 	/**
 	 * Begins a transaction (if supported).
 	 */
-	function begin(string $savepoint = null): void;
+	function begin(?string $savepoint = null): void;
 
 	/**
 	 * Commits statements in a transaction.
 	 */
-	function commit(string $savepoint = null): void;
+	function commit(?string $savepoint = null): void;
 
 	/**
 	 * Rollback changes in a transaction.
 	 */
-	function rollback(string $savepoint = null): void;
+	function rollback(?string $savepoint = null): void;
 }

tests/.coveralls.yml

@@ -1,4 +1,4 @@
 # for php-coveralls
-service_name: travis-ci
+service_name: github-actions
 coverage_clover: coverage.xml
 json_path: coverage.json

tests/databases.appveyor.ini

@@ -13,12 +13,13 @@ 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"
+dsn = "mysql:host=127.0.0.1;dbname=dibi_test"
 username = root
 password = "Password12!"
 system = mysql

tests/databases.github.ini

@@ -0,0 +1,89 @@
+[sqlite] ; default
+driver = sqlite
+database = :memory:
+system = sqlite
+
+[sqlite pdo]
+driver = pdo
+dsn = "sqlite::memory:"
+system = sqlite
+
+[mysql 5.7]
+driver = mysqli
+host = "127.0.0.1"
+database = dibi_test
+username = root
+password = root
+port = 3306
+system = mysql
+
+[mysql 5.7pdo]
+driver = pdo
+dsn = "mysql:host=127.0.0.1;port=3306;dbname=dibi_test"
+user = root
+password = root
+system = mysql
+
+[mysql 8.0]
+driver = mysqli
+host = "127.0.0.1"
+database = dibi_test
+username = root
+password = root
+port = 3307
+system = mysql
+
+[mysql 8.0pdo]
+driver = pdo
+dsn = "mysql:host=127.0.0.1;port=3307;dbname=dibi_test"
+user = root
+password = root
+system = mysql
+
+[postgre 9.6]
+driver = postgre
+host = "127.0.0.1"
+database = dibi_test
+username = postgres
+password = postgres
+port = 5432
+system = postgre
+
+[postgre 9.6pdo]
+driver = pdo
+dsn = "pgsql:host=127.0.0.1;port=5432;dbname=dibi_test"
+user = postgres
+password = postgres
+system = postgre
+
+[postgre 13]
+driver = postgre
+host = "127.0.0.1"
+database = dibi_test
+username = postgres
+password = postgres
+port = 5433
+system = postgre
+
+[postgre 13pdo]
+driver = pdo
+dsn = "pgsql:host=127.0.0.1;port=5433;dbname=dibi_test"
+user = postgres
+password = postgres
+system = postgre
+
+[sqlsrv]
+driver = sqlsrv
+host = "localhost"
+username = SA
+password = "YourStrong!Passw0rd"
+database = dibi_test
+port = 1433
+system = sqlsrv
+
+;[sqlsrv pdo]
+;driver = pdo
+;dsn = "sqlsrv:Server=localhost,1433;Database=dibi_test"
+;user = SA
+;password = "YourStrong!Passw0rd"
+;system = sqlsrv

tests/databases.sample.ini

@@ -13,12 +13,13 @@ 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"
+dsn = "mysql:host=127.0.0.1;dbname=dibi_test"
 username = root
 password =
 system = mysql

tests/databases.travis.ini

@@ -1,38 +0,0 @@
-[sqlite] ; default
-driver = sqlite
-database = :memory:
-system = sqlite
-
-[sqlite pdo]
-driver = pdo
-dsn = "sqlite::memory:"
-system = sqlite
-
-[mysql improved]
-driver = mysqli
-host = 127.0.0.1
-username = root
-password =
-charset = utf8
-system = mysql
-
-[mysql pdo]
-driver = pdo
-dsn = "mysql:host=127.0.0.1"
-username = root
-password =
-system = mysql
-
-[postgre]
-driver = postgre
-host = 127.0.0.1
-username = postgres
-password =
-system = postgre
-
-[postgre pdo]
-driver = pdo
-dsn = "pgsql:host=127.0.0.1;dbname=dibi_test"
-username = postgres
-password =
-system = postgre

tests/dibi/Connection.connect.phpt

@@ -63,6 +63,15 @@ test('', function () use ($config) {
 });
 
 
+test('', function () use ($config) {
+	$conn = new Connection($config);
+	Assert::true($conn->isConnected());
+
+	$conn->__destruct();
+	Assert::false($conn->isConnected());
+});
+
+
 test('', function () use ($config) {
 	Assert::exception(function () use ($config) {
 		new Connection($config + ['onConnect' => '']);

tests/dibi/Connection.fetch.phpt

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

tests/dibi/Connection.objectTranslator.phpt

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

tests/dibi/Connection.substitutions.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Tester\Assert;
@@ -13,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'"),
 );
 
 
@@ -42,16 +43,14 @@ $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(function ($expr) {
-	return '_' . $expr . '_';
-});
+$conn->getSubstitutes()->setCallback(fn($expr) => '_' . $expr . '_');
 
 Assert::same(
 	reformat('UPDATE _account_user SET [val]=1'),
-	$conn->translate('UPDATE :account:user SET [val]=1')
+	$conn->translate('UPDATE :account:user SET [val]=1'),
 );

tests/dibi/Connection.transactions.phpt

@@ -60,7 +60,7 @@ test('transaction() fail', function () use ($conn) {
 			]);
 			throw new Exception('my exception');
 		});
-	}, \Throwable::class, 'my exception');
+	}, Throwable::class, 'my exception');
 	Assert::same(4, (int) $conn->query('SELECT COUNT(*) FROM [products]')->fetchSingle());
 });
 
@@ -89,7 +89,7 @@ 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());
 });
 
@@ -115,17 +115,17 @@ test('begin(), commit() & rollback() calls are forbidden in transaction()', func
 		$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(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(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');
 });

tests/dibi/DataSource.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Dibi\Row;
@@ -16,7 +17,7 @@ Assert::match(
 	reformat('
 SELECT *
 FROM (SELECT * FROM products) t'),
-	(string) $ds
+	(string) $ds,
 );
 
 
@@ -24,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,
 );
 
 
@@ -38,7 +39,7 @@ FROM (SELECT * FROM products) t
  WHERE (title like '%a%')
  ORDER BY [title] DESC
  "),
-	(string) $ds
+	(string) $ds,
 );
 
 
@@ -52,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,
 );
 
 
@@ -66,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,
 );
 
 
@@ -94,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,
 );
 
 
@@ -107,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,
 );
 
 
@@ -116,7 +117,7 @@ Assert::match(
 	reformat('
 SELECT *
 FROM (SELECT [title] FROM [products]) t'),
-	(string) $ds
+	(string) $ds,
 );
 
 Assert::equal(new Row([
@@ -128,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([
@@ -153,7 +154,7 @@ Assert::match(
 	reformat('
 SELECT *
 FROM [products]'),
-	(string) $ds
+	(string) $ds,
 );
 
 Assert::same(3, $ds->count());

tests/dibi/DateTime.phpt

@@ -10,12 +10,10 @@ require __DIR__ . '/bootstrap.php';
 
 date_default_timezone_set('Europe/Prague');
 
-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('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('2050-08-13 11:40:00.000000', (string) new DateTime(2544000000));
-Assert::same('2050-08-13 11:40:00.000000', (string) (new DateTime)->setTimestamp(2544000000));
-Assert::same(is_int(2544000000) ? 2544000000 : '2544000000', (new DateTime(2544000000))->getTimestamp()); // 64 bit
+Assert::same(is_int(2_544_000_000) ? 2_544_000_000 : '2544000000', (new DateTime(2_544_000_000))->getTimestamp()); // 64 bit
 
 Assert::same('1978-05-05 00:00:00.000000', (string) new DateTime('1978-05-05'));

tests/dibi/Event.source.phpt

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$conn = new Dibi\Connection($config);
+
+$event = new Dibi\Event($conn, Dibi\Event::CONNECT);
+Assert::same([__FILE__, __LINE__ - 1], $event->source);
+
+eval('$event = new Dibi\Event($conn, Dibi\Event::CONNECT);');
+Assert::same([__FILE__, __LINE__ - 1], $event->source);
+
+array_map(function () use ($conn) {
+	$event = new Dibi\Event($conn, Dibi\Event::CONNECT);
+	Assert::same([__FILE__, __LINE__ - 1], $event->source);
+}, [null]);

tests/dibi/Fluent.cloning.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Dibi\Fluent;

tests/dibi/Fluent.delete.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Tester\Assert;
@@ -14,33 +15,33 @@ $fluent = $conn->delete('table')->as('bAlias')
 
 Assert::same(
 	reformat('DELETE IGNORE FROM [table] AS [bAlias]'),
-	(string) $fluent
+	(string) $fluent,
 );
 
 $fluent->removeClause('from')->from('anotherTable');
 
 Assert::same(
 	reformat('DELETE IGNORE FROM [anotherTable]'),
-	(string) $fluent
+	(string) $fluent,
 );
 
 $fluent->using('thirdTable');
 
 Assert::same(
 	reformat('DELETE IGNORE FROM [anotherTable] USING [thirdTable]'),
-	(string) $fluent
+	(string) $fluent,
 );
 
 $fluent->setFlag('IGNORE', false);
 
 Assert::same(
 	reformat('DELETE FROM [anotherTable] USING [thirdTable]'),
-	(string) $fluent
+	(string) $fluent,
 );
 
 $fluent->limit(10);
 
 Assert::same(
 	reformat('DELETE FROM [anotherTable] USING [thirdTable] LIMIT 10'),
-	(string) $fluent
+	(string) $fluent,
 );

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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Tester\Assert;
@@ -57,28 +58,28 @@ $fluent = $conn->select('*')
 
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	(string) $fluent
+	(string) $fluent,
 );
 
 
 $fluent->fetch();
 Assert::same(
 	'SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t',
-	dibi::$sql
+	dibi::$sql,
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql
+	dibi::$sql,
 );
 $fluent->fetchAll(0, 3);
 Assert::same(
 	reformat('SELECT TOP (3) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql
+	dibi::$sql,
 );
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	(string) $fluent
+	(string) $fluent,
 );
 
 
@@ -86,16 +87,16 @@ $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql
+	dibi::$sql,
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql
+	dibi::$sql,
 );
 Assert::same(
 	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	(string) $fluent
+	(string) $fluent,
 );
 
 
@@ -104,14 +105,14 @@ $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql
+	dibi::$sql,
 );
 $fluent->fetchSingle();
 Assert::same(
 	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
-	dibi::$sql
+	dibi::$sql,
 );
 Assert::same(
 	reformat('SELECT * FROM [customers] ORDER BY [customer_id]'),
-	(string) $fluent
+	(string) $fluent,
 );

tests/dibi/Fluent.fetch.limit.phpt

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

tests/dibi/Fluent.insert.phpt

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

tests/dibi/Fluent.select.phpt

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

tests/dibi/Fluent.update.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Tester\Assert;
@@ -20,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,
 );
 
 
@@ -39,5 +40,5 @@ $arr = [
 $fluent = $conn->update(['table1', 'table2'], $arr);
 Assert::same(
 	reformat('UPDATE [table1], [table2] SET [table1].[title]=\'Super Product\', [table2].[price]=12, [table2].[brand]=NULL'),
-	(string) $fluent
+	(string) $fluent,
 );

tests/dibi/HashMap.phpt

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

tests/dibi/Helpers.getSuggestion().phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Dibi\Helpers;

tests/dibi/Helpers.intVal().phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Dibi\Helpers;

tests/dibi/PdoDriver.providedConnection.phpt

@@ -13,6 +13,7 @@ function buildPdoDriver(?int $errorMode)
 	if ($errorMode !== null) {
 		$pdo->setAttribute(PDO::ATTR_ERRMODE, $errorMode);
 	}
+
 	new Dibi\Drivers\PdoDriver(['resource' => $pdo]);
 }
 

tests/dibi/Result.meta.phpt

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

tests/dibi/Result.normalize.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Dibi\Type;

tests/dibi/Result.types.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Tester\Assert;

tests/dibi/Sqlsrv.insert.phpt

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

tests/dibi/Sqlsrv.limits.phpt

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

tests/dibi/Strict.phpt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Tester\Assert;

tests/dibi/Translator.conditions.phpt

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

tests/dibi/Translator.enums.phpt

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @phpVersion 8.1
+ * @dataProvider ../databases.ini
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+$conn = new Dibi\Connection($config);
+$translator = new Dibi\Translator($conn);
+
+
+enum EnumInt: int
+{
+	case One = 1;
+}
+
+enum EnumString: string
+{
+	case One = 'one';
+}
+
+enum PureEnum
+{
+	case One;
+}
+
+
+Assert::equal('1', $translator->formatValue(EnumInt::One, null));
+
+Assert::equal(match ($config['driver']) {
+	'sqlsrv' => "N'one'",
+	default => "'one'",
+}, $translator->formatValue(EnumString::One, null));
+
+Assert::equal('**Unexpected PureEnum**', $translator->formatValue(PureEnum::One, null));

tests/dibi/Translator.identifiers.phpt

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

tests/dibi/Translator.like.phpt

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @dataProvider ../databases.ini
+ * @dataProvider ../databases.ini  !=sqlsrv
  */
 
 declare(strict_types=1);

tests/dibi/Translator.phpt

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

tests/dibi/bootstrap.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 // The Nette Tester command-line runner can be
@@ -18,11 +19,15 @@ date_default_timezone_set('Europe/Prague');
 // load connection
 try {
 	$config = Tester\Environment::loadData();
-} catch (Exception $e) {
+} catch (Throwable $e) {
 	$config = parse_ini_file(__DIR__ . '/../databases.ini', true);
 	$config = reset($config);
 }
 
+if (isset($config['port'])) {
+	$config['port'] = (int) $config['port'];
+}
+
 
 // lock
 define('TEMP_DIR', __DIR__ . '/../tmp');
@@ -46,7 +51,7 @@ function test(string $title, Closure $function): void
 /** Replaces [] with driver-specific quotes */
 function reformat($s)
 {
-	global $config;
+	$config = $GLOBALS['config'];
 	if (is_array($s)) {
 		if (isset($s[$config['system']])) {
 			return $s[$config['system']];
@@ -67,7 +72,7 @@ function reformat($s)
 
 function num($n)
 {
-	global $config;
+	$config = $GLOBALS['config'];
 	if (substr($config['dsn'] ?? '', 0, 5) === 'odbc:') {
 		$n = is_float($n) ? "$n.0" : (string) $n;
 	}

tests/dibi/data/mysql.sql

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