Released version 3.1.0

This reverts commit 53475ba05a.

.travis.yml

@@ -5,20 +5,11 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
 
-script:
+before_install:
-    - vendor/bin/tester tests -s -p php -c tests/php-unix.ini $COVERAGE
+    # turn off XDebug
-    - php temp/code-checker/src/code-checker.php --short-arrays
+    - phpenv config-rm xdebug.ini || return 0
-
-after_failure:
-    # Print *.actual content
-    - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
-
-before_script:
-    # Install Nette Tester & Code Checker
-    - travis_retry composer install --no-interaction
-    - travis_retry composer create-project nette/code-checker temp/code-checker ~2.5 --no-interaction
-    - if [ $TRAVIS_PHP_VERSION == "7.0" ]; then COVERAGE="-p phpdbg --coverage ./coverage.xml --coverage-src ./src"; fi
 
     # Create databases.ini
     - cp ./tests/databases.travis.ini ./tests/databases.ini
@@ -26,16 +17,49 @@ before_script:
     # Create Postgre database
     - psql -c 'CREATE DATABASE dibi_test' -U postgres
 
-after_script:
+install:
-    # Report Code Coverage
+    - travis_retry composer install --no-progress --prefer-dist
-    - >
+
-      if [ "$COVERAGE" != "" ]; then
+script:
-      wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
+    - vendor/bin/tester tests -s
-      && php coveralls.phar --verbose --config tests/.coveralls.yml
+
-      || true; fi
+after_failure:
+    # Print *.actual content
+    - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
+
+jobs:
+    include:
+        -   stage: Code Standard Checker
+            php: 7.1
+            install:
+                # Install Nette Code Checker
+                - travis_retry composer create-project nette/code-checker temp/code-checker ~2 --no-progress
+                # Install Nette Coding Standard
+                - travis_retry composer create-project nette/coding-standard temp/coding-standard --no-progress
+            script:
+                - php temp/code-checker/src/code-checker.php --short-arrays
+                - php temp/coding-standard/ecs check src tests examples --config temp/coding-standard/coding-standard-php56.neon
+
+
+        -   stage: Code Coverage
+            php: 7.1
+            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:
+        -   php: 7.2
+        -   stage: Code Coverage
+
 
 sudo: false
 
 cache:
     directories:
         - $HOME/.composer/cache
+
+notifications:
+    email: false

composer.json

@@ -26,7 +26,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.0-dev"
+			"dev-master": "3.1-dev"
 		}
 	}
 }

dibi/dibi.php

@@ -1,3 +0,0 @@
-<?php
-trigger_error('Dibi was moved to /src/loader.php', E_USER_WARNING);
-require __DIR__ . '/../src/loader.php';

examples/connecting-to-databases.php

@@ -74,7 +74,7 @@ try {
 		'driver' => 'odbc',
 		'username' => 'root',
 		'password' => '***',
-		'dsn' => 'Driver={Microsoft Access Driver (*.mdb)};Dbq='.__DIR__.'/data/sample.mdb',
+		'dsn' => 'Driver={Microsoft Access Driver (*.mdb)};Dbq=' . __DIR__ . '/data/sample.mdb',
 	]);
 	echo 'OK';
 } catch (Dibi\Exception $e) {
@@ -89,7 +89,7 @@ try {
 	dibi::connect([
 		'driver' => 'postgre',
 		'string' => 'host=localhost port=5432 dbname=mary',
-		'persistent' => TRUE,
+		'persistent' => true,
 	]);
 	echo 'OK';
 } catch (Dibi\Exception $e) {

examples/query-language-and-conditions.php

@@ -14,13 +14,13 @@ dibi::connect([
 
 
 // some variables
-$cond1 = TRUE;
+$cond1 = true;
-$cond2 = FALSE;
+$cond2 = false;
 $foo = -1;
 $bar = 2;
 
 // conditional variable
-$name = $cond1 ? 'K%' : NULL;
+$name = $cond1 ? 'K%' : null;
 
 // if & end
 dibi::test('

examples/query-language-basic-examples.php

@@ -33,7 +33,7 @@ dibi::test('
 	REPLACE INTO products', [
 		'title' => 'Super product',
 		'price' => 318,
-		'active' => TRUE,
+		'active' => true,
 ]);
 // -> REPLACE INTO products ([title], [price], [active]) VALUES ('Super product', 318, 1)
 
@@ -42,7 +42,7 @@ dibi::test('
 $array = [
 	'title' => 'Super Product',
 	'price' => 12,
-	'brand' => NULL,
+	'brand' => null,
 	'created' => new DateTime,
 ];
 dibi::test('INSERT INTO products', $array, $array, $array);

examples/tracy-and-exceptions.php

@@ -13,7 +13,7 @@ $connection = dibi::connect([
 	'driver' => 'sqlite3',
 	'database' => 'data/sample.s3db',
 	'profiler' => [
-		'run' => TRUE,
+		'run' => true,
 	],
 ]);
 

examples/tracy.php

@@ -13,7 +13,7 @@ $connection = dibi::connect([
 	'driver' => 'sqlite3',
 	'database' => 'data/sample.s3db',
 	'profiler' => [
-		'run' => TRUE,
+		'run' => true,
 	],
 ]);
 

examples/using-fluent-syntax.php

@@ -19,7 +19,7 @@ $id = 10;
 $record = [
 	'title' => 'Super product',
 	'price' => 318,
-	'active' => TRUE,
+	'active' => true,
 ];
 
 // SELECT ...

examples/using-logger.php

@@ -14,7 +14,7 @@ dibi::connect([
 	'database' => 'data/sample.s3db',
 	// enable query logging to this file
 	'profiler' => [
-		'run' => TRUE,
+		'run' => true,
 		'file' => 'data/log.sql',
 	],
 ]);

examples/using-profiler.php

@@ -13,7 +13,7 @@ dibi::connect([
 	'driver' => 'sqlite3',
 	'database' => 'data/sample.s3db',
 	'profiler' => [
-		'run' => TRUE,
+		'run' => true,
 	],
 ]);
 

examples/using-substitutions.php

@@ -38,6 +38,7 @@ function substFallBack($expr)
 	}
 }
 
+
 // define callback
 dibi::getSubstitutes()->setCallback('substFallBack');
 

readme.md

@@ -49,7 +49,7 @@ dibi::query('SELECT * FROM users WHERE id = ?', $id);
 
 $arr = [
     'name' => 'John',
-    'is_admin'  => TRUE,
+    'is_admin'  => true,
 ];
 dibi::query('INSERT INTO users', $arr);
 // INSERT INTO users (`name`, `is_admin`) VALUES ('John', 1)

src/Dibi/Bridges/Nette/DibiExtension21.php

@@ -1,52 +0,0 @@
-<?php
-
-/**
- * This file is part of the "dibi" - smart database abstraction layer.
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-namespace Dibi\Bridges\Nette;
-
-use Nette;
-
-
-/**
- * Dibi extension for Nette Framework 2.1. Creates 'connection' service.
- */
-class DibiExtension21 extends Nette\DI\CompilerExtension
-{
-
-	public function loadConfiguration()
-	{
-		$container = $this->getContainerBuilder();
-		$config = $this->getConfig();
-
-		$useProfiler = isset($config['profiler'])
-			? $config['profiler']
-			: $container->parameters['debugMode'];
-
-		unset($config['profiler']);
-
-		if (isset($config['flags'])) {
-			$flags = 0;
-			foreach ((array) $config['flags'] as $flag) {
-				$flags |= constant($flag);
-			}
-			$config['flags'] = $flags;
-		}
-
-		$connection = $container->addDefinition($this->prefix('connection'))
-			->setClass('Dibi\Connection', [$config])
-			->setAutowired(isset($config['autowired']) ? $config['autowired'] : TRUE);
-
-		if ($useProfiler) {
-			$panel = $container->addDefinition($this->prefix('panel'))
-				->setClass('Dibi\Bridges\Nette\Panel')
-				->addSetup('Nette\Diagnostics\Debugger::getBar()->addPanel(?)', ['@self'])
-				->addSetup('Nette\Diagnostics\Debugger::getBlueScreen()->addPanel(?)', ['Dibi\Bridges\Nette\Panel::renderException']);
-
-			$connection->addSetup('$service->onEvent[] = ?', [[$panel, 'logEvent']]);
-		}
-	}
-
-}

src/Dibi/Bridges/Nette/DibiExtension22.php

@@ -16,15 +16,28 @@ use Nette;
  */
 class DibiExtension22 extends Nette\DI\CompilerExtension
 {
+	/** @var bool */
+	private $debugMode;
+
+
+	public function __construct($debugMode = null)
+	{
+		$this->debugMode = $debugMode;
+	}
+
 
 	public function loadConfiguration()
 	{
 		$container = $this->getContainerBuilder();
 		$config = $this->getConfig();
 
+		if ($this->debugMode === null) {
+			$this->debugMode = $container->parameters['debugMode'];
+		}
+
 		$useProfiler = isset($config['profiler'])
 			? $config['profiler']
-			: class_exists('Tracy\Debugger') && $container->parameters['debugMode'];
+			: class_exists('Tracy\Debugger') && $this->debugMode;
 
 		unset($config['profiler']);
 
@@ -38,7 +51,7 @@ class DibiExtension22 extends Nette\DI\CompilerExtension
 
 		$connection = $container->addDefinition($this->prefix('connection'))
 			->setClass('Dibi\Connection', [$config])
-			->setAutowired(isset($config['autowired']) ? $config['autowired'] : TRUE);
+			->setAutowired(isset($config['autowired']) ? $config['autowired'] : true);
 
 		if (class_exists('Tracy\Debugger')) {
 			$connection->addSetup(
@@ -49,11 +62,10 @@ class DibiExtension22 extends Nette\DI\CompilerExtension
 		if ($useProfiler) {
 			$panel = $container->addDefinition($this->prefix('panel'))
 				->setClass('Dibi\Bridges\Tracy\Panel', [
-					isset($config['explain']) ? $config['explain'] : TRUE,
+					isset($config['explain']) ? $config['explain'] : true,
-					isset($config['filter']) && $config['filter'] === FALSE ? Dibi\Event::ALL : Dibi\Event::QUERY,
+					isset($config['filter']) && $config['filter'] === false ? Dibi\Event::ALL : Dibi\Event::QUERY,
 				]);
 			$connection->addSetup([$panel, 'register'], [$connection]);
 		}
 	}
-
 }

src/Dibi/Bridges/Nette/Panel.php

@@ -1,153 +0,0 @@
-<?php
-
-/**
- * This file is part of the "dibi" - smart database abstraction layer.
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-namespace Dibi\Bridges\Nette;
-
-use Dibi;
-use Dibi\Event;
-use Dibi\Helpers;
-use Nette;
-use Nette\Diagnostics\Debugger;
-
-
-/**
- * Dibi panel for Nette\Diagnostics.
- */
-class Panel implements Nette\Diagnostics\IBarPanel
-{
-	use Dibi\Strict;
-
-	/** @var int maximum SQL length */
-	public static $maxLength = 1000;
-
-	/** @var bool  explain queries? */
-	public $explain;
-
-	/** @var int */
-	public $filter;
-
-	/** @var array */
-	private $events = [];
-
-
-	public function __construct($explain = TRUE, $filter = NULL)
-	{
-		$this->filter = $filter ? (int) $filter : Event::QUERY;
-		$this->explain = $explain;
-	}
-
-
-	public function register(Dibi\Connection $connection)
-	{
-		Debugger::getBar()->addPanel($this);
-		Debugger::getBlueScreen()->addPanel([__CLASS__, 'renderException']);
-		$connection->onEvent[] = [$this, 'logEvent'];
-	}
-
-
-	/**
-	 * After event notification.
-	 * @return void
-	 */
-	public function logEvent(Event $event)
-	{
-		if (($event->type & $this->filter) === 0) {
-			return;
-		}
-		$this->events[] = $event;
-	}
-
-
-	/**
-	 * Returns blue-screen custom tab.
-	 * @return mixed
-	 */
-	public static function renderException($e)
-	{
-		if ($e instanceof Dibi\Exception && $e->getSql()) {
-			return [
-				'tab' => 'SQL',
-				'panel' => Helpers::dump($e->getSql(), TRUE),
-			];
-		}
-	}
-
-
-	/**
-	 * Returns HTML code for custom tab. (Nette\Diagnostics\IBarPanel)
-	 * @return mixed
-	 */
-	public function getTab()
-	{
-		$totalTime = 0;
-		foreach ($this->events as $event) {
-			$totalTime += $event->time;
-		}
-		return '<span title="dibi"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC" />'
-			. count($this->events) . ' queries'
-			. ($totalTime ? sprintf(' / %0.1f ms', $totalTime * 1000) : '')
-			. '</span>';
-	}
-
-
-	/**
-	 * Returns HTML code for custom panel. (Nette\Diagnostics\IBarPanel)
-	 * @return mixed
-	 */
-	public function getPanel()
-	{
-		$totalTime = $s = NULL;
-		$h = 'htmlSpecialChars';
-		foreach ($this->events as $event) {
-			$totalTime += $event->time;
-			$explain = NULL; // EXPLAIN is called here to work SELECT FOUND_ROWS()
-			if ($this->explain && $event->type === Event::SELECT) {
-				try {
-					$backup = [$event->connection->onEvent, \dibi::$numOfQueries, \dibi::$totalTime];
-					$event->connection->onEvent = NULL;
-					$cmd = is_string($this->explain) ? $this->explain : ($event->connection->getConfig('driver') === 'oracle' ? 'EXPLAIN PLAN FOR' : 'EXPLAIN');
-					$explain = Helpers::dump($event->connection->nativeQuery("$cmd $event->sql"), TRUE);
-				} catch (Dibi\Exception $e) {
-				}
-				list($event->connection->onEvent, \dibi::$numOfQueries, \dibi::$totalTime) = $backup;
-			}
-
-			$s .= '<tr><td>' . sprintf('%0.3f', $event->time * 1000);
-			if ($explain) {
-				static $counter;
-				$counter++;
-				$s .= "<br /><a href='#nette-debug-DibiProfiler-row-$counter' class='nette-toggler nette-toggle-collapsed' rel='#nette-debug-DibiProfiler-row-$counter'>explain</a>";
-			}
-
-			$s .= '</td><td class="nette-DibiProfiler-sql">' . Helpers::dump(strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql, TRUE);
-			if ($explain) {
-				$s .= "<div id='nette-debug-DibiProfiler-row-$counter' class='nette-collapsed'>{$explain}</div>";
-			}
-			if ($event->source) {
-				$helpers = 'Nette\Diagnostics\Helpers';
-				if (!class_exists($helpers)) {
-					$helpers = class_exists('NDebugHelpers') ? 'NDebugHelpers' : 'DebugHelpers';
-				}
-				$s .= call_user_func([$helpers, 'editorLink'], $event->source[0], $event->source[1])->class('nette-DibiProfiler-source');
-			}
-
-			$s .= "</td><td>{$event->count}</td><td>{$h($event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name'))}</td></tr>";
-		}
-
-		return empty($this->events) ? '' :
-			'<style> #nette-debug td.nette-DibiProfiler-sql { background: white !important }
-			#nette-debug .nette-DibiProfiler-source { color: #999 !important }
-			#nette-debug nette-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
-			<h1>Queries: ' . count($this->events) . ($totalTime === NULL ? '' : sprintf(', time: %0.3f ms', $totalTime * 1000)) . '</h1>
-			<div class="nette-inner nette-DibiProfiler">
-			<table>
-				<tr><th>Time&nbsp;ms</th><th>SQL Statement</th><th>Rows</th><th>Connection</th></tr>' . $s . '
-			</table>
-			</div>';
-	}
-
-}

src/Dibi/Bridges/Nette/config.sample.neon

@@ -1,5 +1,5 @@
 # This will create service named 'dibi.connection'.
-# Requires Nette Framework 2.2
+# Requires Nette Framework 2.2 or later
 
 extensions:
 	dibi: Dibi\Bridges\Nette\DibiExtension22
@@ -9,4 +9,4 @@ dibi:
 	username: root
 	password: ***
 	database: foo
-	lazy: TRUE
+	lazy: true

src/Dibi/Bridges/Tracy/Panel.php

@@ -33,7 +33,7 @@ class Panel implements Tracy\IBarPanel
 	private $events = [];
 
 
-	public function __construct($explain = TRUE, $filter = NULL)
+	public function __construct($explain = true, $filter = null)
 	{
 		$this->filter = $filter ? (int) $filter : Event::QUERY;
 		$this->explain = $explain;
@@ -63,14 +63,14 @@ class Panel implements Tracy\IBarPanel
 
 	/**
 	 * Returns blue-screen custom tab.
-	 * @return array|NULL
+	 * @return array|null
 	 */
 	public static function renderException($e)
 	{
 		if ($e instanceof Dibi\Exception && $e->getSql()) {
 			return [
 				'tab' => 'SQL',
-				'panel' => Helpers::dump($e->getSql(), TRUE),
+				'panel' => Helpers::dump($e->getSql(), true),
 			];
 		}
 	}
@@ -96,25 +96,25 @@ class Panel implements Tracy\IBarPanel
 
 	/**
 	 * Returns HTML code for custom panel. (Tracy\IBarPanel)
-	 * @return string|NULL
+	 * @return string|null
 	 */
 	public function getPanel()
 	{
 		if (!$this->events) {
-			return NULL;
+			return null;
 		}
 
-		$totalTime = $s = NULL;
+		$totalTime = $s = null;
 		foreach ($this->events as $event) {
 			$totalTime += $event->time;
 			$connection = $event->connection;
-			$explain = NULL; // EXPLAIN is called here to work SELECT FOUND_ROWS()
+			$explain = null; // EXPLAIN is called here to work SELECT FOUND_ROWS()
 			if ($this->explain && $event->type === Event::SELECT) {
 				try {
 					$backup = [$connection->onEvent, \dibi::$numOfQueries, \dibi::$totalTime];
-					$connection->onEvent = NULL;
+					$connection->onEvent = null;
 					$cmd = is_string($this->explain) ? $this->explain : ($connection->getConfig('driver') === 'oracle' ? 'EXPLAIN PLAN FOR' : 'EXPLAIN');
-					$explain = @Helpers::dump($connection->nativeQuery("$cmd $event->sql"), TRUE);
+					$explain = @Helpers::dump($connection->nativeQuery("$cmd $event->sql"), true);
 				} catch (Dibi\Exception $e) {
 				}
 				list($connection->onEvent, \dibi::$numOfQueries, \dibi::$totalTime) = $backup;
@@ -127,7 +127,7 @@ class Panel implements Tracy\IBarPanel
 				$s .= "<br /><a href='#tracy-debug-DibiProfiler-row-$counter' class='tracy-toggle tracy-collapsed' rel='#tracy-debug-DibiProfiler-row-$counter'>explain</a>";
 			}
 
-			$s .= '</td><td class="tracy-DibiProfiler-sql">' . Helpers::dump(strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql, TRUE);
+			$s .= '</td><td class="tracy-DibiProfiler-sql">' . Helpers::dump(strlen($event->sql) > self::$maxLength ? substr($event->sql, 0, self::$maxLength) . '...' : $event->sql, true);
 			if ($explain) {
 				$s .= "<div id='tracy-debug-DibiProfiler-row-$counter' class='tracy-collapsed'>{$explain}</div>";
 			}
@@ -142,8 +142,8 @@ class Panel implements Tracy\IBarPanel
 			#tracy-debug .tracy-DibiProfiler-source { color: #999 !important }
 			#tracy-debug tracy-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
 			<h1>Queries: ' . count($this->events)
-				. ($totalTime === NULL ? '' : ', time: ' . number_format($totalTime * 1000, 1, '.', ' ') . ' ms') . ', '
+				. ($totalTime === null ? '' : ', time: ' . number_format($totalTime * 1000, 1, '.', ' ') . ' ms') . ', '
-				. htmlSpecialChars($connection->getConfig('driver') . ($connection->getConfig('name') ? '/' . $connection->getConfig('name') : '')
+				. htmlspecialchars($connection->getConfig('driver') . ($connection->getConfig('name') ? '/' . $connection->getConfig('name') : '')
 				. ($connection->getConfig('host') ? ' @ ' . $connection->getConfig('host') : '')) . '</h1>
 			<div class="tracy-inner tracy-DibiProfiler">
 			<table>
@@ -151,5 +151,4 @@ class Panel implements Tracy\IBarPanel
 			</table>
 			</div>';
 	}
-
 }

src/Dibi/Connection.php

@@ -33,7 +33,7 @@ class Connection
 	private $translator;
 
 	/** @var bool  Is connected? */
-	private $connected = FALSE;
+	private $connected = false;
 
 	/** @var HashMap Substitutes for identifiers */
 	private $substitutes;
@@ -41,19 +41,18 @@ class Connection
 
 	/**
 	 * Connection options: (see driver-specific options too)
-	 *   - lazy (bool) => if TRUE, connection will be established only when required
+	 *   - lazy (bool) => if true, connection will be established only when required
 	 *   - result (array) => result set options
 	 *       - formatDateTime => date-time format (if empty, DateTime objects will be returned)
 	 *   - profiler (array or bool)
 	 *       - run (bool) => enable profiler?
 	 *       - file => file to log
 	 *   - substitutes (array) => map of driver specific substitutes (under development)
-
 	 * @param  mixed   connection parameters
 	 * @param  string  connection name
 	 * @throws Exception
 	 */
-	public function __construct($config, $name = NULL)
+	public function __construct($config, $name = null)
 	{
 		if (is_string($config)) {
 			parse_str($config, $config);
@@ -111,11 +110,6 @@ class Connection
 			if (Loggers\FirePhpLogger::isAvailable()) {
 				$this->onEvent[] = [new Loggers\FirePhpLogger($filter), 'logEvent'];
 			}
-
-			if (!interface_exists('Tracy\IBarPanel') && interface_exists('Nette\Diagnostics\IBarPanel') && class_exists('Dibi\Bridges\Nette\Panel')) {
-				$panel = new Bridges\Nette\Panel(isset($profilerCfg['explain']) ? $profilerCfg['explain'] : TRUE, $filter);
-				$panel->register($this);
-			}
 		}
 
 		$this->substitutes = new HashMap(function ($expr) { return ":$expr:"; });
@@ -148,10 +142,10 @@ class Connection
 	 */
 	final public function connect()
 	{
-		$event = $this->onEvent ? new Event($this, Event::CONNECT) : NULL;
+		$event = $this->onEvent ? new Event($this, Event::CONNECT) : null;
 		try {
 			$this->driver->connect($this->config);
-			$this->connected = TRUE;
+			$this->connected = true;
 			$event && $this->onEvent($event->done());
 
 		} catch (Exception $e) {
@@ -168,12 +162,12 @@ class Connection
 	final public function disconnect()
 	{
 		$this->driver->disconnect();
-		$this->connected = FALSE;
+		$this->connected = false;
 	}
 
 
 	/**
-	 * Returns TRUE when connection was established.
+	 * Returns true when connection was established.
 	 * @return bool
 	 */
 	final public function isConnected()
@@ -189,9 +183,9 @@ class Connection
 	 * @param  mixed  default value to use if key not found
 	 * @return mixed
 	 */
-	final public function getConfig($key = NULL, $default = NULL)
+	final public function getConfig($key = null, $default = null)
 	{
-		if ($key === NULL) {
+		if ($key === null) {
 			return $this->config;
 
 		} elseif (isset($this->config[$key])) {
@@ -258,7 +252,7 @@ class Connection
 		$args = func_get_args();
 		try {
 			Helpers::dump($this->translateArgs($args));
-			return TRUE;
+			return true;
 
 		} catch (Exception $e) {
 			if ($e->getSql()) {
@@ -266,7 +260,7 @@ class Connection
 			} else {
 				echo get_class($e) . ': ' . $e->getMessage() . (PHP_SAPI === 'cli' ? "\n" : '<br>');
 			}
-			return FALSE;
+			return false;
 		}
 	}
 
@@ -311,7 +305,7 @@ class Connection
 		$this->connected || $this->connect();
 
 		\dibi::$sql = $sql;
-		$event = $this->onEvent ? new Event($this, Event::QUERY, $sql) : NULL;
+		$event = $this->onEvent ? new Event($this, Event::QUERY, $sql) : null;
 		try {
 			$res = $this->driver->query($sql);
 
@@ -348,12 +342,11 @@ class Connection
 
 
 	/**
-	 * Gets the number of affected rows. Alias for getAffectedRows().
+	 * @deprecated
-	 * @return int  number of rows
-	 * @throws Exception
 	 */
 	public function affectedRows()
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use getAffectedRows()', E_USER_DEPRECATED);
 		return $this->getAffectedRows();
 	}
 
@@ -364,25 +357,23 @@ class Connection
 	 * @return int
 	 * @throws Exception
 	 */
-	public function getInsertId($sequence = NULL)
+	public function getInsertId($sequence = null)
 	{
 		$this->connected || $this->connect();
 		$id = $this->driver->getInsertId($sequence);
 		if ($id < 1) {
 			throw new Exception('Cannot retrieve last generated ID.');
 		}
-		return (int) $id;
+		return Helpers::intVal($id);
 	}
 
 
 	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
+	 * @deprecated
-	 * @param  string     optional sequence name
-	 * @return int
-	 * @throws Exception
 	 */
-	public function insertId($sequence = NULL)
+	public function insertId($sequence = null)
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use getInsertId()', E_USER_DEPRECATED);
 		return $this->getInsertId($sequence);
 	}
 
@@ -392,10 +383,10 @@ class Connection
 	 * @param  string  optional savepoint name
 	 * @return void
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		$this->connected || $this->connect();
-		$event = $this->onEvent ? new Event($this, Event::BEGIN, $savepoint) : NULL;
+		$event = $this->onEvent ? new Event($this, Event::BEGIN, $savepoint) : null;
 		try {
 			$this->driver->begin($savepoint);
 			$event && $this->onEvent($event->done());
@@ -412,10 +403,10 @@ class Connection
 	 * @param  string  optional savepoint name
 	 * @return void
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		$this->connected || $this->connect();
-		$event = $this->onEvent ? new Event($this, Event::COMMIT, $savepoint) : NULL;
+		$event = $this->onEvent ? new Event($this, Event::COMMIT, $savepoint) : null;
 		try {
 			$this->driver->commit($savepoint);
 			$event && $this->onEvent($event->done());
@@ -432,10 +423,10 @@ class Connection
 	 * @param  string  optional savepoint name
 	 * @return void
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		$this->connected || $this->connect();
-		$event = $this->onEvent ? new Event($this, Event::ROLLBACK, $savepoint) : NULL;
+		$event = $this->onEvent ? new Event($this, Event::ROLLBACK, $savepoint) : null;
 		try {
 			$this->driver->rollback($savepoint);
 			$event && $this->onEvent($event->done());
@@ -543,7 +534,7 @@ class Connection
 	 */
 	public function substitute($value)
 	{
-		return strpos($value, ':') === FALSE
+		return strpos($value, ':') === false
 			? $value
 			: preg_replace_callback('#:([^:\s]*):#', function ($m) { return $this->substitutes->{$m[1]}; }, $value);
 	}
@@ -555,7 +546,7 @@ class Connection
 	/**
 	 * Executes SQL query and fetch result - shortcut for query() & fetch().
 	 * @param  array|mixed    one or more arguments
-	 * @return Row|FALSE
+	 * @return Row|false
 	 * @throws Exception
 	 */
 	public function fetch($args)
@@ -619,11 +610,12 @@ class Connection
 	/**
 	 * Import SQL dump from file.
 	 * @param  string  filename
+	 * @param  callable  function (int $count, ?float $percent): void
 	 * @return int  count of sql commands
 	 */
-	public function loadFile($file)
+	public function loadFile($file, callable $onProgress = null)
 	{
-		return Helpers::loadFromFile($this, $file);
+		return Helpers::loadFromFile($this, $file, $onProgress);
 	}
 
 
@@ -634,7 +626,7 @@ class Connection
 	public function getDatabaseInfo()
 	{
 		$this->connected || $this->connect();
-		return new Reflection\Database($this->driver->getReflector(), isset($this->config['database']) ? $this->config['database'] : NULL);
+		return new Reflection\Database($this->driver->getReflector(), isset($this->config['database']) ? $this->config['database'] : null);
 	}
 
 
@@ -662,5 +654,4 @@ class Connection
 			call_user_func($handler, $arg);
 		}
 	}
-
 }

src/Dibi/DataSource.php

@@ -10,7 +10,6 @@ namespace Dibi;
 
 /**
  * Default implementation of IDataSource for dibi.
- *
  */
 class DataSource implements IDataSource
 {
@@ -40,10 +39,10 @@ class DataSource implements IDataSource
 	/** @var array */
 	private $conds = [];
 
-	/** @var int|NULL */
+	/** @var int|null */
 	private $offset;
 
-	/** @var int|NULL */
+	/** @var int|null */
 	private $limit;
 
 
@@ -53,7 +52,7 @@ class DataSource implements IDataSource
 	 */
 	public function __construct($sql, Connection $connection)
 	{
-		if (strpbrk($sql, " \t\r\n") === FALSE) {
+		if (strpbrk($sql, " \t\r\n") === false) {
 			$this->sql = $connection->getDriver()->escapeIdentifier($sql); // table name
 		} else {
 			$this->sql = '(' . $sql . ') t'; // SQL command
@@ -68,14 +67,14 @@ class DataSource implements IDataSource
 	 * @param  string        column alias
 	 * @return self
 	 */
-	public function select($col, $as = NULL)
+	public function select($col, $as = null)
 	{
 		if (is_array($col)) {
 			$this->cols = $col;
 		} else {
 			$this->cols[$col] = $as;
 		}
-		$this->result = NULL;
+		$this->result = null;
 		return $this;
 	}
 
@@ -93,7 +92,7 @@ class DataSource implements IDataSource
 		} else {
 			$this->conds[] = func_get_args();
 		}
-		$this->result = $this->count = NULL;
+		$this->result = $this->count = null;
 		return $this;
 	}
 
@@ -111,22 +110,22 @@ class DataSource implements IDataSource
 		} else {
 			$this->sorting[$row] = $sorting;
 		}
-		$this->result = NULL;
+		$this->result = null;
 		return $this;
 	}
 
 
 	/**
 	 * Limits number of rows.
-	 * @param  int|NULL limit
+	 * @param  int|null limit
 	 * @param  int offset
 	 * @return self
 	 */
-	public function applyLimit($limit, $offset = NULL)
+	public function applyLimit($limit, $offset = null)
 	{
 		$this->limit = $limit;
 		$this->offset = $offset;
-		$this->result = $this->count = NULL;
+		$this->result = $this->count = null;
 		return $this;
 	}
 
@@ -150,7 +149,7 @@ class DataSource implements IDataSource
 	 */
 	public function getResult()
 	{
-		if ($this->result === NULL) {
+		if ($this->result === null) {
 			$this->result = $this->connection->nativeQuery($this->__toString());
 		}
 		return $this->result;
@@ -168,7 +167,7 @@ class DataSource implements IDataSource
 
 	/**
 	 * Generates, executes SQL query and fetches the single row.
-	 * @return Row|FALSE
+	 * @return Row|false
 	 */
 	public function fetch()
 	{
@@ -178,7 +177,7 @@ class DataSource implements IDataSource
 
 	/**
 	 * Like fetch(), but returns only first field.
-	 * @return mixed  value on success, FALSE if no next record
+	 * @return mixed  value on success, false if no next record
 	 */
 	public function fetchSingle()
 	{
@@ -213,7 +212,7 @@ class DataSource implements IDataSource
 	 * @param  string  value
 	 * @return array
 	 */
-	public function fetchPairs($key = NULL, $value = NULL)
+	public function fetchPairs($key = null, $value = null)
 	{
 		return $this->getResult()->fetchPairs($key, $value);
 	}
@@ -225,7 +224,7 @@ class DataSource implements IDataSource
 	 */
 	public function release()
 	{
-		$this->result = $this->count = $this->totalCount = NULL;
+		$this->result = $this->count = $this->totalCount = null;
 	}
 
 
@@ -262,12 +261,13 @@ class DataSource implements IDataSource
 			return $this->connection->translate('
 SELECT %n', (empty($this->cols) ? '*' : $this->cols), '
 FROM %SQL', $this->sql, '
-%ex', $this->conds ? ['WHERE %and', $this->conds] : NULL, '
+%ex', $this->conds ? ['WHERE %and', $this->conds] : null, '
-%ex', $this->sorting ? ['ORDER BY %by', $this->sorting] : NULL, '
+%ex', $this->sorting ? ['ORDER BY %by', $this->sorting] : null, '
 %ofs %lmt', $this->offset, $this->limit
 			);
 		} catch (\Exception $e) {
 			trigger_error($e->getMessage(), E_USER_ERROR);
+			return '';
 		}
 	}
 
@@ -281,11 +281,11 @@ FROM %SQL', $this->sql, '
 	 */
 	public function count()
 	{
-		if ($this->count === NULL) {
+		if ($this->count === null) {
 			$this->count = $this->conds || $this->offset || $this->limit
-				? (int) $this->connection->nativeQuery(
+				? Helpers::intVal($this->connection->nativeQuery(
 					'SELECT COUNT(*) FROM (' . $this->__toString() . ') t'
-				)->fetchSingle()
+				)->fetchSingle())
 				: $this->getTotalCount();
 		}
 		return $this->count;
@@ -298,12 +298,11 @@ FROM %SQL', $this->sql, '
 	 */
 	public function getTotalCount()
 	{
-		if ($this->totalCount === NULL) {
+		if ($this->totalCount === null) {
-			$this->totalCount = (int) $this->connection->nativeQuery(
+			$this->totalCount = Helpers::intVal($this->connection->nativeQuery(
 				'SELECT COUNT(*) FROM ' . $this->sql
-			)->fetchSingle();
+			)->fetchSingle());
 		}
 		return $this->totalCount;
 	}
-
 }

src/Dibi/DateTime.php

@@ -18,12 +18,12 @@ class DateTime extends \DateTime
 	/**
 	 * @param  string|int
 	 */
-	public function __construct($time = 'now', \DateTimeZone $timezone = NULL)
+	public function __construct($time = 'now', \DateTimeZone $timezone = null)
 	{
 		if (is_numeric($time)) {
 			parent::__construct('@' . $time);
 			$this->setTimeZone($timezone ? $timezone : new \DateTimeZone(date_default_timezone_get()));
-		} elseif ($timezone === NULL) {
+		} elseif ($timezone === null) {
 			parent::__construct($time);
 		} else {
 			parent::__construct($time, $timezone);
@@ -33,7 +33,7 @@ class DateTime extends \DateTime
 
 	public function modifyClone($modify = '')
 	{
-		$dolly = clone($this);
+		$dolly = clone $this;
 		return $modify ? $dolly->modify($modify) : $dolly;
 	}
 
@@ -55,7 +55,7 @@ class DateTime extends \DateTime
 
 	public function __toString()
 	{
-		return $this->format('Y-m-d H:i:s');
+		return $this->format('Y-m-d H:i:s.u');
 	}
 
 
@@ -71,5 +71,4 @@ class DateTime extends \DateTime
 			parent::__wakeup();
 		}
 	}
-
 }

src/Dibi/Drivers/FirebirdDriver.php

@@ -28,20 +28,20 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	const ERROR_EXCEPTION_THROWN = -836;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $connection;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $transaction;
 
 	/** @var bool */
-	private $inTransaction = FALSE;
+	private $inTransaction = false;
 
 
 	/**
@@ -103,7 +103,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException|Dibi\Exception
 	 */
 	public function query($sql)
@@ -111,7 +111,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		$resource = $this->inTransaction ? $this->transaction : $this->connection;
 		$res = ibase_query($resource, $sql);
 
-		if ($res === FALSE) {
+		if ($res === false) {
 			if (ibase_errcode() == self::ERROR_EXCEPTION_THROWN) {
 				preg_match('/exception (\d+) (\w+) (.*)/i', ibase_errmsg(), $match);
 				throw new Dibi\ProcedureException($match[3], $match[1], $match[2], $sql);
@@ -123,13 +123,13 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		} elseif (is_resource($res)) {
 			return $this->createResultDriver($res);
 		}
-		return NULL;
+		return null;
 	}
 
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -140,7 +140,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @param  string     generator name
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -154,13 +154,13 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
-		if ($savepoint !== NULL) {
+		if ($savepoint !== null) {
 			throw new Dibi\NotSupportedException('Savepoints are not supported in Firebird/Interbase.');
 		}
 		$this->transaction = ibase_trans($this->getResource());
-		$this->inTransaction = TRUE;
+		$this->inTransaction = true;
 	}
 
 
@@ -170,9 +170,9 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
-		if ($savepoint !== NULL) {
+		if ($savepoint !== null) {
 			throw new Dibi\NotSupportedException('Savepoints are not supported in Firebird/Interbase.');
 		}
 
@@ -180,7 +180,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			throw new Dibi\DriverException('Unable to handle operation - failure when commiting transaction.');
 		}
 
-		$this->inTransaction = FALSE;
+		$this->inTransaction = false;
 	}
 
 
@@ -190,9 +190,9 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
-		if ($savepoint !== NULL) {
+		if ($savepoint !== null) {
 			throw new Dibi\NotSupportedException('Savepoints are not supported in Firebird/Interbase.');
 		}
 
@@ -200,7 +200,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			throw new Dibi\DriverException('Unable to handle operation - failure when rolbacking transaction.');
 		}
 
-		$this->inTransaction = FALSE;
+		$this->inTransaction = false;
 	}
 
 
@@ -216,11 +216,11 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : NULL;
+		return is_resource($this->connection) ? $this->connection : null;
 	}
 
 
@@ -277,7 +277,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 */
 	public function escapeIdentifier($value)
 	{
-		return '"' . str_replace('"', '""', $value). '"';
+		return '"' . str_replace('"', '""', $value) . '"';
 	}
 
 
@@ -313,7 +313,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("'Y-m-d H:i:s'");
+		return $value->format("'Y-m-d H:i:s.u'");
 	}
 
 
@@ -351,15 +351,17 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
 	{
 		if ($limit > 0 || $offset > 0) {
 			// http://www.firebirdsql.org/refdocs/langrefupd20-select.html
-			$sql = 'SELECT ' . ($limit > 0 ? 'FIRST ' . (int) $limit : '') . ($offset > 0 ? ' SKIP ' . (int) $offset : '') . ' * FROM (' . $sql . ')';
+			$sql = 'SELECT ' . ($limit > 0 ? 'FIRST ' . Dibi\Helpers::intVal($limit) : '')
+				. ($offset > 0 ? ' SKIP ' . Dibi\Helpers::intVal($offset) : '')
+				. ' * FROM (' . $sql . ')';
 		}
 	}
 
@@ -389,7 +391,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -413,7 +415,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 * @throws Dibi\Exception
 	 */
 	public function seek($row)
@@ -429,18 +431,18 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	public function free()
 	{
 		ibase_free_result($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 
 
@@ -481,7 +483,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			WHERE RDB\$SYSTEM_FLAG = 0;"
 		);
 		$tables = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$tables[] = [
 				'name' => $row[0],
 				'view' => $row[1] === 'TRUE',
@@ -530,7 +532,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 		);
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$key = $row['FIELD_NAME'];
 			$columns[$key] = [
 				'name' => $key,
@@ -539,7 +541,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 				'size' => $row['FIELD_LENGTH'],
 				'nullable' => $row['NULLABLE'] === 'TRUE',
 				'default' => $row['DEFAULT_VALUE'],
-				'autoincrement' => FALSE,
+				'autoincrement' => false,
 			];
 		}
 		return $columns;
@@ -568,7 +570,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			ORDER BY s.RDB\$FIELD_POSITION"
 		);
 		$indexes = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$key = $row['INDEX_NAME'];
 			$indexes[$key]['name'] = $key;
 			$indexes[$key]['unique'] = $row['UNIQUE_FLAG'] === 1;
@@ -598,7 +600,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			ORDER BY s.RDB\$FIELD_POSITION"
 		);
 		$keys = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$key = $row['INDEX_NAME'];
 			$keys[$key] = [
 				'name' => $key,
@@ -625,7 +627,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 				AND RDB\$FOREIGN_KEY IS NULL;"
 		);
 		$indices = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$indices[] = $row[0];
 		}
 		return $indices;
@@ -649,7 +651,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			);"
 		);
 		$constraints = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$constraints[] = $row[0];
 		}
 		return $constraints;
@@ -663,7 +665,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @param  string
 	 * @return array
 	 */
-	public function getTriggersMeta($table = NULL)
+	public function getTriggersMeta($table = null)
 	{
 		$res = $this->query("
 			SELECT TRIM(RDB\$TRIGGER_NAME) AS TRIGGER_NAME,
@@ -689,10 +691,10 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, 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)) {
+		while ($row = $res->fetch(true)) {
 			$triggers[$row['TRIGGER_NAME']] = [
 				'name' => $row['TRIGGER_NAME'],
 				'table' => $row['TABLE_NAME'],
@@ -711,16 +713,16 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @param  string
 	 * @return array
 	 */
-	public function getTriggers($table = NULL)
+	public function getTriggers($table = null)
 	{
-		$q = "SELECT TRIM(RDB\$TRIGGER_NAME)
+		$q = 'SELECT TRIM(RDB$TRIGGER_NAME)
-			FROM RDB\$TRIGGERS
+			FROM RDB$TRIGGERS
-			WHERE RDB\$SYSTEM_FLAG = 0";
+			WHERE RDB$SYSTEM_FLAG = 0';
-		$q .= $table === NULL ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table')";
+		$q .= $table === null ? ';' : " AND RDB\$RELATION_NAME = UPPER('$table')";
 
 		$res = $this->query($q);
 		$triggers = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$triggers[] = $row[0];
 		}
 		return $triggers;
@@ -767,7 +769,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			ORDER BY p.RDB\$PARAMETER_TYPE, p.RDB\$PARAMETER_NUMBER;"
 		);
 		$procedures = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$key = $row['PROCEDURE_NAME'];
 			$io = trim($row['PARAMETER_TYPE']);
 			$num = $row['PARAMETER_NUMBER'];
@@ -786,12 +788,12 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 */
 	public function getProcedures()
 	{
-		$res = $this->query("
+		$res = $this->query('
-			SELECT TRIM(RDB\$PROCEDURE_NAME)
+			SELECT TRIM(RDB$PROCEDURE_NAME)
-			FROM RDB\$PROCEDURES;"
+			FROM RDB$PROCEDURES;'
 		);
 		$procedures = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$procedures[] = $row[0];
 		}
 		return $procedures;
@@ -804,13 +806,13 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 */
 	public function getGenerators()
 	{
-		$res = $this->query("
+		$res = $this->query('
-			SELECT TRIM(RDB\$GENERATOR_NAME)
+			SELECT TRIM(RDB$GENERATOR_NAME)
-			FROM RDB\$GENERATORS
+			FROM RDB$GENERATORS
-			WHERE RDB\$SYSTEM_FLAG = 0;"
+			WHERE RDB$SYSTEM_FLAG = 0;'
 		);
 		$generators = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$generators[] = $row[0];
 		}
 		return $generators;
@@ -823,16 +825,15 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 */
 	public function getFunctions()
 	{
-		$res = $this->query("
+		$res = $this->query('
-			SELECT TRIM(RDB\$FUNCTION_NAME)
+			SELECT TRIM(RDB$FUNCTION_NAME)
-			FROM RDB\$FUNCTIONS
+			FROM RDB$FUNCTIONS
-			WHERE RDB\$SYSTEM_FLAG = 0;"
+			WHERE RDB$SYSTEM_FLAG = 0;'
 		);
 		$functions = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$functions[] = $row[0];
 		}
 		return $functions;
 	}
-
 }

src/Dibi/Drivers/MsSqlDriver.php

@@ -26,14 +26,14 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $connection;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
 
 	/**
@@ -57,7 +57,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
 		} elseif (empty($config['persistent'])) {
-			$this->connection = @mssql_connect($config['host'], $config['username'], $config['password'], TRUE); // intentionally @
+			$this->connection = @mssql_connect($config['host'], $config['username'], $config['password'], true); // intentionally @
 		} else {
 			$this->connection = @mssql_pconnect($config['host'], $config['username'], $config['password']); // intentionally @
 		}
@@ -85,26 +85,26 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
 	{
 		$res = @mssql_query($sql, $this->connection); // intentionally @
 
-		if ($res === FALSE) {
+		if ($res === false) {
 			throw new Dibi\DriverException(mssql_get_last_message(), 0, $sql);
 
 		} elseif (is_resource($res)) {
 			return $this->createResultDriver($res);
 		}
-		return NULL;
+		return null;
 	}
 
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -114,7 +114,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -123,7 +123,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 			$row = mssql_fetch_row($res);
 			return $row[0];
 		}
-		return FALSE;
+		return false;
 	}
 
 
@@ -133,7 +133,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		$this->query('BEGIN TRANSACTION');
 	}
@@ -145,7 +145,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		$this->query('COMMIT');
 	}
@@ -157,7 +157,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		$this->query('ROLLBACK');
 	}
@@ -165,11 +165,11 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : NULL;
+		return is_resource($this->connection) ? $this->connection : null;
 	}
 
 
@@ -263,7 +263,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("'Y-m-d H:i:s'");
+		return $value->format("'Y-m-d H:i:s.u'");
 	}
 
 
@@ -302,8 +302,8 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -314,8 +314,8 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 		} elseif ($limit < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 
-		} elseif ($limit !== NULL) {
+		} elseif ($limit !== null) {
-			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
+			$sql = 'SELECT TOP ' . Dibi\Helpers::intVal($limit) . ' * FROM (' . $sql . ') t';
 		}
 	}
 
@@ -345,7 +345,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -357,7 +357,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
-	 * @return boolean  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool     true on success, false if unable to seek to specified record
 	 */
 	public function seek($row)
 	{
@@ -372,7 +372,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	public function free()
 	{
 		mssql_free_result($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -399,12 +399,11 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
-
 }

src/Dibi/Drivers/MsSqlReflector.php

@@ -39,7 +39,7 @@ class MsSqlReflector implements Dibi\Reflector
 			FROM INFORMATION_SCHEMA.TABLES
 		');
 		$tables = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$tables[] = [
 				'name' => $row[0],
 				'view' => isset($row[1]) && $row[1] === 'VIEW',
@@ -54,27 +54,27 @@ class MsSqlReflector implements Dibi\Reflector
 	 * @param  string
 	 * @return int
 	 */
-	public function getTableCount($table, $fallback = TRUE)
+	public function getTableCount($table, $fallback = true)
 	{
 		if (empty($table)) {
-			return FALSE;
+			return false;
 		}
 		$result = $this->driver->query("
 			SELECT MAX(rowcnt)
 			FROM sys.sysindexes
 			WHERE id=OBJECT_ID({$this->driver->escapeIdentifier($table)})
 		");
-		$row = $result->fetch(FALSE);
+		$row = $result->fetch(false);
 
 		if (!is_array($row) || count($row) < 1) {
 			if ($fallback) {
-				$row = $this->driver->query("SELECT COUNT(*) FROM {$this->driver->escapeIdentifier($table)}")->fetch(FALSE);
+				$row = $this->driver->query("SELECT COUNT(*) FROM {$this->driver->escapeIdentifier($table)}")->fetch(false);
-				$count = intval($row[0]);
+				$count = Dibi\Helpers::intVal($row[0]);
 			} else {
-				$count = FALSE;
+				$count = false;
 			}
 		} else {
-			$count = intval($row[0]);
+			$count = Dibi\Helpers::intVal($row[0]);
 		}
 
 		return $count;
@@ -95,8 +95,8 @@ class MsSqlReflector implements Dibi\Reflector
 			ORDER BY TABLE_NAME, ORDINAL_POSITION
 		");
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
-			$size = FALSE;
+			$size = false;
 			$type = strtoupper($row['DATA_TYPE']);
 
 			$size_cols = [
@@ -119,10 +119,10 @@ class MsSqlReflector implements Dibi\Reflector
 				'table' => $table,
 				'nativetype' => $type,
 				'size' => $size,
-				'unsigned' => NULL,
+				'unsigned' => null,
 				'nullable' => $row['IS_NULLABLE'] === 'YES',
 				'default' => $row['COLUMN_DEFAULT'],
-				'autoincrement' => FALSE,
+				'autoincrement' => false,
 				'vendor' => $row,
 			];
 		}
@@ -155,7 +155,7 @@ class MsSqlReflector implements Dibi\Reflector
 		");
 
 		$indexes = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$index_name = $row['index_name'];
 
 			if (!isset($indexes[$index_name])) {
@@ -195,7 +195,7 @@ class MsSqlReflector implements Dibi\Reflector
 		");
 
 		$keys = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$key_name = $row['foreign_key'];
 
 			if (!isset($keys[$key_name])) {
@@ -203,8 +203,8 @@ class MsSqlReflector implements Dibi\Reflector
 				$keys[$key_name]['local'] = [$row['column_name']]; // local columns
 				$keys[$key_name]['table'] = $row['reference_table_name']; // referenced table
 				$keys[$key_name]['foreign'] = [$row['reference_column_name']]; // referenced columns
-				$keys[$key_name]['onDelete'] = FALSE;
+				$keys[$key_name]['onDelete'] = false;
-				$keys[$key_name]['onUpdate'] = FALSE;
+				$keys[$key_name]['onUpdate'] = false;
 			} else {
 				$keys[$key_name]['local'][] = $row['column_name']; // local columns
 				$keys[$key_name]['foreign'][] = $row['reference_column_name']; // referenced columns
@@ -212,5 +212,4 @@ class MsSqlReflector implements Dibi\Reflector
 		}
 		return array_values($keys);
 	}
-
 }

src/Dibi/Drivers/MySqlDriver.php

@@ -36,14 +36,14 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	const ERROR_DUPLICATE_ENTRY = 1062;
 	const ERROR_DATA_TRUNCATED = 1265;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $connection;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
 	/** @var bool  Is buffered (seekable and countable)? */
 	private $buffered;
@@ -88,7 +88,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 					if (!isset($config['socket'])) {
 						$config['socket'] = ini_get('mysql.default_socket');
 					}
-					$config['host'] = NULL;
+					$config['host'] = null;
 				}
 			}
 
@@ -99,7 +99,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 			}
 
 			if (empty($config['persistent'])) {
-				$this->connection = @mysql_connect($host, $config['username'], $config['password'], TRUE, $config['flags']); // intentionally @
+				$this->connection = @mysql_connect($host, $config['username'], $config['password'], true, $config['flags']); // intentionally @
 			} else {
 				$this->connection = @mysql_pconnect($host, $config['username'], $config['password'], $config['flags']); // intentionally @
 			}
@@ -146,7 +146,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
@@ -187,7 +187,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -197,7 +197,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -211,7 +211,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		$this->query($savepoint ? "SAVEPOINT $savepoint" : 'START TRANSACTION');
 	}
@@ -223,7 +223,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		$this->query($savepoint ? "RELEASE SAVEPOINT $savepoint" : 'COMMIT');
 	}
@@ -235,7 +235,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		$this->query($savepoint ? "ROLLBACK TO SAVEPOINT $savepoint" : 'ROLLBACK');
 	}
@@ -243,11 +243,11 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : NULL;
+		return is_resource($this->connection) ? $this->connection : null;
 	}
 
 
@@ -347,7 +347,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("'Y-m-d H:i:s'");
+		return $value->format("'Y-m-d H:i:s.u'");
 	}
 
 
@@ -386,8 +386,8 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -395,10 +395,10 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 		if ($limit < 0 || $offset < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 
-		} elseif ($limit !== NULL || $offset) {
+		} elseif ($limit !== null || $offset) {
 			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-			$sql .= ' LIMIT ' . ($limit === NULL ? '18446744073709551615' : (int) $limit)
+			$sql .= ' LIMIT ' . ($limit === null ? '18446744073709551615' : Dibi\Helpers::intVal($limit))
-				. ($offset ? ' OFFSET ' . (int) $offset : '');
+				. ($offset ? ' OFFSET ' . Dibi\Helpers::intVal($offset) : '');
 		}
 	}
 
@@ -431,7 +431,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -443,7 +443,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 * @throws Dibi\Exception
 	 */
 	public function seek($row)
@@ -463,7 +463,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 	public function free()
 	{
 		mysql_free_result($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -482,7 +482,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 				'table' => $row['table'],
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
 				'nativetype' => strtoupper($row['type']),
-				'type' => $row['type'] === 'time' ? Dibi\Type::TIME_INTERVAL : NULL,
+				'type' => $row['type'] === 'time' ? Dibi\Type::TIME_INTERVAL : null,
 				'vendor' => $row,
 			];
 		}
@@ -492,12 +492,11 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
-
 }

src/Dibi/Drivers/MySqlReflector.php

@@ -36,7 +36,7 @@ class MySqlReflector implements Dibi\Reflector
 	{
 		$res = $this->driver->query('SHOW FULL TABLES');
 		$tables = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$tables[] = [
 				'name' => $row[0],
 				'view' => isset($row[1]) && $row[1] === 'VIEW',
@@ -55,13 +55,13 @@ class MySqlReflector implements Dibi\Reflector
 	{
 		$res = $this->driver->query("SHOW FULL COLUMNS FROM {$this->driver->escapeIdentifier($table)}");
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$type = explode('(', $row['Type']);
 			$columns[] = [
 				'name' => $row['Field'],
 				'table' => $table,
 				'nativetype' => strtoupper($type[0]),
-				'size' => isset($type[1]) ? (int) $type[1] : NULL,
+				'size' => isset($type[1]) ? (int) $type[1] : null,
 				'unsigned' => (bool) strstr($row['Type'], 'unsigned'),
 				'nullable' => $row['Null'] === 'YES',
 				'default' => $row['Default'],
@@ -82,7 +82,7 @@ class MySqlReflector implements Dibi\Reflector
 	{
 		$res = $this->driver->query("SHOW INDEX FROM {$this->driver->escapeIdentifier($table)}");
 		$indexes = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$indexes[$row['Key_name']]['name'] = $row['Key_name'];
 			$indexes[$row['Key_name']]['unique'] = !$row['Non_unique'];
 			$indexes[$row['Key_name']]['primary'] = $row['Key_name'] === 'PRIMARY';
@@ -100,7 +100,7 @@ class MySqlReflector implements Dibi\Reflector
 	 */
 	public function getForeignKeys($table)
 	{
-		$data = $this->driver->query("SELECT `ENGINE` FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = {$this->driver->escapeText($table)}")->fetch(TRUE);
+		$data = $this->driver->query("SELECT `ENGINE` FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = {$this->driver->escapeText($table)}")->fetch(true);
 		if ($data['ENGINE'] !== 'InnoDB') {
 			throw new Dibi\NotSupportedException("Foreign keys are not supported in {$data['ENGINE']} tables.");
 		}
@@ -119,7 +119,7 @@ class MySqlReflector implements Dibi\Reflector
 		");
 
 		$foreignKeys = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$keyName = $row['CONSTRAINT_NAME'];
 
 			$foreignKeys[$keyName]['name'] = $keyName;
@@ -131,5 +131,4 @@ class MySqlReflector implements Dibi\Reflector
 		}
 		return array_values($foreignKeys);
 	}
-
 }

src/Dibi/Drivers/MySqliDriver.php

@@ -37,14 +37,14 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	const ERROR_DUPLICATE_ENTRY = 1062;
 	const ERROR_DATA_TRUNCATED = 1265;
 
-	/** @var \mysqli|NULL */
+	/** @var \mysqli|null */
 	private $connection;
 
-	/** @var \mysqli_result|NULL */
+	/** @var \mysqli_result|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
 	/** @var bool  Is buffered (seekable and countable)? */
 	private $buffered;
@@ -80,7 +80,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 				'username' => ini_get('mysqli.default_user'),
 				'password' => ini_get('mysqli.default_pw'),
 				'socket' => (string) ini_get('mysqli.default_socket'),
-				'port' => NULL,
+				'port' => null,
 			];
 			if (!isset($config['host'])) {
 				$host = ini_get('mysqli.default_host');
@@ -88,8 +88,8 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 					$config['host'] = $host;
 					$config['port'] = ini_get('mysqli.default_port');
 				} else {
-					$config['host'] = NULL;
+					$config['host'] = null;
-					$config['port'] = NULL;
+					$config['port'] = null;
 				}
 			}
 
@@ -98,13 +98,8 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 
 			$this->connection = mysqli_init();
 			if (isset($config['options'])) {
-				if (is_scalar($config['options'])) {
+				foreach ($config['options'] as $key => $value) {
-					$config['flags'] = $config['options']; // back compatibility
+					mysqli_options($this->connection, $key, $value);
-					trigger_error(__CLASS__ . ": configuration item 'options' must be array; for constants MYSQLI_CLIENT_* use 'flags'.", E_USER_NOTICE);
-				} else {
-					foreach ((array) $config['options'] as $key => $value) {
-						mysqli_options($this->connection, $key, $value);
-					}
 				}
 			}
 			@mysqli_real_connect($this->connection, (empty($config['persistent']) ? '' : 'p:') . $config['host'], $config['username'], $config['password'], $config['database'], $config['port'], $config['socket'], $config['flags']); // intentionally @
@@ -145,7 +140,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
@@ -158,7 +153,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 		} elseif (is_object($res)) {
 			return $this->createResultDriver($res);
 		}
-		return NULL;
+		return null;
 	}
 
 
@@ -167,13 +162,13 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	 */
 	public static function createException($message, $code, $sql)
 	{
-		if (in_array($code, [1216, 1217, 1451, 1452, 1701], TRUE)) {
+		if (in_array($code, [1216, 1217, 1451, 1452, 1701], true)) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
-		} elseif (in_array($code, [1062, 1557, 1569, 1586], TRUE)) {
+		} elseif (in_array($code, [1062, 1557, 1569, 1586], true)) {
 			return new Dibi\UniqueConstraintViolationException($message, $code, $sql);
 
-		} elseif (in_array($code, [1048, 1121, 1138, 1171, 1252, 1263, 1566], TRUE)) {
+		} elseif (in_array($code, [1048, 1121, 1138, 1171, 1252, 1263, 1566], true)) {
 			return new Dibi\NotNullConstraintViolationException($message, $code, $sql);
 
 		} else {
@@ -203,17 +198,17 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
-		return mysqli_affected_rows($this->connection) === -1 ? FALSE : mysqli_affected_rows($this->connection);
+		return mysqli_affected_rows($this->connection) === -1 ? false : mysqli_affected_rows($this->connection);
 	}
 
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -227,7 +222,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		$this->query($savepoint ? "SAVEPOINT $savepoint" : 'START TRANSACTION');
 	}
@@ -239,7 +234,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		$this->query($savepoint ? "RELEASE SAVEPOINT $savepoint" : 'COMMIT');
 	}
@@ -251,7 +246,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		$this->query($savepoint ? "ROLLBACK TO SAVEPOINT $savepoint" : 'ROLLBACK');
 	}
@@ -263,7 +258,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	 */
 	public function getResource()
 	{
-		return @$this->connection->thread_id ? $this->connection : NULL;
+		return @$this->connection->thread_id ? $this->connection : null;
 	}
 
 
@@ -355,7 +350,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("'Y-m-d H:i:s'");
+		return $value->format("'Y-m-d H:i:s.u'");
 	}
 
 
@@ -394,8 +389,8 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -403,10 +398,10 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 		if ($limit < 0 || $offset < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 
-		} elseif ($limit !== NULL || $offset) {
+		} elseif ($limit !== null || $offset) {
 			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-			$sql .= ' LIMIT ' . ($limit === NULL ? '18446744073709551615' : (int) $limit)
+			$sql .= ' LIMIT ' . ($limit === null ? '18446744073709551615' : Dibi\Helpers::intVal($limit))
-				. ($offset ? ' OFFSET ' . (int) $offset : '');
+				. ($offset ? ' OFFSET ' . Dibi\Helpers::intVal($offset) : '');
 		}
 	}
 
@@ -439,7 +434,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -451,7 +446,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 * @throws Dibi\Exception
 	 */
 	public function seek($row)
@@ -470,7 +465,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	public function free()
 	{
 		mysqli_free_result($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -481,8 +476,8 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 	public function getResultColumns()
 	{
 		static $types;
-		if ($types === NULL) {
+		if ($types === null) {
-			$consts = get_defined_constants(TRUE);
+			$consts = get_defined_constants(true);
 			$types = [];
 			foreach (isset($consts['mysqli']) ? $consts['mysqli'] : [] as $key => $value) {
 				if (strncmp($key, 'MYSQLI_TYPE_', 12) === 0) {
@@ -501,7 +496,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 				'table' => $row['orgtable'],
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
 				'nativetype' => isset($types[$row['type']]) ? $types[$row['type']] : $row['type'],
-				'type' => $row['type'] === MYSQLI_TYPE_TIME ? Dibi\Type::TIME_INTERVAL : NULL,
+				'type' => $row['type'] === MYSQLI_TYPE_TIME ? Dibi\Type::TIME_INTERVAL : null,
 				'vendor' => $row,
 			];
 		}
@@ -511,12 +506,11 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the result set resource.
-	 * @return \mysqli_result|NULL
+	 * @return \mysqli_result|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
 		return $this->resultSet;
 	}
-
 }

src/Dibi/Drivers/OdbcDriver.php

@@ -25,17 +25,17 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $connection;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
-	/** @var int|FALSE  Affected rows */
+	/** @var int|false  Affected rows */
-	private $affectedRows = FALSE;
+	private $affectedRows = false;
 
 	/** @var int  Cursor */
 	private $row = 0;
@@ -95,28 +95,28 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
 	{
-		$this->affectedRows = FALSE;
+		$this->affectedRows = false;
 		$res = @odbc_exec($this->connection, $sql); // intentionally @
 
-		if ($res === FALSE) {
+		if ($res === false) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection), 0, $sql);
 
 		} elseif (is_resource($res)) {
 			$this->affectedRows = odbc_num_rows($res);
-			return $this->createResultDriver($res);
+			return odbc_num_fields($res) ? $this->createResultDriver($res) : null;
 		}
-		return NULL;
+		return null;
 	}
 
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -126,7 +126,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -140,9 +140,9 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
-		if (!odbc_autocommit($this->connection, FALSE)) {
+		if (!odbc_autocommit($this->connection, false)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
 	}
@@ -154,12 +154,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		if (!odbc_commit($this->connection)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
-		odbc_autocommit($this->connection, TRUE);
+		odbc_autocommit($this->connection, true);
 	}
 
 
@@ -169,12 +169,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		if (!odbc_rollback($this->connection)) {
 			throw new Dibi\DriverException(odbc_errormsg($this->connection) . ' ' . odbc_error($this->connection));
 		}
-		odbc_autocommit($this->connection, TRUE);
+		odbc_autocommit($this->connection, true);
 	}
 
 
@@ -190,11 +190,11 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : NULL;
+		return is_resource($this->connection) ? $this->connection : null;
 	}
 
 
@@ -274,7 +274,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("#m/d/Y#");
+		return $value->format('#m/d/Y#');
 	}
 
 
@@ -287,7 +287,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("#m/d/Y H:i:s#");
+		return $value->format('#m/d/Y H:i:s.u#');
 	}
 
 
@@ -326,8 +326,8 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -338,8 +338,8 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		} elseif ($limit < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 
-		} elseif ($limit !== NULL) {
+		} elseif ($limit !== null) {
-			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
+			$sql = 'SELECT TOP ' . Dibi\Helpers::intVal($limit) . ' * FROM (' . $sql . ') t';
 		}
 	}
 
@@ -370,7 +370,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -380,7 +380,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		} else {
 			$set = $this->resultSet;
 			if (!odbc_fetch_row($set, ++$this->row)) {
-				return FALSE;
+				return false;
 			}
 			$count = odbc_num_fields($set);
 			$cols = [];
@@ -395,12 +395,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 */
 	public function seek($row)
 	{
 		$this->row = $row;
-		return TRUE;
+		return true;
 	}
 
 
@@ -411,7 +411,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	public function free()
 	{
 		odbc_free_result($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -426,7 +426,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		for ($i = 1; $i <= $count; $i++) {
 			$columns[] = [
 				'name' => odbc_field_name($this->resultSet, $i),
-				'table' => NULL,
+				'table' => null,
 				'fullname' => odbc_field_name($this->resultSet, $i),
 				'nativetype' => odbc_field_type($this->resultSet, $i),
 			];
@@ -437,12 +437,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 
 
@@ -516,5 +516,4 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	{
 		throw new Dibi\NotImplementedException;
 	}
-
 }

src/Dibi/Drivers/OracleDriver.php

@@ -19,8 +19,7 @@ use Dibi;
  *   - password (or pass)
  *   - charset => character encoding to set
  *   - schema => alters session schema
- *   - formatDate => how to format date in SQL (@see date)
+ *   - nativeDate => use native date format (defaults to false)
- *   - formatDateTime => how to format datetime in SQL (@see date)
  *   - resource (resource) => existing connection resource
  *   - persistent => Creates persistent connections with oci_pconnect instead of oci_new_connect
  *   - lazy, profiler, result, substitutes, ... => see Dibi\Connection options
@@ -29,23 +28,24 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $connection;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
 	/** @var bool */
-	private $autocommit = TRUE;
+	private $autocommit = true;
 
 	/** @var string  Date and datetime format */
-	private $fmtDate, $fmtDateTime;
+	private $fmtDate;
+	private $fmtDateTime;
 
-	/** @var int|FALSE Number of affected rows */
+	/** @var int|false Number of affected rows */
-	private $affectedRows = FALSE;
+	private $affectedRows = false;
 
 
 	/**
@@ -67,8 +67,14 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	public function connect(array &$config)
 	{
 		$foo = &$config['charset'];
-		$this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U';
+
-		$this->fmtDateTime = isset($config['formatDateTime']) ? $config['formatDateTime'] : 'U';
+		if (isset($config['formatDate']) || isset($config['formatDateTime'])) {
+			trigger_error('OracleDriver: options formatDate and formatDateTime are deprecated.', E_USER_DEPRECATED);
+		}
+		if (empty($config['nativeDate'])) {
+			$this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U';
+			$this->fmtDateTime = isset($config['formatDateTime']) ? $config['formatDateTime'] : 'U';
+		}
 
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
@@ -102,12 +108,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
 	{
-		$this->affectedRows = FALSE;
+		$this->affectedRows = false;
 		$res = oci_parse($this->connection, $sql);
 		if ($res) {
 			@oci_execute($res, $this->autocommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT);
@@ -117,13 +123,13 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 			} elseif (is_resource($res)) {
 				$this->affectedRows = oci_num_rows($res);
-				return $this->createResultDriver($res);
+				return oci_num_fields($res) ? $this->createResultDriver($res) : null;
 			}
 		} else {
 			$err = oci_error($this->connection);
 			throw new Dibi\DriverException($err['message'], $err['code'], $sql);
 		}
-		return NULL;
+		return null;
 	}
 
 
@@ -132,13 +138,13 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 */
 	public static function createException($message, $code, $sql)
 	{
-		if (in_array($code, [1, 2299, 38911], TRUE)) {
+		if (in_array($code, [1, 2299, 38911], true)) {
 			return new Dibi\UniqueConstraintViolationException($message, $code, $sql);
 
-		} elseif (in_array($code, [1400], TRUE)) {
+		} elseif (in_array($code, [1400], true)) {
 			return new Dibi\NotNullConstraintViolationException($message, $code, $sql);
 
-		} elseif (in_array($code, [2266, 2291, 2292], TRUE)) {
+		} elseif (in_array($code, [2266, 2291, 2292], true)) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
 		} else {
@@ -149,7 +155,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -159,12 +165,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
-		$row = $this->query("SELECT $sequence.CURRVAL AS ID FROM DUAL")->fetch(TRUE);
+		$row = $this->query("SELECT $sequence.CURRVAL AS ID FROM DUAL")->fetch(true);
-		return isset($row['ID']) ? (int) $row['ID'] : FALSE;
+		return isset($row['ID']) ? Dibi\Helpers::intVal($row['ID']) : false;
 	}
 
 
@@ -173,9 +179,9 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @param  string  optional savepoint name
 	 * @return void
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
-		$this->autocommit = FALSE;
+		$this->autocommit = false;
 	}
 
 
@@ -185,13 +191,13 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		if (!oci_commit($this->connection)) {
 			$err = oci_error($this->connection);
 			throw new Dibi\DriverException($err['message'], $err['code']);
 		}
-		$this->autocommit = TRUE;
+		$this->autocommit = true;
 	}
 
 
@@ -201,23 +207,23 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		if (!oci_rollback($this->connection)) {
 			$err = oci_error($this->connection);
 			throw new Dibi\DriverException($err['message'], $err['code']);
 		}
-		$this->autocommit = TRUE;
+		$this->autocommit = true;
 	}
 
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : NULL;
+		return is_resource($this->connection) ? $this->connection : null;
 	}
 
 
@@ -298,7 +304,9 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format($this->fmtDate);
+		return $this->fmtDate
+			? $value->format($this->fmtDate)
+			: "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')";
 	}
 
 
@@ -311,7 +319,9 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format($this->fmtDateTime);
+		return $this->fmtDateTime
+			? $value->format($this->fmtDateTime)
+			: "to_date('" . $value->format('Y-m-d G:i:s') . "', 'YYYY-mm-dd hh24:mi:ss')";
 	}
 
 
@@ -351,8 +361,8 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -363,11 +373,11 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		} elseif ($offset) {
 			// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
 			$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
-				. ($limit !== NULL ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
+				. ($limit !== null ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
-				. ') WHERE "__rnum" > '. (int) $offset;
+				. ') WHERE "__rnum" > ' . $offset;
 
-		} elseif ($limit !== NULL) {
+		} elseif ($limit !== null) {
-			$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit;
+			$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . Dibi\Helpers::intVal($limit);
 		}
 	}
 
@@ -397,7 +407,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -409,7 +419,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 */
 	public function seek($row)
 	{
@@ -424,7 +434,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	public function free()
 	{
 		oci_free_statement($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -440,7 +450,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 			$type = oci_field_type($this->resultSet, $i);
 			$columns[] = [
 				'name' => oci_field_name($this->resultSet, $i),
-				'table' => NULL,
+				'table' => null,
 				'fullname' => oci_field_name($this->resultSet, $i),
 				'nativetype' => $type === 'NUMBER' && oci_field_scale($this->resultSet, $i) === 0 ? 'INTEGER' : $type,
 			];
@@ -451,12 +461,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 
 
@@ -471,7 +481,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	{
 		$res = $this->query('SELECT * FROM cat');
 		$tables = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			if ($row[1] === 'TABLE' || $row[1] === 'VIEW') {
 				$tables[] = [
 					'name' => $row[0],
@@ -492,12 +502,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	{
 		$res = $this->query('SELECT * FROM "ALL_TAB_COLUMNS" WHERE "TABLE_NAME" = ' . $this->escapeText($table));
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$columns[] = [
 				'table' => $row['TABLE_NAME'],
 				'name' => $row['COLUMN_NAME'],
 				'nativetype' => $row['DATA_TYPE'],
-				'size' => isset($row['DATA_LENGTH']) ? $row['DATA_LENGTH'] : NULL,
+				'size' => isset($row['DATA_LENGTH']) ? $row['DATA_LENGTH'] : null,
 				'nullable' => $row['NULLABLE'] === 'Y',
 				'default' => $row['DATA_DEFAULT'],
 				'vendor' => $row,
@@ -527,5 +537,4 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	{
 		throw new Dibi\NotImplementedException;
 	}
-
 }

src/Dibi/Drivers/PdoDriver.php

@@ -30,11 +30,11 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	/** @var PDO  Connection resource */
 	private $connection;
 
-	/** @var \PDOStatement|NULL  Resultset resource */
+	/** @var \PDOStatement|null  Resultset resource */
 	private $resultSet;
 
-	/** @var int|FALSE  Affected rows */
+	/** @var int|false  Affected rows */
-	private $affectedRows = FALSE;
+	private $affectedRows = false;
 
 	/** @var string */
 	private $driverName;
@@ -92,14 +92,14 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	 */
 	public function disconnect()
 	{
-		$this->connection = NULL;
+		$this->connection = null;
 	}
 
 
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
@@ -107,12 +107,12 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 		// must detect if SQL returns result set or num of affected rows
 		$cmd = strtoupper(substr(ltrim($sql), 0, 6));
 		static $list = ['UPDATE' => 1, 'DELETE' => 1, 'INSERT' => 1, 'REPLAC' => 1];
-		$this->affectedRows = FALSE;
+		$this->affectedRows = false;
 
 		if (isset($list[$cmd])) {
 			$this->affectedRows = $this->connection->exec($sql);
-			if ($this->affectedRows !== FALSE) {
+			if ($this->affectedRows !== false) {
-				return NULL;
+				return null;
 			}
 		} else {
 			$res = $this->connection->query($sql);
@@ -144,7 +144,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -154,7 +154,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -168,7 +168,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		if (!$this->connection->beginTransaction()) {
 			$err = $this->connection->errorInfo();
@@ -183,7 +183,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		if (!$this->connection->commit()) {
 			$err = $this->connection->errorInfo();
@@ -198,7 +198,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		if (!$this->connection->rollBack()) {
 			$err = $this->connection->errorInfo();
@@ -348,7 +348,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format($this->driverName === 'odbc' ? "#m/d/Y H:i:s#" : "'Y-m-d H:i:s'");
+		return $value->format($this->driverName === 'odbc' ? '#m/d/Y H:i:s.u#' : "'Y-m-d H:i:s.u'");
 	}
 
 
@@ -415,8 +415,8 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -427,26 +427,26 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 
 		switch ($this->driverName) {
 			case 'mysql':
-				if ($limit !== NULL || $offset) {
+				if ($limit !== null || $offset) {
 					// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-					$sql .= ' LIMIT ' . ($limit === NULL ? '18446744073709551615' : (int) $limit)
+					$sql .= ' LIMIT ' . ($limit === null ? '18446744073709551615' : Dibi\Helpers::intVal($limit))
-						. ($offset ? ' OFFSET ' . (int) $offset : '');
+						. ($offset ? ' OFFSET ' . Dibi\Helpers::intVal($offset) : '');
 				}
 				break;
 
 			case 'pgsql':
-				if ($limit !== NULL) {
+				if ($limit !== null) {
-					$sql .= ' LIMIT ' . (int) $limit;
+					$sql .= ' LIMIT ' . Dibi\Helpers::intVal($limit);
 				}
 				if ($offset) {
-					$sql .= ' OFFSET ' . (int) $offset;
+					$sql .= ' OFFSET ' . Dibi\Helpers::intVal($offset);
 				}
 				break;
 
 			case 'sqlite':
-				if ($limit !== NULL || $offset) {
+				if ($limit !== null || $offset) {
-					$sql .= ' LIMIT ' . ($limit === NULL ? '-1' : (int) $limit)
+					$sql .= ' LIMIT ' . ($limit === null ? '-1' : Dibi\Helpers::intVal($limit))
-						. ($offset ? ' OFFSET ' . (int) $offset : '');
+						. ($offset ? ' OFFSET ' . Dibi\Helpers::intVal($offset) : '');
 				}
 				break;
 
@@ -454,11 +454,11 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 				if ($offset) {
 					// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
 					$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
-						. ($limit !== NULL ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
+						. ($limit !== null ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
-						. ') WHERE "__rnum" > '. (int) $offset;
+						. ') WHERE "__rnum" > ' . $offset;
 
-				} elseif ($limit !== NULL) {
+				} elseif ($limit !== null) {
-					$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit;
+					$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . Dibi\Helpers::intVal($limit);
 				}
 				break;
 
@@ -467,25 +467,23 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 			case 'dblib':
 				if (version_compare($this->serverVersion, '11.0') >= 0) { // 11 == SQL Server 2012
 					// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-					if ($limit !== NULL) {
+					if ($limit !== null) {
 						$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
 					} elseif ($offset) {
 						$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
 					}
 					break;
 				}
-				// intentionally break omitted
+				// break omitted
-
 			case 'odbc':
 				if ($offset) {
 					throw new Dibi\NotSupportedException('Offset is not supported by this database.');
 
-				} elseif ($limit !== NULL) {
+				} elseif ($limit !== null) {
-					$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
+					$sql = 'SELECT TOP ' . Dibi\Helpers::intVal($limit) . ' * FROM (' . $sql . ') t';
 					break;
 				}
-				// intentionally break omitted
+				// break omitted
-
 			default:
 				throw new Dibi\NotSupportedException('PDO or driver does not support applying limit or offset.');
 		}
@@ -507,7 +505,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -519,7 +517,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 */
 	public function seek($row)
 	{
@@ -533,7 +531,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	 */
 	public function free()
 	{
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -548,11 +546,11 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 		$columns = [];
 		for ($i = 0; $i < $count; $i++) {
 			$row = @$this->resultSet->getColumnMeta($i); // intentionally @
-			if ($row === FALSE) {
+			if ($row === false) {
 				throw new Dibi\NotSupportedException('Driver does not support meta data.');
 			}
 			$row = $row + [
-				'table' => NULL,
+				'table' => null,
 				'native_type' => 'VAR_STRING',
 			];
 
@@ -560,7 +558,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 				'name' => $row['name'],
 				'table' => $row['table'],
 				'nativetype' => $row['native_type'],
-				'type' => $row['native_type'] === 'TIME' && $this->driverName === 'mysql' ? Dibi\Type::TIME_INTERVAL : NULL,
+				'type' => $row['native_type'] === 'TIME' && $this->driverName === 'mysql' ? Dibi\Type::TIME_INTERVAL : null,
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
 				'vendor' => $row,
 			];
@@ -571,11 +569,10 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the result set resource.
-	 * @return \PDOStatement|NULL
+	 * @return \PDOStatement|null
 	 */
 	public function getResultResource()
 	{
 		return $this->resultSet;
 	}
-
 }

src/Dibi/Drivers/PostgreDriver.php

@@ -26,17 +26,17 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 {
 	use Dibi\Strict;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $connection;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
-	/** @var int|FALSE  Affected rows */
+	/** @var int|false  Affected rows */
-	private $affectedRows = FALSE;
+	private $affectedRows = false;
 
 
 	/**
@@ -57,7 +57,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 */
 	public function connect(array &$config)
 	{
-		$error = NULL;
+		$error = null;
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
 
@@ -78,7 +78,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 				}
 			}
 
-			set_error_handler(function($severity, $message) use (&$error) {
+			set_error_handler(function ($severity, $message) use (&$error) {
 				$error = $message;
 			});
 			if (empty($config['persistent'])) {
@@ -128,16 +128,16 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
 	{
-		$this->affectedRows = FALSE;
+		$this->affectedRows = false;
 		$res = @pg_query($this->connection, $sql); // intentionally @
 
-		if ($res === FALSE) {
+		if ($res === false) {
-			throw self::createException(pg_last_error($this->connection), NULL, $sql);
+			throw self::createException(pg_last_error($this->connection), null, $sql);
 
 		} elseif (is_resource($res)) {
 			$this->affectedRows = pg_affected_rows($res);
@@ -145,21 +145,21 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 				return $this->createResultDriver($res);
 			}
 		}
-		return NULL;
+		return null;
 	}
 
 
 	/**
 	 * @return Dibi\DriverException
 	 */
-	public static function createException($message, $code = NULL, $sql = NULL)
+	public static function createException($message, $code = null, $sql = null)
 	{
-		if ($code === NULL && preg_match('#^ERROR:\s+(\S+):\s*#', $message, $m)) {
+		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' && strpos($message, 'truncate') !== false) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
 		} elseif ($code === '23502') {
@@ -179,7 +179,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -189,11 +189,11 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
-		if ($sequence === NULL) {
+		if ($sequence === null) {
 			// PostgreSQL 8.1 is needed
 			$res = $this->query('SELECT LASTVAL()');
 		} else {
@@ -201,11 +201,11 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		}
 
 		if (!$res) {
-			return FALSE;
+			return false;
 		}
 
-		$row = $res->fetch(FALSE);
+		$row = $res->fetch(false);
-		return is_array($row) ? $row[0] : FALSE;
+		return is_array($row) ? $row[0] : false;
 	}
 
 
@@ -215,7 +215,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		$this->query($savepoint ? "SAVEPOINT $savepoint" : 'START TRANSACTION');
 	}
@@ -227,7 +227,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		$this->query($savepoint ? "RELEASE SAVEPOINT $savepoint" : 'COMMIT');
 	}
@@ -239,7 +239,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		$this->query($savepoint ? "ROLLBACK TO SAVEPOINT $savepoint" : 'ROLLBACK');
 	}
@@ -251,17 +251,17 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	 */
 	public function inTransaction()
 	{
-		return !in_array(pg_transaction_status($this->connection), [PGSQL_TRANSACTION_UNKNOWN, PGSQL_TRANSACTION_IDLE], TRUE);
+		return !in_array(pg_transaction_status($this->connection), [PGSQL_TRANSACTION_UNKNOWN, PGSQL_TRANSACTION_IDLE], true);
 	}
 
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : NULL;
+		return is_resource($this->connection) ? $this->connection : null;
 	}
 
 
@@ -361,7 +361,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("'Y-m-d H:i:s'");
+		return $value->format("'Y-m-d H:i:s.u'");
 	}
 
 
@@ -402,8 +402,8 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -411,11 +411,11 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if ($limit < 0 || $offset < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 		}
-		if ($limit !== NULL) {
+		if ($limit !== null) {
-			$sql .= ' LIMIT ' . (int) $limit;
+			$sql .= ' LIMIT ' . Dibi\Helpers::intVal($limit);
 		}
 		if ($offset) {
-			$sql .= ' OFFSET ' . (int) $offset;
+			$sql .= ' OFFSET ' . Dibi\Helpers::intVal($offset);
 		}
 	}
 
@@ -445,19 +445,19 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
 	{
-		return pg_fetch_array($this->resultSet, NULL, $assoc ? PGSQL_ASSOC : PGSQL_NUM);
+		return pg_fetch_array($this->resultSet, null, $assoc ? PGSQL_ASSOC : PGSQL_NUM);
 	}
 
 
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 */
 	public function seek($row)
 	{
@@ -472,7 +472,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	public function free()
 	{
 		pg_free_result($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -499,12 +499,12 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
 
 
@@ -601,13 +601,13 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		}
 
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$size = (int) max($row['character_maximum_length'], $row['numeric_precision']);
 			$columns[] = [
 				'name' => $row['column_name'],
 				'table' => $table,
 				'nativetype' => strtoupper($row['udt_name']),
-				'size' => $size > 0 ? $size : NULL,
+				'size' => $size > 0 ? $size : null,
 				'nullable' => $row['is_nullable'] === 'YES' || $row['is_nullable'] === 't',
 				'default' => $row['column_default'],
 				'autoincrement' => (int) $row['ordinal_position'] === $primary && substr($row['column_default'], 0, 7) === 'nextval',
@@ -641,7 +641,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		");
 
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$columns[$row['ordinal_position']] = $row['column_name'];
 		}
 
@@ -654,7 +654,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		");
 
 		$indexes = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$indexes[$row['relname']]['name'] = $row['relname'];
 			$indexes[$row['relname']]['unique'] = $row['indisunique'] === 't';
 			$indexes[$row['relname']]['primary'] = $row['indisprimary'] === 't';
@@ -715,7 +715,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		");
 
 		$fKeys = $references = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			if (!isset($fKeys[$row['name']])) {
 				$fKeys[$row['name']] = [
 					'name' => $row['name'],
@@ -740,5 +740,4 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 
 		return $fKeys;
 	}
-
 }

src/Dibi/Drivers/Sqlite3Driver.php

@@ -27,20 +27,22 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var SQLite3|NULL */
+	/** @var SQLite3|null */
 	private $connection;
 
-	/** @var \SQLite3Result|NULL */
+	/** @var \SQLite3Result|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
 	/** @var string  Date and datetime format */
-	private $fmtDate, $fmtDateTime;
+	private $fmtDate;
+	private $fmtDateTime;
 
 	/** @var string  character encoding */
-	private $dbcharset, $charset;
+	private $dbcharset;
+	private $charset;
 
 
 	/**
@@ -78,7 +80,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 		$this->dbcharset = empty($config['dbcharset']) ? 'UTF-8' : $config['dbcharset'];
 		$this->charset = empty($config['charset']) ? 'UTF-8' : $config['charset'];
 		if (strcasecmp($this->dbcharset, $this->charset) === 0) {
-			$this->dbcharset = $this->charset = NULL;
+			$this->dbcharset = $this->charset = null;
 		}
 
 		// enable foreign keys support (defaultly disabled; if disabled then foreign key constraints are not enforced)
@@ -102,12 +104,12 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
 	{
-		if ($this->dbcharset !== NULL) {
+		if ($this->dbcharset !== null) {
 			$sql = iconv($this->charset, $this->dbcharset . '//IGNORE', $sql);
 		}
 
@@ -115,10 +117,10 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 		if ($code = $this->connection->lastErrorCode()) {
 			throw self::createException($this->connection->lastErrorMsg(), $code, $sql);
 
-		} elseif ($res instanceof \SQLite3Result) {
+		} elseif ($res instanceof \SQLite3Result && $res->numColumns()) {
 			return $this->createResultDriver($res);
 		}
-		return NULL;
+		return null;
 	}
 
 
@@ -130,19 +132,19 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 		if ($code !== 19) {
 			return new Dibi\DriverException($message, $code, $sql);
 
-		} elseif (strpos($message, 'must be unique') !== FALSE
+		} elseif (strpos($message, 'must be unique') !== false
-			|| strpos($message, 'is not unique') !== FALSE
+			|| strpos($message, 'is not unique') !== false
-			|| strpos($message, 'UNIQUE constraint failed') !== FALSE
+			|| strpos($message, 'UNIQUE constraint failed') !== false
 		) {
 			return new Dibi\UniqueConstraintViolationException($message, $code, $sql);
 
-		} elseif (strpos($message, 'may not be NULL') !== FALSE
+		} elseif (strpos($message, 'may not be NULL') !== false
-			|| strpos($message, 'NOT NULL constraint failed') !== FALSE
+			|| strpos($message, 'NOT NULL constraint failed') !== false
 		) {
 			return new Dibi\NotNullConstraintViolationException($message, $code, $sql);
 
-		} elseif (strpos($message, 'foreign key constraint failed') !== FALSE
+		} elseif (strpos($message, 'foreign key constraint failed') !== false
-			|| strpos($message, 'FOREIGN KEY constraint failed') !== FALSE
+			|| strpos($message, 'FOREIGN KEY constraint failed') !== false
 		) {
 			return new Dibi\ForeignKeyConstraintViolationException($message, $code, $sql);
 
@@ -154,7 +156,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -164,7 +166,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -178,7 +180,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		$this->query($savepoint ? "SAVEPOINT $savepoint" : 'BEGIN');
 	}
@@ -190,7 +192,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		$this->query($savepoint ? "RELEASE SAVEPOINT $savepoint" : 'COMMIT');
 	}
@@ -202,7 +204,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		$this->query($savepoint ? "ROLLBACK TO SAVEPOINT $savepoint" : 'ROLLBACK');
 	}
@@ -346,8 +348,8 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -355,9 +357,9 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 		if ($limit < 0 || $offset < 0) {
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 
-		} elseif ($limit !== NULL || $offset) {
+		} elseif ($limit !== null || $offset) {
-			$sql .= ' LIMIT ' . ($limit === NULL ? '-1' : (int) $limit)
+			$sql .= ' LIMIT ' . ($limit === null ? '-1' : Dibi\Helpers::intVal($limit))
-				. ($offset ? ' OFFSET ' . (int) $offset : '');
+				. ($offset ? ' OFFSET ' . Dibi\Helpers::intVal($offset) : '');
 		}
 	}
 
@@ -388,17 +390,17 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
 	{
 		$row = $this->resultSet->fetchArray($assoc ? SQLITE3_ASSOC : SQLITE3_NUM);
-		$charset = $this->charset === NULL ? NULL : $this->charset . '//TRANSLIT';
+		$charset = $this->charset === null ? null : $this->charset . '//TRANSLIT';
 		if ($row && ($assoc || $charset)) {
 			$tmp = [];
 			foreach ($row as $k => $v) {
-				if ($charset !== NULL && is_string($v)) {
+				if ($charset !== null && is_string($v)) {
 					$v = iconv($this->dbcharset, $charset, $v);
 				}
 				$tmp[str_replace(['[', ']'], '', $k)] = $v;
@@ -412,7 +414,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 * @throws Dibi\NotSupportedException
 	 */
 	public function seek($row)
@@ -428,7 +430,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	public function free()
 	{
 		$this->resultSet->finalize();
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -444,7 +446,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 		for ($i = 0; $i < $count; $i++) {
 			$columns[] = [
 				'name' => $this->resultSet->columnName($i),
-				'table' => NULL,
+				'table' => null,
 				'fullname' => $this->resultSet->columnName($i),
 				'nativetype' => $types[$this->resultSet->columnType($i)],
 			];
@@ -455,11 +457,11 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the result set resource.
-	 * @return \SQLite3Result|NULL
+	 * @return \SQLite3Result|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
 		return $this->resultSet;
 	}
 
@@ -492,5 +494,4 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
 	{
 		$this->connection->createAggregate($name, $rowCallback, $agrCallback, $numArgs);
 	}
-
 }

src/Dibi/Drivers/SqliteReflector.php

@@ -41,7 +41,7 @@ class SqliteReflector implements Dibi\Reflector
 			ORDER BY name
 		");
 		$tables = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$tables[] = $row;
 		}
 		return $tables;
@@ -57,7 +57,7 @@ class SqliteReflector implements Dibi\Reflector
 	{
 		$res = $this->driver->query("PRAGMA table_info({$this->driver->escapeIdentifier($table)})");
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$column = $row['name'];
 			$type = explode('(', $row['type']);
 			$columns[] = [
@@ -65,7 +65,7 @@ class SqliteReflector implements Dibi\Reflector
 				'table' => $table,
 				'fullname' => "$table.$column",
 				'nativetype' => strtoupper($type[0]),
-				'size' => isset($type[1]) ? (int) $type[1] : NULL,
+				'size' => isset($type[1]) ? (int) $type[1] : null,
 				'nullable' => $row['notnull'] == '0',
 				'default' => $row['dflt_value'],
 				'autoincrement' => $row['pk'] && $type[0] === 'INTEGER',
@@ -85,14 +85,14 @@ class SqliteReflector implements Dibi\Reflector
 	{
 		$res = $this->driver->query("PRAGMA index_list({$this->driver->escapeIdentifier($table)})");
 		$indexes = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$indexes[$row['name']]['name'] = $row['name'];
 			$indexes[$row['name']]['unique'] = (bool) $row['unique'];
 		}
 
 		foreach ($indexes as $index => $values) {
 			$res = $this->driver->query("PRAGMA index_info({$this->driver->escapeIdentifier($index)})");
-			while ($row = $res->fetch(TRUE)) {
+			while ($row = $res->fetch(true)) {
 				$indexes[$index]['columns'][$row['seqno']] = $row['name'];
 			}
 		}
@@ -100,7 +100,7 @@ class SqliteReflector implements Dibi\Reflector
 		$columns = $this->getColumns($table);
 		foreach ($indexes as $index => $values) {
 			$column = $indexes[$index]['columns'][0];
-			$primary = FALSE;
+			$primary = false;
 			foreach ($columns as $info) {
 				if ($column == $info['name']) {
 					$primary = $info['vendor']['pk'];
@@ -114,8 +114,8 @@ class SqliteReflector implements Dibi\Reflector
 				if ($column['vendor']['pk']) {
 					$indexes[] = [
 						'name' => 'ROWID',
-						'unique' => TRUE,
+						'unique' => true,
-						'primary' => TRUE,
+						'primary' => true,
 						'columns' => [$column['name']],
 					];
 					break;
@@ -136,7 +136,7 @@ class SqliteReflector implements Dibi\Reflector
 	{
 		$res = $this->driver->query("PRAGMA foreign_key_list({$this->driver->escapeIdentifier($table)})");
 		$keys = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$keys[$row['id']]['name'] = $row['id']; // foreign key name
 			$keys[$row['id']]['local'][$row['seq']] = $row['from']; // local columns
 			$keys[$row['id']]['table'] = $row['table']; // referenced table
@@ -144,11 +144,10 @@ class SqliteReflector implements Dibi\Reflector
 			$keys[$row['id']]['onDelete'] = $row['on_delete'];
 			$keys[$row['id']]['onUpdate'] = $row['on_update'];
 
-			if ($keys[$row['id']]['foreign'][0] == NULL) {
+			if ($keys[$row['id']]['foreign'][0] == null) {
-				$keys[$row['id']]['foreign'] = NULL;
+				$keys[$row['id']]['foreign'] = null;
 			}
 		}
 		return array_values($keys);
 	}
-
 }

src/Dibi/Drivers/SqlsrvDriver.php

@@ -29,17 +29,17 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $connection;
 
-	/** @var resource|NULL */
+	/** @var resource|null */
 	private $resultSet;
 
 	/** @var bool */
-	private $autoFree = TRUE;
+	private $autoFree = true;
 
-	/** @var int|FALSE  Affected rows */
+	/** @var int|false  Affected rows */
-	private $affectedRows = FALSE;
+	private $affectedRows = false;
 
 	/** @var string */
 	private $version = '';
@@ -106,29 +106,29 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return Dibi\ResultDriver|NULL
+	 * @return Dibi\ResultDriver|null
 	 * @throws Dibi\DriverException
 	 */
 	public function query($sql)
 	{
-		$this->affectedRows = FALSE;
+		$this->affectedRows = false;
 		$res = sqlsrv_query($this->connection, $sql);
 
-		if ($res === FALSE) {
+		if ($res === false) {
 			$info = sqlsrv_errors();
 			throw new Dibi\DriverException($info[0]['message'], $info[0]['code'], $sql);
 
 		} elseif (is_resource($res)) {
 			$this->affectedRows = sqlsrv_rows_affected($res);
-			return $this->createResultDriver($res);
+			return sqlsrv_num_fields($res) ? $this->createResultDriver($res) : null;
 		}
-		return NULL;
+		return null;
 	}
 
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	public function getAffectedRows()
 	{
@@ -138,7 +138,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	public function getInsertId($sequence)
 	{
@@ -147,7 +147,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 			$row = sqlsrv_fetch_array($res, SQLSRV_FETCH_NUMERIC);
 			return $row[0];
 		}
-		return FALSE;
+		return false;
 	}
 
 
@@ -157,7 +157,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function begin($savepoint = NULL)
+	public function begin($savepoint = null)
 	{
 		sqlsrv_begin_transaction($this->connection);
 	}
@@ -169,7 +169,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function commit($savepoint = NULL)
+	public function commit($savepoint = null)
 	{
 		sqlsrv_commit($this->connection);
 	}
@@ -181,7 +181,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 	 * @return void
 	 * @throws Dibi\DriverException
 	 */
-	public function rollback($savepoint = NULL)
+	public function rollback($savepoint = null)
 	{
 		sqlsrv_rollback($this->connection);
 	}
@@ -189,11 +189,11 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the connection resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : NULL;
+		return is_resource($this->connection) ? $this->connection : null;
 	}
 
 
@@ -287,7 +287,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 		if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $value->format("'Y-m-d H:i:s'");
+		return $value->format("'Y-m-d H:i:s.u'");
 	}
 
 
@@ -326,8 +326,8 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	public function applyLimit(&$sql, $limit, $offset)
@@ -339,11 +339,11 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 			if ($offset) {
 				throw new Dibi\NotSupportedException('Offset is not supported by this database.');
 
-			} elseif ($limit !== NULL) {
+			} elseif ($limit !== null) {
 				$sql = sprintf('SELECT TOP (%d) * FROM (%s) t', $limit, $sql);
 			}
 
-		} elseif ($limit !== NULL) {
+		} elseif ($limit !== null) {
 			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
 			$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
 		} elseif ($offset) {
@@ -378,7 +378,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 */
 	public function fetch($assoc)
@@ -390,7 +390,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int   the 0-based cursor pos to seek to
-	 * @return bool  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool  true on success, false if unable to seek to specified record
 	 */
 	public function seek($row)
 	{
@@ -405,7 +405,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 	public function free()
 	{
 		sqlsrv_free_stmt($this->resultSet);
-		$this->resultSet = NULL;
+		$this->resultSet = null;
 	}
 
 
@@ -429,12 +429,11 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|NULL
+	 * @return resource|null
 	 */
 	public function getResultResource()
 	{
-		$this->autoFree = FALSE;
+		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : NULL;
+		return is_resource($this->resultSet) ? $this->resultSet : null;
 	}
-
 }

src/Dibi/Drivers/SqlsrvReflector.php

@@ -36,7 +36,7 @@ class SqlsrvReflector implements Dibi\Reflector
 	{
 		$res = $this->driver->query("SELECT TABLE_NAME, TABLE_TYPE FROM INFORMATION_SCHEMA.TABLES WHERE [TABLE_SCHEMA] = 'dbo'");
 		$tables = [];
-		while ($row = $res->fetch(FALSE)) {
+		while ($row = $res->fetch(false)) {
 			$tables[] = [
 				'name' => $row[0],
 				'view' => isset($row[1]) && $row[1] === 'VIEW',
@@ -61,7 +61,7 @@ class SqlsrvReflector implements Dibi\Reflector
 		");
 
 		$autoIncrements = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$autoIncrements[$row['COLUMN_NAME']] = (bool) $row['AUTO_INCREMENT'];
 		}
 
@@ -81,13 +81,13 @@ class SqlsrvReflector implements Dibi\Reflector
 			WHERE C.TABLE_NAME = {$this->driver->escapeText($table)}
 		");
 		$columns = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$columns[] = [
 				'name' => $row['COLUMN_NAME'],
 				'table' => $table,
 				'nativetype' => strtoupper($row['DATA_TYPE']),
 				'size' => $row['CHARACTER_MAXIMUM_LENGTH'],
-				'unsigned' => TRUE,
+				'unsigned' => true,
 				'nullable' => $row['IS_NULLABLE'] === 'YES',
 				'default' => $row['COLUMN_DEFAULT'],
 				'autoincrement' => $autoIncrements[$row['COLUMN_NAME']],
@@ -105,15 +105,15 @@ class SqlsrvReflector implements Dibi\Reflector
 	 */
 	public function getIndexes($table)
 	{
-		$keyUsagesRes = $this->driver->query(sprintf("EXEC [sys].[sp_helpindex] @objname = N%s", $this->driver->escapeText($table)));
+		$keyUsagesRes = $this->driver->query(sprintf('EXEC [sys].[sp_helpindex] @objname = N%s', $this->driver->escapeText($table)));
 		$keyUsages = [];
-		while ($row = $keyUsagesRes->fetch(TRUE)) {
+		while ($row = $keyUsagesRes->fetch(true)) {
 			$keyUsages[$row['index_name']] = explode(',', $row['index_keys']);
 		}
 
 		$res = $this->driver->query("SELECT [i].* FROM [sys].[indexes] [i] INNER JOIN [sys].[tables] [t] ON [i].[object_id] = [t].[object_id] WHERE [t].[name] = {$this->driver->escapeText($table)}");
 		$indexes = [];
-		while ($row = $res->fetch(TRUE)) {
+		while ($row = $res->fetch(true)) {
 			$indexes[$row['name']]['name'] = $row['name'];
 			$indexes[$row['name']]['unique'] = $row['is_unique'] === 1;
 			$indexes[$row['name']]['primary'] = $row['is_primary_key'] === 1;
@@ -132,5 +132,4 @@ class SqlsrvReflector implements Dibi\Reflector
 	{
 		throw new Dibi\NotImplementedException;
 	}
-
 }

src/Dibi/Event.php

@@ -37,7 +37,7 @@ class Event
 	/** @var string */
 	public $sql;
 
-	/** @var Result|DriverException|NULL */
+	/** @var Result|DriverException|null */
 	public $result;
 
 	/** @var float */
@@ -50,12 +50,12 @@ class Event
 	public $source;
 
 
-	public function __construct(Connection $connection, $type, $sql = NULL)
+	public function __construct(Connection $connection, $type, $sql = null)
 	{
 		$this->connection = $connection;
 		$this->type = $type;
 		$this->sql = trim($sql);
-		$this->time = -microtime(TRUE);
+		$this->time = -microtime(true);
 
 		if ($type === self::QUERY && preg_match('#\(?\s*(SELECT|UPDATE|INSERT|DELETE)#iA', $this->sql, $matches)) {
 			static $types = [
@@ -67,32 +67,31 @@ class Event
 
 		$rc = new \ReflectionClass('dibi');
 		$dibiDir = dirname($rc->getFileName()) . DIRECTORY_SEPARATOR;
-		foreach (debug_backtrace(FALSE) as $row) {
+		foreach (debug_backtrace(false) as $row) {
 			if (isset($row['file']) && is_file($row['file']) && strpos($row['file'], $dibiDir) !== 0) {
 				$this->source = [$row['file'], (int) $row['line']];
 				break;
 			}
 		}
 
-		\dibi::$elapsedTime = FALSE;
+		\dibi::$elapsedTime = false;
 		\dibi::$numOfQueries++;
 		\dibi::$sql = $sql;
 	}
 
 
-	public function done($result = NULL)
+	public function done($result = null)
 	{
 		$this->result = $result;
 		try {
-			$this->count = $result instanceof Result ? count($result) : NULL;
+			$this->count = $result instanceof Result ? count($result) : null;
 		} catch (Exception $e) {
-			$this->count = NULL;
+			$this->count = null;
 		}
 
-		$this->time += microtime(TRUE);
+		$this->time += microtime(true);
 		\dibi::$elapsedTime = $this->time;
 		\dibi::$totalTime += $this->time;
 		return $this;
 	}
-
 }

src/Dibi/Expression.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the "dibi" - smart database abstraction layer.
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Dibi;
+
+
+/**
+ * SQL expression.
+ */
+class Expression
+{
+	use Strict;
+
+	/** @var array */
+	private $values;
+
+
+	public function __construct()
+	{
+		$this->values = func_get_args();
+	}
+
+
+	public function getValues()
+	{
+		return $this->values;
+	}
+}

src/Dibi/Fluent.php

@@ -33,12 +33,12 @@ class Fluent implements IDataSource
 {
 	use Strict;
 
-	const REMOVE = FALSE;
+	const REMOVE = false;
 
 	/** @var array */
 	public static $masks = [
 		'SELECT' => ['SELECT', 'DISTINCT', 'FROM', 'WHERE', 'GROUP BY',
-			'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET'],
+			'HAVING', 'ORDER BY', 'LIMIT', 'OFFSET', ],
 		'UPDATE' => ['UPDATE', 'SET', 'WHERE', 'ORDER BY', 'LIMIT'],
 		'INSERT' => ['INSERT', 'INTO', 'VALUES', 'SELECT'],
 		'DELETE' => ['DELETE', 'FROM', 'USING', 'WHERE', 'ORDER BY', 'LIMIT'],
@@ -65,11 +65,11 @@ class Fluent implements IDataSource
 		'GROUP BY' => ',',
 		'HAVING' => 'AND',
 		'ORDER BY' => ',',
-		'LIMIT' => FALSE,
+		'LIMIT' => false,
-		'OFFSET' => FALSE,
+		'OFFSET' => false,
 		'SET' => ',',
 		'VALUES' => ',',
-		'INTO' => FALSE,
+		'INTO' => false,
 	];
 
 	/** @var array  clauses */
@@ -109,7 +109,7 @@ class Fluent implements IDataSource
 	{
 		$this->connection = $connection;
 
-		if (self::$normalizer === NULL) {
+		if (self::$normalizer === null) {
 			self::$normalizer = new HashMap([__CLASS__, '_formatClause']);
 		}
 	}
@@ -126,9 +126,9 @@ class Fluent implements IDataSource
 		$clause = self::$normalizer->$clause;
 
 		// lazy initialization
-		if ($this->command === NULL) {
+		if ($this->command === null) {
 			if (isset(self::$masks[$clause])) {
-				$this->clauses = array_fill_keys(self::$masks[$clause], NULL);
+				$this->clauses = array_fill_keys(self::$masks[$clause], null);
 			}
 			$this->cursor = &$this->clauses[$clause];
 			$this->cursor = [];
@@ -146,13 +146,13 @@ class Fluent implements IDataSource
 
 			// TODO: really delete?
 			if ($args === [self::REMOVE]) {
-				$this->cursor = NULL;
+				$this->cursor = null;
 				return $this;
 			}
 
 			if (isset(self::$separators[$clause])) {
 				$sep = self::$separators[$clause];
-				if ($sep === FALSE) { // means: replace
+				if ($sep === false) { // means: replace
 					$this->cursor = [];
 
 				} elseif (!empty($this->cursor)) {
@@ -169,15 +169,15 @@ class Fluent implements IDataSource
 			$this->cursor[] = $clause;
 		}
 
-		if ($this->cursor === NULL) {
+		if ($this->cursor === null) {
 			$this->cursor = [];
 		}
 
 		// special types or argument
 		if (count($args) === 1) {
 			$arg = $args[0];
-			// TODO: really ignore TRUE?
+			// TODO: really ignore true?
-			if ($arg === TRUE) { // flag
+			if ($arg === true) { // flag
 				return $this;
 
 			} elseif (is_string($arg) && preg_match('#^[a-z:_][a-z0-9_.:]*\z#i', $arg)) { // identifier
@@ -190,7 +190,7 @@ class Fluent implements IDataSource
 				} elseif (is_string(key($arg))) { // associative array
 					$args = ['%a', $arg];
 				}
-			} // case $arg === FALSE is handled above
+			} // case $arg === false is handled above
 		}
 
 		foreach ($args as $arg) {
@@ -212,7 +212,7 @@ class Fluent implements IDataSource
 	public function clause($clause)
 	{
 		$this->cursor = &$this->clauses[self::$normalizer->$clause];
-		if ($this->cursor === NULL) {
+		if ($this->cursor === null) {
 			$this->cursor = [];
 		}
 
@@ -227,7 +227,7 @@ class Fluent implements IDataSource
 	 */
 	public function removeClause($clause)
 	{
-		$this->clauses[self::$normalizer->$clause] = NULL;
+		$this->clauses[self::$normalizer->$clause] = null;
 		return $this;
 	}
 
@@ -238,11 +238,11 @@ class Fluent implements IDataSource
 	 * @param  bool  value
 	 * @return self
 	 */
-	public function setFlag($flag, $value = TRUE)
+	public function setFlag($flag, $value = true)
 	{
 		$flag = strtoupper($flag);
 		if ($value) {
-			$this->flags[$flag] = TRUE;
+			$this->flags[$flag] = true;
 		} else {
 			unset($this->flags[$flag]);
 		}
@@ -303,7 +303,7 @@ class Fluent implements IDataSource
 	 * @return Result|int  result set or number of affected rows
 	 * @throws Exception
 	 */
-	public function execute($return = NULL)
+	public function execute($return = null)
 	{
 		$res = $this->query($this->_export());
 		switch ($return) {
@@ -319,12 +319,12 @@ class Fluent implements IDataSource
 
 	/**
 	 * Generates, executes SQL query and fetches the single row.
-	 * @return Row|FALSE
+	 * @return Row|false
 	 */
 	public function fetch()
 	{
 		if ($this->command === 'SELECT' && !$this->clauses['LIMIT']) {
-			return $this->query($this->_export(NULL, ['%lmt', 1]))->fetch();
+			return $this->query($this->_export(null, ['%lmt', 1]))->fetch();
 		} else {
 			return $this->query($this->_export())->fetch();
 		}
@@ -333,12 +333,12 @@ class Fluent implements IDataSource
 
 	/**
 	 * Like fetch(), but returns only first field.
-	 * @return mixed  value on success, FALSE if no next record
+	 * @return mixed  value on success, false if no next record
 	 */
 	public function fetchSingle()
 	{
 		if ($this->command === 'SELECT' && !$this->clauses['LIMIT']) {
-			return $this->query($this->_export(NULL, ['%lmt', 1]))->fetchSingle();
+			return $this->query($this->_export(null, ['%lmt', 1]))->fetchSingle();
 		} else {
 			return $this->query($this->_export())->fetchSingle();
 		}
@@ -351,9 +351,9 @@ class Fluent implements IDataSource
 	 * @param  int  limit
 	 * @return array
 	 */
-	public function fetchAll($offset = NULL, $limit = NULL)
+	public function fetchAll($offset = null, $limit = null)
 	{
-		return $this->query($this->_export(NULL, ['%ofs %lmt', $offset, $limit]))->fetchAll();
+		return $this->query($this->_export(null, ['%ofs %lmt', $offset, $limit]))->fetchAll();
 	}
 
 
@@ -374,7 +374,7 @@ class Fluent implements IDataSource
 	 * @param  string  value
 	 * @return array
 	 */
-	public function fetchPairs($key = NULL, $value = NULL)
+	public function fetchPairs($key = null, $value = null)
 	{
 		return $this->query($this->_export())->fetchPairs($key, $value);
 	}
@@ -386,9 +386,9 @@ class Fluent implements IDataSource
 	 * @param  int  limit
 	 * @return ResultIterator
 	 */
-	public function getIterator($offset = NULL, $limit = NULL)
+	public function getIterator($offset = null, $limit = null)
 	{
-		return $this->query($this->_export(NULL, ['%ofs %lmt', $offset, $limit]))->getIterator();
+		return $this->query($this->_export(null, ['%ofs %lmt', $offset, $limit]))->getIterator();
 	}
 
 
@@ -397,7 +397,7 @@ class Fluent implements IDataSource
 	 * @param  string clause name
 	 * @return bool
 	 */
-	public function test($clause = NULL)
+	public function test($clause = null)
 	{
 		return $this->connection->test($this->_export($clause));
 	}
@@ -408,14 +408,14 @@ class Fluent implements IDataSource
 	 */
 	public function count()
 	{
-		return (int) $this->query([
+		return Helpers::intVal($this->query([
 			'SELECT COUNT(*) FROM (%ex', $this->_export(), ') [data]',
-		])->fetchSingle();
+		])->fetchSingle());
 	}
 
 
 	/**
-	 * @return Result
+	 * @return Result|int
 	 */
 	private function query($args)
 	{
@@ -449,6 +449,7 @@ class Fluent implements IDataSource
 			return $this->connection->translate($this->_export());
 		} catch (\Exception $e) {
 			trigger_error($e->getMessage(), E_USER_ERROR);
+			return '';
 		}
 	}
 
@@ -458,9 +459,9 @@ class Fluent implements IDataSource
 	 * @param  string clause name
 	 * @return array
 	 */
-	protected function _export($clause = NULL, $args = [])
+	protected function _export($clause = null, $args = [])
 	{
-		if ($clause === NULL) {
+		if ($clause === null) {
 			$data = $this->clauses;
 			if ($this->command === 'SELECT' && ($data['LIMIT'] || $data['OFFSET'])) {
 				$args = array_merge(['%lmt %ofs', $data['LIMIT'][0], $data['OFFSET'][0]], $args);
@@ -477,7 +478,7 @@ class Fluent implements IDataSource
 		}
 
 		foreach ($data as $clause => $statement) {
-			if ($statement !== NULL) {
+			if ($statement !== null) {
 				$args[] = $clause;
 				if ($clause === $this->command && $this->flags) {
 					$args[] = implode(' ', array_keys($this->flags));
@@ -517,5 +518,4 @@ class Fluent implements IDataSource
 		}
 		$this->cursor = &$foo;
 	}
-
 }

src/Dibi/HashMap.php

@@ -33,7 +33,6 @@ abstract class HashMapBase
 	{
 		return $this->callback;
 	}
-
 }
 
 
@@ -44,7 +43,6 @@ abstract class HashMapBase
  */
 final class HashMap extends HashMapBase
 {
-
 	public function __set($nm, $val)
 	{
 		if ($nm == '') {
@@ -63,5 +61,4 @@ final class HashMap extends HashMapBase
 			return $this->$nm = call_user_func($this->getCallback(), $nm);
 		}
 	}
-
 }

src/Dibi/Helpers.php

@@ -15,13 +15,14 @@ class Helpers
 	/** @var array */
 	private static $types;
 
+
 	/**
 	 * Prints out a syntax highlighted version of the SQL command or Result.
 	 * @param  string|Result
 	 * @param  bool  return output instead of printing it?
 	 * @return string
 	 */
-	public static function dump($sql = NULL, $return = FALSE)
+	public static function dump($sql = null, $return = false)
 	{
 		ob_start();
 		if ($sql instanceof Result && PHP_SAPI === 'cli') {
@@ -38,7 +39,7 @@ class Helpers
 				echo $hasColors ? "\033[1;37m#row: $i\033[0m\n" : "#row: $i\n";
 				foreach ($row as $col => $val) {
 					$spaces = $maxLen - mb_strlen($col) + 2;
-					echo "$col" . str_repeat(' ', $spaces) .  "$val\n";
+					echo "$col" . str_repeat(' ', $spaces) . "$val\n";
 				}
 				echo "\n";
 			}
@@ -50,14 +51,14 @@ class Helpers
 				if ($i === 0) {
 					echo "\n<table class=\"dump\">\n<thead>\n\t<tr>\n\t\t<th>#row</th>\n";
 					foreach ($row as $col => $foo) {
-						echo "\t\t<th>" . htmlSpecialChars((string) $col) . "</th>\n";
+						echo "\t\t<th>" . htmlspecialchars((string) $col) . "</th>\n";
 					}
 					echo "\t</tr>\n</thead>\n<tbody>\n";
 				}
 
 				echo "\t<tr>\n\t\t<th>", $i, "</th>\n";
 				foreach ($row as $col) {
-					echo "\t\t<td>", htmlSpecialChars((string) $col), "</td>\n";
+					echo "\t\t<td>", htmlspecialchars((string) $col), "</td>\n";
 				}
 				echo "\t</tr>\n";
 			}
@@ -67,7 +68,7 @@ class Helpers
 				: "</tbody>\n</table>\n";
 
 		} else {
-			if ($sql === NULL) {
+			if ($sql === null) {
 				$sql = \dibi::$sql;
 			}
 
@@ -106,7 +107,7 @@ class Helpers
 				echo trim($sql) . "\n\n";
 
 			} else {
-				$sql = htmlSpecialChars($sql);
+				$sql = htmlspecialchars($sql);
 				$sql = preg_replace_callback($highlighter, function ($m) {
 					if (!empty($m[1])) { // comment
 						return '<em style="color:gray">' . $m[1] . '</em>';
@@ -135,12 +136,12 @@ class Helpers
 
 	/**
 	 * Finds the best suggestion.
-	 * @return string|NULL
+	 * @return string|null
 	 * @internal
 	 */
 	public static function getSuggestion(array $items, $value)
 	{
-		$best = NULL;
+		$best = null;
 		$min = (strlen($value) / 4 + 1) * 10 + .1;
 		foreach (array_unique($items, SORT_REGULAR) as $item) {
 			$item = is_object($item) ? $item->getName() : $item;
@@ -175,7 +176,7 @@ class Helpers
 	/**
 	 * Heuristic type detection.
 	 * @param  string
-	 * @return string|NULL
+	 * @return string|null
 	 * @internal
 	 */
 	public static function detectType($type)
@@ -197,7 +198,7 @@ class Helpers
 				return $val;
 			}
 		}
-		return NULL;
+		return null;
 	}
 
 
@@ -206,7 +207,7 @@ class Helpers
 	 */
 	public static function getTypeCache()
 	{
-		if (self::$types === NULL) {
+		if (self::$types === null) {
 			self::$types = new HashMap([__CLASS__, 'detectType']);
 		}
 		return self::$types;
@@ -238,7 +239,7 @@ class Helpers
 	 * Import SQL dump from file.
 	 * @return int  count of sql commands
 	 */
-	public static function loadFromFile(Connection $connection, $file)
+	public static function loadFromFile(Connection $connection, $file, callable $onProgress = null)
 	{
 		@set_time_limit(0); // intentionally @
 
@@ -247,31 +248,55 @@ class Helpers
 			throw new \RuntimeException("Cannot open file '$file'.");
 		}
 
-		$count = 0;
+		$stat = fstat($handle);
+		$count = $size = 0;
 		$delimiter = ';';
 		$sql = '';
 		$driver = $connection->getDriver();
-		while (!feof($handle)) {
+		while (($s = fgets($handle)) !== false) {
-			$s = rtrim(fgets($handle));
+			$size += strlen($s);
-			if (substr($s, 0, 10) === 'DELIMITER ') {
+			if (strtoupper(substr($s, 0, 10)) === 'DELIMITER ') {
-				$delimiter = substr($s, 10);
+				$delimiter = trim(substr($s, 10));
 
-			} elseif (substr($s, -strlen($delimiter)) === $delimiter) {
+			} elseif (substr($ts = rtrim($s), -strlen($delimiter)) === $delimiter) {
-				$sql .= substr($s, 0, -strlen($delimiter));
+				$sql .= substr($ts, 0, -strlen($delimiter));
 				$driver->query($sql);
 				$sql = '';
 				$count++;
+				if ($onProgress) {
+					call_user_func($onProgress, $count, isset($stat['size']) ? $size * 100 / $stat['size'] : null);
+				}
 
 			} else {
-				$sql .= $s . "\n";
+				$sql .= $s;
 			}
 		}
-		if (trim($sql) !== '') {
+
+		if (rtrim($sql) !== '') {
 			$driver->query($sql);
 			$count++;
+			if ($onProgress) {
+				call_user_func($onProgress, $count, isset($stat['size']) ? 100 : null);
+			}
 		}
 		fclose($handle);
 		return $count;
 	}
 
+
+	/**
+	 * @internal
+	 * @return string|int
+	 */
+	public static function intVal($value)
+	{
+		if (is_int($value)) {
+			return $value;
+		} elseif (is_string($value) && preg_match('#-?\d++\z#A', $value)) {
+			// support for long numbers - keep them unchanged
+			return is_float($number = $value * 1) ? $value : $number;
+		} else {
+			throw new Exception("Expected number, '$value' given.");
+		}
+	}
 }

src/Dibi/Literal.php

@@ -32,5 +32,4 @@ class Literal
 	{
 		return $this->value;
 	}
-
 }

src/Dibi/Loggers/FileLogger.php

@@ -24,7 +24,7 @@ class FileLogger
 	public $filter;
 
 
-	public function __construct($file, $filter = NULL)
+	public function __construct($file, $filter = null)
 	{
 		$this->file = $file;
 		$this->filter = $filter ? (int) $filter : Dibi\Event::QUERY;
@@ -72,5 +72,4 @@ class FileLogger
 		}
 		fclose($handle);
 	}
-
 }

src/Dibi/Loggers/FirePhpLogger.php

@@ -48,7 +48,7 @@ class FirePhpLogger
 	}
 
 
-	public function __construct($filter = NULL)
+	public function __construct($filter = null)
 	{
 		$this->filter = $filter ? (int) $filter : Dibi\Event::QUERY;
 	}
@@ -91,5 +91,4 @@ class FirePhpLogger
 		}
 		header("X-Wf-dibi-1-1-d$num: |$s|");
 	}
-
 }

src/Dibi/Reflection/Column.php

@@ -19,24 +19,24 @@ use Dibi\Type;
  * @property-read Table $table
  * @property-read string $type
  * @property-read mixed $nativeType
- * @property-read int|NULL $size
+ * @property-read int|null $size
- * @property-read bool|NULL $unsigned
+ * @property-read bool|null $unsigned
- * @property-read bool|NULL $nullable
+ * @property-read bool|null $nullable
- * @property-read bool|NULL $autoIncrement
+ * @property-read bool|null $autoIncrement
  * @property-read mixed $default
  */
 class Column
 {
 	use Dibi\Strict;
 
-	/** @var Dibi\Reflector|NULL when created by Result */
+	/** @var Dibi\Reflector|null when created by Result */
 	private $reflector;
 
 	/** @var array (name, nativetype, [table], [fullname], [size], [nullable], [default], [autoincrement], [vendor]) */
 	private $info;
 
 
-	public function __construct(Dibi\Reflector $reflector = NULL, array $info)
+	public function __construct(Dibi\Reflector $reflector = null, array $info)
 	{
 		$this->reflector = $reflector;
 		$this->info = $info;
@@ -57,7 +57,7 @@ class Column
 	 */
 	public function getFullName()
 	{
-		return isset($this->info['fullname']) ? $this->info['fullname'] : NULL;
+		return isset($this->info['fullname']) ? $this->info['fullname'] : null;
 	}
 
 
@@ -76,18 +76,18 @@ class Column
 	public function getTable()
 	{
 		if (empty($this->info['table']) || !$this->reflector) {
-			throw new Dibi\Exception("Table is unknown or not available.");
+			throw new Dibi\Exception('Table is unknown or not available.');
 		}
 		return new Table($this->reflector, ['name' => $this->info['table']]);
 	}
 
 
 	/**
-	 * @return string|NULL
+	 * @return string|null
 	 */
 	public function getTableName()
 	{
-		return isset($this->info['table']) && $this->info['table'] != NULL ? $this->info['table'] : NULL; // intentionally ==
+		return isset($this->info['table']) && $this->info['table'] != null ? $this->info['table'] : null; // intentionally ==
 	}
 
 
@@ -110,38 +110,38 @@ class Column
 
 
 	/**
-	 * @return int|NULL
+	 * @return int|null
 	 */
 	public function getSize()
 	{
-		return isset($this->info['size']) ? (int) $this->info['size'] : NULL;
+		return isset($this->info['size']) ? (int) $this->info['size'] : null;
 	}
 
 
 	/**
-	 * @return bool|NULL
+	 * @return bool|null
 	 */
 	public function isUnsigned()
 	{
-		return isset($this->info['unsigned']) ? (bool) $this->info['unsigned'] : NULL;
+		return isset($this->info['unsigned']) ? (bool) $this->info['unsigned'] : null;
 	}
 
 
 	/**
-	 * @return bool|NULL
+	 * @return bool|null
 	 */
 	public function isNullable()
 	{
-		return isset($this->info['nullable']) ? (bool) $this->info['nullable'] : NULL;
+		return isset($this->info['nullable']) ? (bool) $this->info['nullable'] : null;
 	}
 
 
 	/**
-	 * @return bool|NULL
+	 * @return bool|null
 	 */
 	public function isAutoIncrement()
 	{
-		return isset($this->info['autoincrement']) ? (bool) $this->info['autoincrement'] : NULL;
+		return isset($this->info['autoincrement']) ? (bool) $this->info['autoincrement'] : null;
 	}
 
 
@@ -150,7 +150,7 @@ class Column
 	 */
 	public function getDefault()
 	{
-		return isset($this->info['default']) ? $this->info['default'] : NULL;
+		return isset($this->info['default']) ? $this->info['default'] : null;
 	}
 
 
@@ -160,7 +160,6 @@ class Column
 	 */
 	public function getVendorInfo($key)
 	{
-		return isset($this->info['vendor'][$key]) ? $this->info['vendor'][$key] : NULL;
+		return isset($this->info['vendor'][$key]) ? $this->info['vendor'][$key] : null;
 	}
-
 }

src/Dibi/Reflection/Database.php

@@ -104,12 +104,11 @@ class Database
 	 */
 	protected function init()
 	{
-		if ($this->tables === NULL) {
+		if ($this->tables === null) {
 			$this->tables = [];
 			foreach ($this->reflector->getTables() as $info) {
 				$this->tables[strtolower($info['name'])] = new Table($this->reflector, $info);
 			}
 		}
 	}
-
 }

src/Dibi/Reflection/ForeignKey.php

@@ -50,5 +50,4 @@ class ForeignKey
 	{
 		return $this->references;
 	}
-
 }

src/Dibi/Reflection/Index.php

@@ -66,5 +66,4 @@ class Index
 	{
 		return !empty($this->info['primary']);
 	}
-
 }

src/Dibi/Reflection/Result.php

@@ -50,7 +50,7 @@ class Result
 	 * @param  bool
 	 * @return string[]
 	 */
-	public function getColumnNames($fullNames = FALSE)
+	public function getColumnNames($fullNames = false)
 	{
 		$this->initColumns();
 		$res = [];
@@ -94,13 +94,12 @@ class Result
 	 */
 	protected function initColumns()
 	{
-		if ($this->columns === NULL) {
+		if ($this->columns === null) {
 			$this->columns = [];
-			$reflector = $this->driver instanceof Dibi\Reflector ? $this->driver : NULL;
+			$reflector = $this->driver instanceof Dibi\Reflector ? $this->driver : null;
 			foreach ($this->driver->getResultColumns() as $info) {
 				$this->columns[] = $this->names[strtolower($info['name'])] = new Column($reflector, $info);
 			}
 		}
 	}
-
 }

src/Dibi/Reflection/Table.php

@@ -160,7 +160,7 @@ class Table
 	 */
 	protected function initColumns()
 	{
-		if ($this->columns === NULL) {
+		if ($this->columns === null) {
 			$this->columns = [];
 			foreach ($this->reflector->getColumns($this->name) as $info) {
 				$this->columns[strtolower($info['name'])] = new Column($this->reflector, $info);
@@ -174,7 +174,7 @@ class Table
 	 */
 	protected function initIndexes()
 	{
-		if ($this->indexes === NULL) {
+		if ($this->indexes === null) {
 			$this->initColumns();
 			$this->indexes = [];
 			foreach ($this->reflector->getIndexes($this->name) as $info) {
@@ -197,5 +197,4 @@ class Table
 	{
 		throw new Dibi\NotImplementedException;
 	}
-
 }

src/Dibi/Result.php

@@ -40,7 +40,7 @@ class Result implements IDataSource
 	private $meta;
 
 	/** @var bool  Already fetched? Used for allowance for first seek(0) */
-	private $fetched = FALSE;
+	private $fetched = false;
 
 	/** @var string  returned object class */
 	private $rowClass = 'Dibi\Row';
@@ -78,9 +78,9 @@ class Result implements IDataSource
 	 */
 	final public function free()
 	{
-		if ($this->driver !== NULL) {
+		if ($this->driver !== null) {
 			$this->driver->free();
-			$this->driver = $this->meta = NULL;
+			$this->driver = $this->meta = null;
 		}
 	}
 
@@ -92,7 +92,7 @@ class Result implements IDataSource
 	 */
 	final public function getResultDriver()
 	{
-		if ($this->driver === NULL) {
+		if ($this->driver === null) {
 			throw new \RuntimeException('Result-set was released from memory.');
 		}
 
@@ -106,12 +106,14 @@ class Result implements IDataSource
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
-	 * @return bool     TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool     true on success, false if unable to seek to specified record
 	 * @throws Exception
 	 */
 	final public function seek($row)
 	{
-		return ($row !== 0 || $this->fetched) ? (bool) $this->getResultDriver()->seek($row) : TRUE;
+		return ($row != 0 || $this->fetched) // intentionally ==
+			? (bool) $this->getResultDriver()->seek($row)
+			: true;
 	}
 
 
@@ -184,15 +186,15 @@ 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|FALSE
+	 * @return Row|false
 	 */
 	final public function fetch()
 	{
-		$row = $this->getResultDriver()->fetch(TRUE);
+		$row = $this->getResultDriver()->fetch(true);
 		if (!is_array($row)) {
-			return FALSE;
+			return false;
 		}
-		$this->fetched = TRUE;
+		$this->fetched = true;
 		$this->normalize($row);
 		if ($this->rowFactory) {
 			return call_user_func($this->rowFactory, $row);
@@ -205,15 +207,15 @@ class Result implements IDataSource
 
 	/**
 	 * Like fetch(), but returns only first field.
-	 * @return mixed value on success, FALSE if no next record
+	 * @return mixed value on success, false if no next record
 	 */
 	final public function fetchSingle()
 	{
-		$row = $this->getResultDriver()->fetch(TRUE);
+		$row = $this->getResultDriver()->fetch(true);
 		if (!is_array($row)) {
-			return FALSE;
+			return false;
 		}
-		$this->fetched = TRUE;
+		$this->fetched = true;
 		$this->normalize($row);
 		return reset($row);
 	}
@@ -225,10 +227,10 @@ class Result implements IDataSource
 	 * @param  int  limit
 	 * @return Row[]
 	 */
-	final public function fetchAll($offset = NULL, $limit = NULL)
+	final public function fetchAll($offset = null, $limit = null)
 	{
-		$limit = $limit === NULL ? -1 : (int) $limit;
+		$limit = $limit === null ? -1 : Helpers::intVal($limit);
-		$this->seek((int) $offset);
+		$this->seek($offset);
 		$row = $this->fetch();
 		if (!$row) {
 			return [];  // empty result set
@@ -260,7 +262,7 @@ class Result implements IDataSource
 	 */
 	final public function fetchAssoc($assoc)
 	{
-		if (strpos($assoc, ',') !== FALSE) {
+		if (strpos($assoc, ',') !== false) {
 			return $this->oldFetchAssoc($assoc);
 		}
 
@@ -270,12 +272,12 @@ class Result implements IDataSource
 			return [];  // empty result set
 		}
 
-		$data = NULL;
+		$data = null;
 		$assoc = preg_split('#(\[\]|->|=|\|)#', $assoc, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		// check columns
 		foreach ($assoc as $as) {
-			// offsetExists ignores NULL in PHP 5.2.1, isset() surprisingly NULL accepts
+			// offsetExists ignores null in PHP 5.2.1, isset() surprisingly null accepts
 			if ($as !== '[]' && $as !== '=' && $as !== '->' && $as !== '|' && !property_exists($row, $as)) {
 				throw new \InvalidArgumentException("Unknown column '$as' in associative descriptor.");
 			}
@@ -303,10 +305,10 @@ class Result implements IDataSource
 					continue 2;
 
 				} elseif ($as === '->') { // "object" node
-					if ($x === NULL) {
+					if ($x === null) {
 						$x = clone $row;
 						$x = &$x->{$assoc[$i + 1]};
-						$x = NULL; // prepare child node
+						$x = null; // prepare child node
 					} else {
 						$x = &$x->{$assoc[$i + 1]};
 					}
@@ -316,10 +318,9 @@ class Result implements IDataSource
 				}
 			}
 
-			if ($x === NULL) { // build leaf
+			if ($x === null) { // build leaf
 				$x = $row;
 			}
-
 		} while ($row = $this->fetch());
 
 		unset($x);
@@ -338,7 +339,7 @@ class Result implements IDataSource
 			return [];  // empty result set
 		}
 
-		$data = NULL;
+		$data = null;
 		$assoc = explode(',', $assoc);
 
 		// strip leading = and @
@@ -363,19 +364,19 @@ class Result implements IDataSource
 					$x = &$x[];
 
 				} elseif ($as === '=') { // "record" node
-					if ($x === NULL) {
+					if ($x === null) {
 						$x = $row->toArray();
-						$x = &$x[ $assoc[$i + 1] ];
+						$x = &$x[$assoc[$i + 1]];
-						$x = NULL; // prepare child node
+						$x = null; // prepare child node
 					} else {
-						$x = &$x[ $assoc[$i + 1] ];
+						$x = &$x[$assoc[$i + 1]];
 					}
 
 				} elseif ($as === '@') { // "object" node
-					if ($x === NULL) {
+					if ($x === null) {
 						$x = clone $row;
 						$x = &$x->{$assoc[$i + 1]};
-						$x = NULL; // prepare child node
+						$x = null; // prepare child node
 					} else {
 						$x = &$x->{$assoc[$i + 1]};
 					}
@@ -385,14 +386,13 @@ class Result implements IDataSource
 				}
 			}
 
-			if ($x === NULL) { // build leaf
+			if ($x === null) { // build leaf
 				if ($leaf === '=') {
 					$x = $row->toArray();
 				} else {
 					$x = $row;
 				}
 			}
-
 		} while ($row = $this->fetch());
 
 		unset($x);
@@ -407,7 +407,7 @@ class Result implements IDataSource
 	 * @return array
 	 * @throws \InvalidArgumentException
 	 */
-	final public function fetchPairs($key = NULL, $value = NULL)
+	final public function fetchPairs($key = null, $value = null)
 	{
 		$this->seek(0);
 		$row = $this->fetch();
@@ -417,8 +417,8 @@ class Result implements IDataSource
 
 		$data = [];
 
-		if ($value === NULL) {
+		if ($value === null) {
-			if ($key !== NULL) {
+			if ($key !== null) {
 				throw new \InvalidArgumentException('Either none or both columns must be specified.');
 			}
 
@@ -439,7 +439,7 @@ class Result implements IDataSource
 				throw new \InvalidArgumentException("Unknown value column '$value'.");
 			}
 
-			if ($key === NULL) { // indexed-array
+			if ($key === null) { // indexed-array
 				do {
 					$data[] = $row[$value];
 				} while ($row = $this->fetch());
@@ -452,7 +452,7 @@ class Result implements IDataSource
 		}
 
 		do {
-			$data[ (string) $row[$key] ] = $row[$value];
+			$data[(string) $row[$key]] = $row[$value];
 		} while ($row = $this->fetch());
 
 		return $data;
@@ -486,7 +486,7 @@ class Result implements IDataSource
 	private function normalize(array &$row)
 	{
 		foreach ($this->types as $key => $type) {
-			if (!isset($row[$key])) { // NULL
+			if (!isset($row[$key])) { // null
 				continue;
 			}
 			$value = $row[$key];
@@ -501,7 +501,7 @@ class Result implements IDataSource
 			} elseif ($type === Type::FLOAT) {
 				$value = ltrim((string) $value, '0');
 				$p = strpos($value, '.');
-				if ($p !== FALSE) {
+				if ($p !== false) {
 					$value = rtrim(rtrim($value, '0'), '.');
 				}
 				if ($value === '' || $value[0] === '.') {
@@ -515,11 +515,11 @@ 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 && substr((string) $value, 0, 3) !== '000') { // '', null, false, '0000-00-00', ...
 					$value = new DateTime($value);
 					$row[$key] = empty($this->formats[$type]) ? $value : $value->format($this->formats[$type]);
 				} else {
-					$row[$key] = NULL;
+					$row[$key] = null;
 				}
 
 			} elseif ($type === Type::TIME_INTERVAL) {
@@ -553,14 +553,14 @@ class Result implements IDataSource
 	 */
 	final public function getType($col)
 	{
-		return isset($this->types[$col]) ? $this->types[$col] : NULL;
+		return isset($this->types[$col]) ? $this->types[$col] : null;
 	}
 
 
 	/**
 	 * Sets date format.
 	 * @param  string
-	 * @param  string|NULL  format
+	 * @param  string|null  format
 	 * @return self
 	 */
 	final public function setFormat($type, $format)
@@ -572,11 +572,11 @@ class Result implements IDataSource
 
 	/**
 	 * Returns data format.
-	 * @return string|NULL
+	 * @return string|null
 	 */
 	final public function getFormat($type)
 	{
-		return isset($this->formats[$type]) ? $this->formats[$type] : NULL;
+		return isset($this->formats[$type]) ? $this->formats[$type] : null;
 	}
 
 
@@ -589,7 +589,7 @@ class Result implements IDataSource
 	 */
 	public function getInfo()
 	{
-		if ($this->meta === NULL) {
+		if ($this->meta === null) {
 			$this->meta = new Reflection\Result($this->getResultDriver());
 		}
 		return $this->meta;
@@ -616,5 +616,4 @@ class Result implements IDataSource
 	{
 		echo Helpers::dump($this);
 	}
-
 }

src/Dibi/ResultIterator.php

@@ -104,5 +104,4 @@ class ResultIterator implements \Iterator, \Countable
 	{
 		return $this->result->getRowCount();
 	}
-
 }

src/Dibi/Row.php

@@ -13,7 +13,6 @@ namespace Dibi;
  */
 class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 {
-
 	public function __construct($arr)
 	{
 		foreach ($arr as $k => $v) {
@@ -34,16 +33,16 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 	 * @param  string format
 	 * @return \DateTime
 	 */
-	public function asDateTime($key, $format = NULL)
+	public function asDateTime($key, $format = null)
 	{
 		$time = $this[$key];
 		if (!$time instanceof DateTime) {
-			if (!$time || substr((string) $time, 0, 3) === '000') { // '', NULL, FALSE, '0000-00-00', ...
+			if (!$time || substr((string) $time, 0, 3) === '000') { // '', null, false, '0000-00-00', ...
-				return NULL;
+				return null;
 			}
 			$time = new DateTime($time);
 		}
-		return $format === NULL ? $time : $time->format($format);
+		return $format === null ? $time : $time->format($format);
 	}
 
 
@@ -91,5 +90,4 @@ class Row implements \ArrayAccess, \IteratorAggregate, \Countable
 	{
 		unset($this->$nm);
 	}
-
 }

src/Dibi/Strict.php

@@ -88,7 +88,7 @@ trait Strict
 	 */
 	public function __isset($name)
 	{
-		return FALSE;
+		return false;
 	}
 
 
@@ -108,29 +108,29 @@ trait Strict
 	 * @param  callable
 	 * @return mixed
 	 */
-	public static function extensionMethod($name, $callback = NULL)
+	public static function extensionMethod($name, $callback = null)
 	{
-		if (strpos($name, '::') === FALSE) {
+		if (strpos($name, '::') === false) {
 			$class = get_called_class();
 		} else {
 			list($class, $name) = explode('::', $name);
 			$class = (new ReflectionClass($class))->getName();
 		}
 
-		if (self::$extMethods === NULL) { // for backwards compatibility
+		if (self::$extMethods === null) { // for backwards compatibility
 			$list = get_defined_functions();
 			foreach ($list['user'] as $fce) {
 				$pair = explode('_prototype_', $fce);
 				if (count($pair) === 2) {
 					trigger_error("Extension method defined as $fce() is deprecated, use $class::extensionMethod('$name', ...).", E_USER_DEPRECATED);
 					self::$extMethods[$pair[1]][(new ReflectionClass($pair[0]))->getName()] = $fce;
-					self::$extMethods[$pair[1]][''] = NULL;
+					self::$extMethods[$pair[1]][''] = null;
 				}
 			}
 		}
 
-		$list = & self::$extMethods[strtolower($name)];
+		$list = &self::$extMethods[strtolower($name)];
-		if ($callback === NULL) { // getter
+		if ($callback === null) { // getter
 			$cache = &$list[''][$class];
 			if (isset($cache)) {
 				return $cache;
@@ -141,12 +141,11 @@ trait Strict
 					return $cache = $list[$cl];
 				}
 			}
-			return $cache = FALSE;
+			return $cache = false;
 
 		} else { // setter
 			$list[$class] = $callback;
-			$list[''] = NULL;
+			$list[''] = null;
 		}
 	}
-
 }

src/Dibi/Translator.php

@@ -31,7 +31,7 @@ final class Translator
 	private $errors;
 
 	/** @var bool */
-	private $comment = FALSE;
+	private $comment = false;
 
 	/** @var int */
 	private $ifLevel = 0;
@@ -71,8 +71,8 @@ final class Translator
 		}
 		$this->args = $args;
 
-		$commandIns = NULL;
+		$commandIns = null;
-		$lastArr = NULL;
+		$lastArr = null;
 		$cursor = &$this->cursor;
 		$comment = &$this->comment;
 
@@ -127,7 +127,7 @@ final class Translator
 
 			if (is_array($arg) && is_string(key($arg))) {
 				// associative array -> autoselect between SET or VALUES & LIST
-				if ($commandIns === NULL) {
+				if ($commandIns === null) {
 					$commandIns = strtoupper(substr(ltrim($this->args[0]), 0, 6));
 					$commandIns = $commandIns === 'INSERT' || $commandIns === 'REPLAC';
 					$sql[] = $this->formatValue($arg, $commandIns ? 'v' : 'a');
@@ -142,7 +142,7 @@ final class Translator
 			}
 
 			// default processing
-			$sql[] = $this->formatValue($arg, FALSE);
+			$sql[] = $this->formatValue($arg, false);
 		} // while
 
 
@@ -157,7 +157,7 @@ final class Translator
 		}
 
 		// apply limit
-		if ($this->limit !== NULL || $this->offset !== NULL) {
+		if ($this->limit !== null || $this->offset !== null) {
 			$this->driver->applyLimit($sql, $this->limit, $this->offset);
 		}
 
@@ -196,7 +196,7 @@ final class Translator
 							$pair = explode('%', $k, 2); // split into identifier & modifier
 							$k = $this->identifiers->{$pair[0]} . ' ';
 							if (!isset($pair[1])) {
-								$v = $this->formatValue($v, FALSE);
+								$v = $this->formatValue($v, false);
 								$vx[] = $k . ($v === 'NULL' ? 'IS ' : '= ') . $v;
 
 							} elseif ($pair[1] === 'ex') {
@@ -206,7 +206,7 @@ final class Translator
 								$v = $this->formatValue($v, $pair[1]);
 								if ($pair[1] === 'l' || $pair[1] === 'in') {
 									$op = 'IN ';
-								} elseif (strpos($pair[1], 'like') !== FALSE) {
+								} elseif (strpos($pair[1], 'like') !== false) {
 									$op = 'LIKE ';
 								} elseif ($v === 'NULL') {
 									$op = 'IS ';
@@ -238,7 +238,7 @@ final class Translator
 					foreach ($value as $k => $v) {
 						$pair = explode('%', $k, 2); // split into identifier & modifier
 						$vx[] = $this->identifiers->{$pair[0]} . '='
-							. $this->formatValue($v, isset($pair[1]) ? $pair[1] : (is_array($v) ? 'ex' : FALSE));
+							. $this->formatValue($v, isset($pair[1]) ? $pair[1] : (is_array($v) ? 'ex' : false));
 					}
 					return implode(', ', $vx);
 
@@ -247,7 +247,7 @@ final class Translator
 				case 'l': // (val, val, ...)
 					foreach ($value as $k => $v) {
 						$pair = explode('%', (string) $k, 2); // split into identifier & modifier
-						$vx[] = $this->formatValue($v, isset($pair[1]) ? $pair[1] : (is_array($v) ? 'ex' : FALSE));
+						$vx[] = $this->formatValue($v, isset($pair[1]) ? $pair[1] : (is_array($v) ? 'ex' : false));
 					}
 					return '(' . (($vx || $modifier === 'l') ? implode(', ', $vx) : 'NULL') . ')';
 
@@ -256,7 +256,7 @@ final class Translator
 					foreach ($value as $k => $v) {
 						$pair = explode('%', $k, 2); // split into identifier & modifier
 						$kx[] = $this->identifiers->{$pair[0]};
-						$vx[] = $this->formatValue($v, isset($pair[1]) ? $pair[1] : (is_array($v) ? 'ex' : FALSE));
+						$vx[] = $this->formatValue($v, isset($pair[1]) ? $pair[1] : (is_array($v) ? 'ex' : false));
 					}
 					return '(' . implode(', ', $kx) . ') VALUES (' . implode(', ', $vx) . ')';
 
@@ -277,7 +277,7 @@ final class Translator
 						$pair = explode('%', $k, 2); // split into identifier & modifier
 						$kx[] = $this->identifiers->{$pair[0]};
 						foreach ($v as $k2 => $v2) {
-							$vx[$k2][] = $this->formatValue($v2, isset($pair[1]) ? $pair[1] : (is_array($v2) ? 'ex' : FALSE));
+							$vx[$k2][] = $this->formatValue($v2, isset($pair[1]) ? $pair[1] : (is_array($v2) ? 'ex' : false));
 						}
 					}
 					foreach ($vx as $k => $v) {
@@ -313,10 +313,10 @@ final class Translator
 
 		// with modifier procession
 		if ($modifier) {
-			if ($value !== NULL && !is_scalar($value)) {  // array is already processed
+			if ($value !== null && !is_scalar($value)) {  // array is already processed
 				if ($value instanceof Literal && ($modifier === 'sql' || $modifier === 'SQL')) {
 					$modifier = 'SQL';
-				} elseif (($value instanceof \DateTime || $value instanceof \DateTimeInterface) && ($modifier === 'd' || $modifier === 't')) {
+				} elseif (($value instanceof \DateTime || $value instanceof \DateTimeInterface) && ($modifier === 'd' || $modifier === 't' || $modifier === 'dt')) {
 					// continue
 				} else {
 					$type = is_object($value) ? get_class($value) : gettype($value);
@@ -326,59 +326,65 @@ final class Translator
 
 			switch ($modifier) {
 				case 's':  // string
-					return $value === NULL ? 'NULL' : $this->driver->escapeText((string) $value);
+					return $value === null ? 'NULL' : $this->driver->escapeText((string) $value);
 
 				case 'bin':// binary
-					return $value === NULL ? 'NULL' : $this->driver->escapeBinary($value);
+					return $value === null ? 'NULL' : $this->driver->escapeBinary($value);
 
 				case 'b':  // boolean
-					return $value === NULL ? 'NULL' : $this->driver->escapeBool($value);
+					return $value === null ? 'NULL' : $this->driver->escapeBool($value);
 
-				case 'sN': // string or NULL
+				case 'sN': // string or null
 				case 'sn':
 					return $value == '' ? 'NULL' : $this->driver->escapeText((string) $value); // notice two equal signs
 
 				case 'in': // deprecated
 					trigger_error('Modifier %in is deprecated, use %iN.', E_USER_DEPRECATED);
-					// intentionally break omitted
+					// break omitted
-
+				case 'iN': // signed int or null
-				case 'iN': // signed int or NULL
 					if ($value == '') {
-						$value = NULL;
+						$value = null;
 					}
-					// intentionally break omitted
+					// break omitted
-
 				case 'i':  // signed int
 				case 'u':  // unsigned int, ignored
-					if ($value === NULL) {
+					if ($value === null) {
 						return 'NULL';
-					} elseif (is_string($value) && preg_match('#[+-]?\d++(?:e\d+)?\z#A', $value)) {
+					} elseif (is_string($value)) {
-						return $value; // support for long numbers - keep them unchanged
+						if (preg_match('#[+-]?\d++(?:e\d+)?\z#A', $value)) {
-					} elseif (is_string($value) && substr($value, 1, 1) === 'x' && is_numeric($value)) {
+							return $value; // support for long numbers - keep them unchanged
-						trigger_error('Support for hex strings has been deprecated.', E_USER_DEPRECATED);
+						} elseif (substr($value, 1, 1) === 'x' && is_numeric($value)) {
-						return (string) hexdec($value);
+							trigger_error('Support for hex strings has been deprecated.', E_USER_DEPRECATED);
+							return (string) hexdec($value);
+						} else {
+							throw new Exception("Expected number, '$value' given.");
+						}
 					} else {
 						return (string) (int) $value;
 					}
-
+					// break omitted
 				case 'f':  // float
-					if ($value === NULL) {
+					if ($value === null) {
 						return 'NULL';
-					} elseif (is_string($value) && is_numeric($value) && substr($value, 1, 1) !== 'x') {
+					} elseif (is_string($value)) {
-						return $value; // support for extreme numbers - keep them unchanged
+						if (is_numeric($value) && substr($value, 1, 1) !== 'x') {
+							return $value; // support for long numbers - keep them unchanged
+						} else {
+							throw new Exception("Expected number, '$value' given.");
+						}
 					} else {
 						return rtrim(rtrim(number_format($value + 0, 10, '.', ''), '0'), '.');
 					}
-
+					// break omitted
 				case 'd':  // date
 				case 't':  // datetime
 				case 'dt': // datetime
-					if ($value === NULL) {
+					if ($value === null) {
 						return 'NULL';
 					} else {
 						return $modifier === 'd' ? $this->driver->escapeDate($value) : $this->driver->escapeDateTime($value);
 					}
-
+					// break omitted
 				case 'by':
 				case 'n':  // composed identifier name
 					return $this->identifiers->$value;
@@ -443,7 +449,7 @@ final class Translator
 		} elseif (is_bool($value)) {
 			return $this->driver->escapeBool($value);
 
-		} elseif ($value === NULL) {
+		} elseif ($value === null) {
 			return 'NULL';
 
 		} elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
@@ -452,6 +458,9 @@ final class Translator
 		} elseif ($value instanceof Literal) {
 			return (string) $value;
 
+		} elseif ($value instanceof Expression) {
+			return call_user_func_array([$this->connection, 'translate'], $value->getValues());
+
 		} else {
 			$type = is_object($value) ? get_class($value) : gettype($value);
 			return $this->errors[] = "**Unexpected $type**";
@@ -487,7 +496,7 @@ final class Translator
 			}
 
 			$cursor++;
-			return $this->formatValue($this->args[$cursor - 1], FALSE);
+			return $this->formatValue($this->args[$cursor - 1], false);
 		}
 
 		if (!empty($matches[10])) { // modifier
@@ -504,7 +513,7 @@ final class Translator
 				if (!$this->comment && !$this->args[$cursor - 1]) {
 					// open comment
 					$this->ifLevelStart = $this->ifLevel;
-					$this->comment = TRUE;
+					$this->comment = true;
 					return '/*';
 				}
 				return '';
@@ -512,11 +521,11 @@ final class Translator
 			} elseif ($mod === 'else') {
 				if ($this->ifLevelStart === $this->ifLevel) {
 					$this->ifLevelStart = 0;
-					$this->comment = FALSE;
+					$this->comment = false;
 					return '*/';
 				} elseif (!$this->comment) {
 					$this->ifLevelStart = $this->ifLevel;
-					$this->comment = TRUE;
+					$this->comment = true;
 					return '/*';
 				}
 
@@ -525,7 +534,7 @@ final class Translator
 				if ($this->ifLevelStart === $this->ifLevel + 1) {
 					// close comment
 					$this->ifLevelStart = 0;
-					$this->comment = FALSE;
+					$this->comment = false;
 					return '*/';
 				}
 				return '';
@@ -536,21 +545,21 @@ final class Translator
 
 			} elseif ($mod === 'lmt') { // apply limit
 				$arg = $this->args[$cursor++];
-				if ($arg === NULL) {
+				if ($arg === null) {
 				} elseif ($this->comment) {
 					return "(limit $arg)";
 				} else {
-					$this->limit = (int) $arg;
+					$this->limit = Helpers::intVal($arg);
 				}
 				return '';
 
 			} elseif ($mod === 'ofs') { // apply offset
 				$arg = $this->args[$cursor++];
-				if ($arg === NULL) {
+				if ($arg === null) {
 				} elseif ($this->comment) {
 					return "(offset $arg)";
 				} else {
-					$this->offset = (int) $arg;
+					$this->offset = Helpers::intVal($arg);
 				}
 				return '';
 
@@ -583,7 +592,7 @@ final class Translator
 		if ($matches[8]) { // SQL identifier substitution
 			$m = substr($matches[8], 0, -1);
 			$m = $this->connection->getSubstitutes()->$m;
-			return $matches[9] == '' ? $this->formatValue($m, FALSE) : $m . $matches[9]; // value or identifier
+			return $matches[9] == '' ? $this->formatValue($m, false) : $m . $matches[9]; // value or identifier
 		}
 
 		throw new \Exception('this should be never executed');
@@ -607,5 +616,4 @@ final class Translator
 		}
 		return implode('.', $parts);
 	}
-
 }

src/Dibi/Type.php

@@ -24,9 +24,9 @@ class Type
 		TIME = 't',
 		TIME_INTERVAL = 'ti';
 
+
 	final public function __construct()
 	{
 		throw new \LogicException('Cannot instantiate static class ' . __CLASS__);
 	}
-
 }

src/Dibi/dibi.php

@@ -22,8 +22,8 @@ class dibi
 
 	/** version */
 	const
-		VERSION = '3.0.8',
+		VERSION = '3.1.0',
-		REVISION = 'released on 2017-06-09';
+		REVISION = 'released on 2017-09-25';
 
 	/** sorting order */
 	const
@@ -49,12 +49,6 @@ class dibi
 		FIELD_DATETIME = Type::DATETIME,
 		FIELD_TIME = Type::TIME;
 
-	/** @var Dibi\Connection[]  Connection registry storage for DibiConnection objects */
-	private static $registry = [];
-
-	/** @var Dibi\Connection  Current connection */
-	private static $connection;
-
 	/** @var string  Last SQL command @see dibi::query() */
 	public static $sql;
 
@@ -70,6 +64,12 @@ class dibi
 	/** @var string  Default dibi driver */
 	public static $defaultDriver = 'mysqli';
 
+	/** @var Dibi\Connection[]  Connection registry storage for DibiConnection objects */
+	private static $registry = [];
+
+	/** @var Dibi\Connection  Current connection */
+	private static $connection;
+
 
 	/**
 	 * Static class - cannot be instantiated.
@@ -107,12 +107,12 @@ class dibi
 
 
 	/**
-	 * Returns TRUE when connection was established.
+	 * Returns true when connection was established.
 	 * @return bool
 	 */
 	public static function isConnected()
 	{
-		return (self::$connection !== NULL) && self::$connection->isConnected();
+		return (self::$connection !== null) && self::$connection->isConnected();
 	}
 
 
@@ -122,10 +122,10 @@ class dibi
 	 * @return Dibi\Connection
 	 * @throws Dibi\Exception
 	 */
-	public static function getConnection($name = NULL)
+	public static function getConnection($name = null)
 	{
-		if ($name === NULL) {
+		if ($name === null) {
-			if (self::$connection === NULL) {
+			if (self::$connection === null) {
 				throw new Dibi\Exception('Dibi is not connected to database.');
 			}
 
@@ -277,12 +277,11 @@ class dibi
 
 
 	/**
-	 * Gets the number of affected rows. Alias for getAffectedRows().
+	 * @deprecated
-	 * @return int  number of rows
-	 * @throws Dibi\Exception
 	 */
 	public static function affectedRows()
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use getAffectedRows()', E_USER_DEPRECATED);
 		return self::getConnection()->getAffectedRows();
 	}
 
@@ -294,20 +293,18 @@ class dibi
 	 * @return int
 	 * @throws Dibi\Exception
 	 */
-	public static function getInsertId($sequence = NULL)
+	public static function getInsertId($sequence = null)
 	{
 		return self::getConnection()->getInsertId($sequence);
 	}
 
 
 	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column. Alias for getInsertId().
+	 * @deprecated
-	 * @param  string     optional sequence name
-	 * @return int
-	 * @throws Dibi\Exception
 	 */
-	public static function insertId($sequence = NULL)
+	public static function insertId($sequence = null)
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use getInsertId()', E_USER_DEPRECATED);
 		return self::getConnection()->getInsertId($sequence);
 	}
 
@@ -318,19 +315,19 @@ class dibi
 	 * @return void
 	 * @throws Dibi\Exception
 	 */
-	public static function begin($savepoint = NULL)
+	public static function begin($savepoint = null)
 	{
 		self::getConnection()->begin($savepoint);
 	}
 
 
 	/**
-	 * Commits statements in a transaction - Monostate for Dibi\Connection::commit($savepoint = NULL).
+	 * Commits statements in a transaction - Monostate for Dibi\Connection::commit($savepoint = null).
 	 * @param  string  optional savepoint name
 	 * @return void
 	 * @throws Dibi\Exception
 	 */
-	public static function commit($savepoint = NULL)
+	public static function commit($savepoint = null)
 	{
 		self::getConnection()->commit($savepoint);
 	}
@@ -342,7 +339,7 @@ class dibi
 	 * @return void
 	 * @throws Dibi\Exception
 	 */
-	public static function rollback($savepoint = NULL)
+	public static function rollback($savepoint = null)
 	{
 		self::getConnection()->rollback($savepoint);
 	}
@@ -446,9 +443,8 @@ class dibi
 	 * @param  bool  return output instead of printing it?
 	 * @return string
 	 */
-	public static function dump($sql = NULL, $return = FALSE)
+	public static function dump($sql = null, $return = false)
 	{
 		return Dibi\Helpers::dump($sql, $return);
 	}
-
 }

src/Dibi/exceptions.php

@@ -13,7 +13,7 @@ namespace Dibi;
  */
 class Exception extends \Exception
 {
-	/** @var string|NULL */
+	/** @var string|null */
 	private $sql;
 
 
@@ -23,7 +23,7 @@ class Exception extends \Exception
 	 * @param  mixed
 	 * @param  string  SQL command
 	 */
-	public function __construct($message = '', $code = 0, $sql = NULL)
+	public function __construct($message = '', $code = 0, $sql = null)
 	{
 		parent::__construct($message);
 		$this->code = $code;
@@ -47,7 +47,6 @@ class Exception extends \Exception
 	{
 		return parent::__toString() . ($this->sql ? "\nSQL: " . $this->sql : '');
 	}
-
 }
 
 
@@ -64,7 +63,6 @@ class DriverException extends Exception
  */
 class PcreException extends Exception
 {
-
 	public function __construct($message = '%msg.')
 	{
 		static $messages = [
@@ -105,7 +103,7 @@ class ProcedureException extends Exception
 	 * @param  int     Some code
 	 * @param  string SQL command
 	 */
-	public function __construct($message = NULL, $code = 0, $severity = NULL, $sql = NULL)
+	public function __construct($message = null, $code = 0, $severity = null, $sql = null)
 	{
 		parent::__construct($message, (int) $code, $sql);
 		$this->severity = $severity;
@@ -120,7 +118,6 @@ class ProcedureException extends Exception
 	{
 		$this->severity;
 	}
-
 }
 
 

src/Dibi/interfaces.php

@@ -42,20 +42,20 @@ interface Driver
 	/**
 	 * Internal: Executes the SQL query.
 	 * @param  string      SQL statement.
-	 * @return ResultDriver|NULL
+	 * @return ResultDriver|null
 	 * @throws DriverException
 	 */
 	function query($sql);
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @return int|FALSE  number of rows or FALSE on error
+	 * @return int|false  number of rows or false on error
 	 */
 	function getAffectedRows();
 
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @return int|FALSE  int on success or FALSE on failure
+	 * @return int|false  int on success or false on failure
 	 */
 	function getInsertId($sequence);
 
@@ -65,7 +65,7 @@ interface Driver
 	 * @return void
 	 * @throws DriverException
 	 */
-	function begin($savepoint = NULL);
+	function begin($savepoint = null);
 
 	/**
 	 * Commits statements in a transaction.
@@ -73,7 +73,7 @@ interface Driver
 	 * @return void
 	 * @throws DriverException
 	 */
-	function commit($savepoint = NULL);
+	function commit($savepoint = null);
 
 	/**
 	 * Rollback changes in a transaction.
@@ -81,7 +81,7 @@ interface Driver
 	 * @return void
 	 * @throws DriverException
 	 */
-	function rollback($savepoint = NULL);
+	function rollback($savepoint = null);
 
 	/**
 	 * Returns the connection resource.
@@ -143,12 +143,11 @@ interface Driver
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
 	 * @param  string
-	 * @param  int|NULL
+	 * @param  int|null
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 */
 	function applyLimit(&$sql, $limit, $offset);
-
 }
 
 
@@ -167,14 +166,14 @@ interface ResultDriver
 	/**
 	 * Moves cursor position without fetching row.
 	 * @param  int      the 0-based cursor pos to seek to
-	 * @return boolean  TRUE on success, FALSE if unable to seek to specified record
+	 * @return bool     true on success, false if unable to seek to specified record
 	 * @throws Exception
 	 */
 	function seek($row);
 
 	/**
 	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool     TRUE for associative array, FALSE for numeric
+	 * @param  bool     true for associative array, false for numeric
 	 * @return array    array on success, nonarray if no next record
 	 * @internal
 	 */
@@ -205,7 +204,6 @@ interface ResultDriver
 	 * @return string
 	 */
 	function unescapeBinary($value);
-
 }
 
 
@@ -241,5 +239,4 @@ interface Reflector
 	 * @return array
 	 */
 	function getForeignKeys($table);
-
 }

src/loader.php

@@ -15,8 +15,6 @@ spl_autoload_register(function ($class) {
 	static $map = [
 		'dibi' => 'dibi.php',
 		'Dibi\Bridges\Nette\DibiExtension22' => 'Bridges/Nette/DibiExtension22.php',
-		'Dibi\Bridges\Nette\DibiExtension21' => 'Bridges/Nette/DibiExtension21.php',
-		'Dibi\Bridges\Nette\Panel' => 'Bridges/Nette/Panel.php',
 		'Dibi\Bridges\Tracy\Panel' => 'Bridges/Tracy/Panel.php',
 		'Dibi\Connection' => 'Connection.php',
 		'Dibi\DataSource' => 'DataSource.php',
@@ -91,8 +89,6 @@ spl_autoload_register(function ($class) {
 		'DibiMySqlDriver' => 'Dibi\Drivers\MySqlDriver',
 		'DibiMySqliDriver' => 'Dibi\Drivers\MySqliDriver',
 		'DibiMySqlReflector' => 'Dibi\Drivers\MySqlReflector',
-		'DibiNette21Extension' => 'Dibi\Bridges\Nette\DibiExtension21',
-		'DibiNettePanel' => 'Dibi\Bridges\Nette\Panel',
 		'DibiNotImplementedException' => 'Dibi\NotImplementedException',
 		'DibiNotSupportedException' => 'Dibi\NotSupportedException',
 		'DibiOdbcDriver' => 'Dibi\Drivers\OdbcDriver',

tests/dibi/Connection.connect.phpt

@@ -4,8 +4,8 @@
  * @dataProvider ../databases.ini
  */
 
-use Tester\Assert;
 use Dibi\Connection;
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
@@ -20,7 +20,7 @@ test(function () use ($config) {
 
 
 test(function () use ($config) { // lazy
-	$conn = new Connection($config + ['lazy' => TRUE]);
+	$conn = new Connection($config + ['lazy' => true]);
 	Assert::false($conn->isConnected());
 
 	$conn->query('SELECT 1');

tests/dibi/Connection.fetch.phpt

@@ -4,8 +4,8 @@
  * @dataProvider ../databases.ini
  */
 
-use Tester\Assert;
 use Dibi\Row;
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
@@ -61,9 +61,9 @@ Assert::equal([
 
 
 // more complex association array
-function query($conn) {
+function query($conn)
-
+{
-	return $conn->query(in_array($conn->getConfig('system'), ['odbc', 'sqlsrv']) ? '
+	return $conn->query(in_array($conn->getConfig('system'), ['odbc', 'sqlsrv'], true) ? '
 		SELECT products.title, customers.name, orders.amount
 		FROM ([products]
 		INNER JOIN [orders] ON [products.product_id] = [orders.product_id])
@@ -170,11 +170,11 @@ Assert::equal([
 Assert::equal([
 	new Row(['title' => 'Chair', 'name' => 'Arnold Rimmer', 'amount' => num(7.0)]),
 	new Row([
-		'title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0)]),
+		'title' => 'Computer', 'name' => 'Arnold Rimmer', 'amount' => num(2.0), ]),
 	new Row([
-		'title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0)]),
+		'title' => 'Table', 'name' => 'Dave Lister', 'amount' => num(3.0), ]),
 	new Row([
-		'title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0)]),
+		'title' => 'Computer', 'name' => 'Kristine Kochanski', 'amount' => num(5.0), ]),
 ], query($conn)->fetchAssoc('@,='));
 
 

tests/dibi/DataSource.phpt

@@ -1,7 +1,7 @@
 <?php
 
-use Tester\Assert;
 use Dibi\Row;
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 

tests/dibi/Fluent.cloning.phpt

@@ -1,7 +1,7 @@
 <?php
 
-use Tester\Assert;
 use Dibi\Fluent;
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 

tests/dibi/Fluent.delete.phpt

@@ -30,7 +30,7 @@ Assert::same(
 	(string) $fluent
 );
 
-$fluent->setFlag('IGNORE', FALSE);
+$fluent->setFlag('IGNORE', false);
 
 Assert::same(
 	reformat('DELETE FROM [anotherTable] USING [thirdTable]'),

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

@@ -7,25 +7,31 @@ require __DIR__ . '/bootstrap.php';
 
 class MockDriver extends Dibi\Drivers\SqlsrvDriver
 {
-	function __construct()
+	public function __construct()
-	{}
+	{
+	}
 
-	function connect(array &$config)
-	{}
 
-	function query($sql)
+	public function connect(array &$config)
+	{
+	}
+
+
+	public function query($sql)
 	{
 		return $this;
 	}
 
-	function getResultColumns()
+
+	public function getResultColumns()
 	{
 		return [];
 	}
 
-	function fetch($assoc)
+
+	public function fetch($assoc)
 	{
-		return FALSE;
+		return false;
 	}
 }
 

tests/dibi/Fluent.fetch.phpt

@@ -4,8 +4,8 @@
  * @dataProvider ../databases.ini
  */
 
-use Tester\Assert;
 use Dibi\Row;
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
@@ -28,7 +28,7 @@ Assert::equal([
 
 
 // more complex association array
-if (!in_array($config['system'], ['odbc', 'sqlsrv'])) {
+if (!in_array($config['system'], ['odbc', 'sqlsrv'], true)) {
 	$res = $conn->select(['products.title' => 'title', 'customers.name' => 'name'])->select('orders.amount')->as('amount')
 		->from('products')
 		->innerJoin('orders')->using('(product_id)')
@@ -48,3 +48,8 @@ if (!in_array($config['system'], ['odbc', 'sqlsrv'])) {
 		],
 	], $res->fetchAssoc('name,title'));
 }
+
+
+// affected rows
+$res = $conn->update('products', ['title' => 'new'])->execute();
+Assert::same(3, $res);

tests/dibi/Fluent.insert.phpt

@@ -11,7 +11,7 @@ $conn = new Dibi\Connection($config);
 $arr = [
 	'title' => 'Super Product',
 	'price' => 12,
-	'brand' => NULL,
+	'brand' => null,
 ];
 
 $fluent = $conn->insert('table', $arr)
@@ -22,7 +22,7 @@ Assert::same(
 	(string) $fluent
 );
 
-$fluent->setFlag('IGNORE', FALSE);
+$fluent->setFlag('IGNORE', false);
 
 Assert::same(
 	reformat('INSERT DELAYED INTO [table] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL)'),

tests/dibi/Fluent.select.phpt

@@ -142,10 +142,9 @@ if ($config['system'] === 'mysql') {
 		->limit(' 1; DROP TABLE users')
 		->offset(' 1; DROP TABLE users');
 
-	Assert::same(
+	Assert::error(function () use ($fluent) {
-		reformat('  SELECT * LIMIT 1 OFFSET 1'),
+		(string) $fluent;
-		(string) $fluent
+	}, E_USER_ERROR, "Expected number, ' 1; DROP TABLE users' given.");
-	);
 }
 
 

tests/dibi/Fluent.update.phpt

@@ -11,7 +11,7 @@ $conn = new Dibi\Connection($config);
 $arr = [
 	'title' => 'Super Product',
 	'price' => 12,
-	'brand' => NULL,
+	'brand' => null,
 ];
 
 $fluent = $conn->update('table', $arr)

tests/dibi/Helpers.getSuggestion().phpt

@@ -6,19 +6,19 @@ use Tester\Assert;
 require __DIR__ . '/bootstrap.php';
 
 
-Assert::same(NULL, Helpers::getSuggestion([], ''));
+Assert::same(null, Helpers::getSuggestion([], ''));
-Assert::same(NULL, Helpers::getSuggestion([], 'a'));
+Assert::same(null, Helpers::getSuggestion([], 'a'));
-Assert::same(NULL, Helpers::getSuggestion(['a'], 'a'));
+Assert::same(null, Helpers::getSuggestion(['a'], 'a'));
 Assert::same('a', Helpers::getSuggestion(['a', 'b'], ''));
 Assert::same('b', Helpers::getSuggestion(['a', 'b'], 'a')); // ignore 100% match
 Assert::same('a1', Helpers::getSuggestion(['a1', 'a2'], 'a')); // take first
-Assert::same(NULL, Helpers::getSuggestion(['aaa', 'bbb'], 'a'));
+Assert::same(null, Helpers::getSuggestion(['aaa', 'bbb'], 'a'));
-Assert::same(NULL, Helpers::getSuggestion(['aaa', 'bbb'], 'ab'));
+Assert::same(null, Helpers::getSuggestion(['aaa', 'bbb'], 'ab'));
-Assert::same(NULL, Helpers::getSuggestion(['aaa', 'bbb'], 'abc'));
+Assert::same(null, Helpers::getSuggestion(['aaa', 'bbb'], 'abc'));
 Assert::same('bar', Helpers::getSuggestion(['foo', 'bar', 'baz'], 'baz'));
 Assert::same('abcd', Helpers::getSuggestion(['abcd'], 'acbd'));
 Assert::same('abcd', Helpers::getSuggestion(['abcd'], 'axbd'));
-Assert::same(NULL, Helpers::getSuggestion(['abcd'], 'axyd'));
+Assert::same(null, Helpers::getSuggestion(['abcd'], 'axyd'));
 
 
 /*

tests/dibi/Helpers.intVal().phpt

@@ -0,0 +1,25 @@
+<?php
+
+use Dibi\Helpers;
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+Assert::same(0, Helpers::intVal(0));
+Assert::same(0, Helpers::intVal('0'));
+Assert::same(-10, Helpers::intVal('-10'));
+Assert::same('12345678901234567890123456879', Helpers::intVal('12345678901234567890123456879'));
+Assert::same('-12345678901234567890123456879', Helpers::intVal('-12345678901234567890123456879'));
+
+Assert::exception(function () {
+	Helpers::intVal('');
+}, 'Dibi\Exception', "Expected number, '' given.");
+
+Assert::exception(function () {
+	Helpers::intVal('not number');
+}, 'Dibi\Exception', "Expected number, 'not number' given.");
+
+Assert::exception(function () {
+	Helpers::intVal(null);
+}, 'Dibi\Exception', "Expected number, '' given.");

tests/dibi/Result.meta.phpt

@@ -25,10 +25,10 @@ Assert::same(
 );
 
 
-if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) {
+if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'], true)) {
 	Assert::same(
 		['products.product_id', 'orders.order_id', 'customers.name', 'xXx'],
-		$info->getColumnNames(TRUE)
+		$info->getColumnNames(true)
 	);
 }
 
@@ -36,18 +36,18 @@ if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) {
 $columns = $info->getColumns();
 
 Assert::same('product_id', $columns[0]->getName());
-if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'])) {
+if (!in_array($config['driver'], ['sqlite3', 'pdo', 'sqlsrv'], true)) {
 	Assert::same('products', $columns[0]->getTableName());
 }
 Assert::null($columns[0]->getVendorInfo('xxx'));
-if (!in_array($config['system'], ['sqlite', 'sqlsrv'])) {
+if (!in_array($config['system'], ['sqlite', 'sqlsrv'], true)) {
 	Assert::same('i', $columns[0]->getType());
 }
 Assert::null($columns[0]->isNullable());
 
 Assert::same('xXx', $columns[3]->getName());
 Assert::null($columns[3]->getTableName());
-if (!in_array($config['system'], ['sqlite', 'sqlsrv'])) {
+if (!in_array($config['system'], ['sqlite', 'sqlsrv'], true)) {
 	Assert::same('i', $columns[0]->getType());
 }
 Assert::null($columns[3]->isNullable());

tests/dibi/Result.normalize.phpt

@@ -1,20 +1,22 @@
 <?php
 
-use Tester\Assert;
 use Dibi\Type;
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
 
 class MockResult extends Dibi\Result
 {
-	function __construct()
+	public function __construct()
-	{}
+	{
+	}
 
-	function test($row)
+
+	public function test($row)
 	{
 		$normalize = new ReflectionMethod('Dibi\Result', 'normalize');
-		$normalize->setAccessible(TRUE);
+		$normalize->setAccessible(true);
 		$normalize->invokeArgs($this, [&$row]);
 		return $row;
 	}
@@ -25,21 +27,21 @@ test(function () {
 	$result = new MockResult;
 	$result->setType('col', Type::BOOL);
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::same(['col' => TRUE], $result->test(['col' => TRUE]));
+	Assert::same(['col' => true], $result->test(['col' => true]));
-	Assert::same(['col' => FALSE], $result->test(['col' => FALSE]));
+	Assert::same(['col' => false], $result->test(['col' => false]));
 
-	Assert::same(['col' => FALSE], $result->test(['col' => '']));
+	Assert::same(['col' => false], $result->test(['col' => '']));
-	Assert::same(['col' => FALSE], $result->test(['col' => '0']));
+	Assert::same(['col' => false], $result->test(['col' => '0']));
-	Assert::same(['col' => TRUE], $result->test(['col' => '1']));
+	Assert::same(['col' => true], $result->test(['col' => '1']));
-	Assert::same(['col' => TRUE], $result->test(['col' => 't']));
+	Assert::same(['col' => true], $result->test(['col' => 't']));
-	Assert::same(['col' => FALSE], $result->test(['col' => 'f']));
+	Assert::same(['col' => false], $result->test(['col' => 'f']));
-	Assert::same(['col' => TRUE], $result->test(['col' => 'T']));
+	Assert::same(['col' => true], $result->test(['col' => 'T']));
-	Assert::same(['col' => FALSE], $result->test(['col' => 'F']));
+	Assert::same(['col' => false], $result->test(['col' => 'F']));
-	Assert::same(['col' => FALSE], $result->test(['col' => 0]));
+	Assert::same(['col' => false], $result->test(['col' => 0]));
-	Assert::same(['col' => FALSE], $result->test(['col' => 0.0]));
+	Assert::same(['col' => false], $result->test(['col' => 0.0]));
-	Assert::same(['col' => TRUE], $result->test(['col' => 1]));
+	Assert::same(['col' => true], $result->test(['col' => 1]));
-	Assert::same(['col' => TRUE], $result->test(['col' => 1.0]));
+	Assert::same(['col' => true], $result->test(['col' => 1.0]));
 });
 
 
@@ -47,9 +49,9 @@ test(function () {
 	$result = new MockResult;
 	$result->setType('col', Type::TEXT);
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::same(['col' => '1'], $result->test(['col' => TRUE]));
+	Assert::same(['col' => '1'], $result->test(['col' => true]));
-	Assert::same(['col' => ''], $result->test(['col' => FALSE]));
+	Assert::same(['col' => ''], $result->test(['col' => false]));
 
 	Assert::same(['col' => ''], $result->test(['col' => '']));
 	Assert::same(['col' => '0'], $result->test(['col' => '0']));
@@ -63,9 +65,9 @@ test(function () {
 	$result = new MockResult;
 	$result->setType('col', Type::FLOAT);
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::same(['col' => 1.0], $result->test(['col' => TRUE]));
+	Assert::same(['col' => 1.0], $result->test(['col' => true]));
-	Assert::same(['col' => 0.0], $result->test(['col' => FALSE]));
+	Assert::same(['col' => 0.0], $result->test(['col' => false]));
 
 	Assert::same(['col' => 0.0], $result->test(['col' => '']));
 	Assert::same(['col' => 0.0], $result->test(['col' => '0']));
@@ -135,9 +137,9 @@ test(function () {
 	$result = new MockResult;
 	$result->setType('col', Type::INTEGER);
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
-	Assert::same(['col' => 1], $result->test(['col' => TRUE]));
+	Assert::same(['col' => 1], $result->test(['col' => true]));
-	Assert::same(['col' => 0], $result->test(['col' => FALSE]));
+	Assert::same(['col' => 0], $result->test(['col' => false]));
 
 	Assert::same(['col' => 0], @$result->test(['col' => ''])); // triggers warning in PHP 7.1
 	Assert::same(['col' => 0], $result->test(['col' => '0']));
@@ -161,14 +163,14 @@ test(function () {
 	$result = new MockResult;
 	$result->setType('col', Type::DATETIME);
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(function () use ($result) {
-		$result->test(['col' => TRUE]);
+		$result->test(['col' => true]);
 	}, 'Exception');
-	Assert::same(['col' => NULL], $result->test(['col' => FALSE]));
+	Assert::same(['col' => null], $result->test(['col' => false]));
 
-	Assert::same(['col' => NULL], $result->test(['col' => '']));
+	Assert::same(['col' => null], $result->test(['col' => '']));
-	Assert::same(['col' => NULL], $result->test(['col' => '0000-00-00']));
+	Assert::same(['col' => null], $result->test(['col' => '0000-00-00']));
 	Assert::equal(['col' => new Dibi\DateTime('00:00:00')], $result->test(['col' => '00:00:00']));
 	Assert::equal(['col' => new Dibi\DateTime('2015-10-13')], $result->test(['col' => '2015-10-13']));
 	Assert::equal(['col' => new Dibi\DateTime('2015-10-13 14:30')], $result->test(['col' => '2015-10-13 14:30']));
@@ -180,14 +182,14 @@ test(function () {
 	$result->setType('col', Type::DATETIME);
 	$result->setFormat(Type::DATETIME, 'Y-m-d H:i:s');
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(function () use ($result) {
-		$result->test(['col' => TRUE]);
+		$result->test(['col' => true]);
 	}, 'Exception');
-	Assert::same(['col' => NULL], $result->test(['col' => FALSE]));
+	Assert::same(['col' => null], $result->test(['col' => false]));
 
-	Assert::same(['col' => NULL], $result->test(['col' => '']));
+	Assert::same(['col' => null], $result->test(['col' => '']));
-	Assert::same(['col' => NULL], $result->test(['col' => '0000-00-00']));
+	Assert::same(['col' => null], $result->test(['col' => '0000-00-00']));
 	Assert::same(['col' => date('Y-m-d 00:00:00')], $result->test(['col' => '00:00:00']));
 	Assert::equal(['col' => '2015-10-13 00:00:00'], $result->test(['col' => '2015-10-13']));
 	Assert::equal(['col' => '2015-10-13 14:30:00'], $result->test(['col' => '2015-10-13 14:30']));
@@ -198,14 +200,14 @@ test(function () {
 	$result = new MockResult;
 	$result->setType('col', Type::DATE);
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(function () use ($result) {
-		$result->test(['col' => TRUE]);
+		$result->test(['col' => true]);
 	}, 'Exception');
-	Assert::same(['col' => NULL], $result->test(['col' => FALSE]));
+	Assert::same(['col' => null], $result->test(['col' => false]));
 
-	Assert::same(['col' => NULL], $result->test(['col' => '']));
+	Assert::same(['col' => null], $result->test(['col' => '']));
-	Assert::same(['col' => NULL], $result->test(['col' => '0000-00-00']));
+	Assert::same(['col' => null], $result->test(['col' => '0000-00-00']));
 	Assert::equal(['col' => new Dibi\DateTime('2015-10-13')], $result->test(['col' => '2015-10-13']));
 });
 
@@ -214,14 +216,14 @@ test(function () {
 	$result = new MockResult;
 	$result->setType('col', Type::TIME);
 
-	Assert::same(['col' => NULL], $result->test(['col' => NULL]));
+	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(function () use ($result) {
-		$result->test(['col' => TRUE]);
+		$result->test(['col' => true]);
 	}, 'Exception');
-	Assert::same(['col' => NULL], $result->test(['col' => FALSE]));
+	Assert::same(['col' => null], $result->test(['col' => false]));
 
-	Assert::same(['col' => NULL], $result->test(['col' => '']));
+	Assert::same(['col' => null], $result->test(['col' => '']));
-	Assert::same(['col' => NULL], $result->test(['col' => '0000-00-00']));
+	Assert::same(['col' => null], $result->test(['col' => '0000-00-00']));
 	Assert::equal(['col' => new Dibi\DateTime('00:00:00')], $result->test(['col' => '00:00:00']));
 	Assert::equal(['col' => new Dibi\DateTime('14:30')], $result->test(['col' => '14:30']));
 });

tests/dibi/Sqlsrv.insert.phpt

@@ -9,7 +9,7 @@ use Tester\Assert;
 require __DIR__ . '/bootstrap.php';
 
 $conn = new Dibi\Connection($config);
-$conn->loadFile(__DIR__ . "/data/sqlsrv.insert.sql");
+$conn->loadFile(__DIR__ . '/data/sqlsrv.insert.sql');
 
 for ($i = 1; $i <= 5; $i++) {
 	$conn->query('INSERT INTO %n DEFAULT VALUES', 'aaa');

tests/dibi/Strict.phpt

@@ -11,27 +11,37 @@ class TestClass
 
 	public $public;
 
-	protected $protected;
-
 	public static $publicStatic;
 
+	protected $protected;
+
+
 	public function publicMethod()
-	{}
+	{
+	}
+
 
 	public static function publicMethodStatic()
-	{}
+	{
+	}
+
 
 	protected function protectedMethod()
-	{}
+	{
+	}
+
 
 	protected static function protectedMethodS()
-	{}
+	{
+	}
+
 
 	public function getBar()
 	{
 		return 123;
 	}
 
+
 	public function isFoo()
 	{
 		return 456;

tests/dibi/Translator.DateTimeInterface.phpt

@@ -13,5 +13,5 @@ $translator = new Dibi\Translator($conn);
 
 $datetime = new DateTime('1978-01-23 00:00:00');
 
-Assert::equal($datetime->format('U'), $translator->formatValue(new DateTime($datetime->format('c')), NULL));
+Assert::equal($datetime->format('U'), $translator->formatValue(new DateTime($datetime->format('c')), null));
-Assert::equal($datetime->format('U'), $translator->formatValue(new DateTimeImmutable($datetime->format('c')), NULL));
+Assert::equal($datetime->format('U'), $translator->formatValue(new DateTimeImmutable($datetime->format('c')), null));

tests/dibi/Translator.conditions.phpt

@@ -33,7 +33,7 @@ FROM  [customers] /* ... */'),
 
 	$conn->translate('
 SELECT *
-FROM %if', TRUE, '[customers] %else [products]'
+FROM %if', true, '[customers] %else [products]'
 ));
 
 
@@ -51,8 +51,8 @@ WHERE [id] > 0
 SELECT *
 FROM [people]
 WHERE [id] > 0
-	%if', FALSE, 'AND [foo]=%i', 1, '
+	%if', false, 'AND [foo]=%i', 1, '
-	%else %if', TRUE, 'AND [bar]=%i', 1, '
+	%else %if', true, 'AND [bar]=%i', 1, '
 '));
 
 
@@ -70,8 +70,8 @@ WHERE
 SELECT *
 FROM [customers]
 WHERE
-	%if', TRUE, '[name] LIKE %s', 'xxx', '
+	%if', true, '[name] LIKE %s', 'xxx', '
-		%if', FALSE, 'AND [admin]=1 %end
+		%if', false, 'AND [admin]=1 %end
 	%else 1 LIMIT 10 %end'
 ));
 
@@ -81,7 +81,7 @@ Assert::same(
 	'SELECT * FROM foo /* (limit 3) (offset 5) */',
 	$conn->translate(
 	'SELECT * FROM foo',
-	'%if', FALSE,
+	'%if', false,
 		'%lmt', 3,
 		'%ofs', 5,
 	'%end'

tests/dibi/Translator.phpt

@@ -4,28 +4,29 @@
  * @dataProvider ../databases.ini
  */
 
-use Tester\Assert;
 use Dibi\DateTime;
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
-$conn = new Dibi\Connection($config + ['formatDateTime' => "'Y-m-d H:i:s'", 'formatDate' => "'Y-m-d'"]);
+$conn = new Dibi\Connection($config + ['formatDateTime' => "'Y-m-d H:i:s.u'", 'formatDate' => "'Y-m-d'"]);
 
 
 // dibi detects INSERT or REPLACE command & booleans
 Assert::same(
 	reformat("REPLACE INTO [products] ([title], [price]) VALUES ('Drticka', 318)"),
 	$conn->translate('REPLACE INTO [products]', [
-	'title' => 'Drticka',
+		'title' => 'Drticka',
-	'price' => 318,
+		'price' => 318,
-]));
+	])
+);
 
 
 // multiple INSERT command
 $array = [
 	'title' => 'Super Product',
 	'price' => 12,
-	'brand' => NULL,
+	'brand' => null,
 ];
 Assert::same(
 	reformat('INSERT INTO [products] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL)'),
@@ -49,9 +50,10 @@ Assert::same(
 Assert::same(
 	reformat("UPDATE [colors] SET [color]='blue', [order]=12 WHERE [id]=123"),
 	$conn->translate('UPDATE [colors] SET', [
-	'color' => 'blue',
+		'color' => 'blue',
-	'order' => 12,
+		'order' => 12,
-], 'WHERE [id]=%i', 123));
+	], 'WHERE [id]=%i', 123)
+);
 
 
 // IN array
@@ -95,7 +97,7 @@ Assert::same(
 	$conn->translate('TEST %and', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'])
 );
 
-//
+
 $where = [];
 $where[] = '[age] > 20';
 $where[] = '[email] IS NOT NULL';
@@ -106,7 +108,7 @@ Assert::same(
 
 
 $where = [];
-$where['age'] = NULL;
+$where['age'] = null;
 $where['email'] = 'ahoj';
 $where['id%l'] = [10, 20, 30];
 Assert::same(
@@ -128,8 +130,8 @@ $order = [
 	'field2' => 'desc',
 	'field3' => 1,
 	'field4' => -1,
-	'field5' => TRUE,
+	'field5' => true,
-	'field6' => FALSE,
+	'field6' => false,
 ];
 Assert::same(
 	reformat('SELECT * FROM [people] ORDER BY [field1] ASC, [field2] DESC, [field3] ASC, [field4] DESC, [field5] ASC, [field6] DESC'),
@@ -156,7 +158,7 @@ if ($config['system'] === 'odbc') {
 	Assert::same(
 		reformat([
 			'sqlsrv' => 'SELECT * FROM [products] OFFSET 1 ROWS FETCH NEXT 2 ROWS ONLY',
-			'SELECT * FROM [products]   LIMIT 2 OFFSET 1'
+			'SELECT * FROM [products]   LIMIT 2 OFFSET 1',
 		]),
 		$conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1)
 	);
@@ -178,22 +180,24 @@ if ($config['system'] === 'odbc') {
 
 Assert::same(
 	reformat([
-		'odbc' => 'INSERT INTO test ([a2], [a4], [b1], [b2], [b3], [b4], [b5], [b6], [b7], [b8], [b9]) VALUES (#09/26/1212 00:00:00#, #12/31/1969 22:13:20#, #09/26/1212#, #09/26/1212 00:00:00#, #12/31/1969#, #12/31/1969 22:13:20#, #09/26/1212 00:00:00#, #09/26/1212#, #09/26/1212 00:00:00#, NULL, NULL)',
+		'odbc' => 'INSERT INTO test ([a2], [a4], [b1], [b2], [b3], [b4], [b5], [b6], [b7], [b8], [b9], [c1]) VALUES (#09/26/1212 00:00:00.000000#, #12/31/1969 22:13:20.000000#, #09/26/1212#, #09/26/1212 00:00:00.000000#, #12/31/1969#, #12/31/1969 22:13:20.000000#, #09/26/1212 00:00:00.000000#, #09/26/1212#, #09/26/1212 00:00:00.000000#, NULL, NULL, #09/26/1212 16:51:34.012400#)',
-		"INSERT INTO test ([a2], [a4], [b1], [b2], [b3], [b4], [b5], [b6], [b7], [b8], [b9]) VALUES ('1212-09-26 00:00:00', '1969-12-31 22:13:20', '1212-09-26', '1212-09-26 00:00:00', '1969-12-31', '1969-12-31 22:13:20', '1212-09-26 00:00:00', '1212-09-26', '1212-09-26 00:00:00', NULL, NULL)",
+		"INSERT INTO test ([a2], [a4], [b1], [b2], [b3], [b4], [b5], [b6], [b7], [b8], [b9], [c1]) VALUES ('1212-09-26 00:00:00.000000', '1969-12-31 22:13:20.000000', '1212-09-26', '1212-09-26 00:00:00.000000', '1969-12-31', '1969-12-31 22:13:20.000000', '1212-09-26 00:00:00.000000', '1212-09-26', '1212-09-26 00:00:00.000000', NULL, NULL, '1212-09-26 16:51:34.012400')",
 	]),
 	$conn->translate('INSERT INTO test', [
-	'a2' => new DateTime('1212-09-26'),
+		'a2' => new DateTime('1212-09-26'),
-	'a4' => new DateTime(-10000),
+		'a4' => new DateTime(-10000),
-	'b1%d' => '1212-09-26',
+		'b1%d' => '1212-09-26',
-	'b2%t' => '1212-09-26',
+		'b2%t' => '1212-09-26',
-	'b3%d' => -10000,
+		'b3%d' => -10000,
-	'b4%t' => -10000,
+		'b4%t' => -10000,
-	'b5' => new DateTime('1212-09-26'),
+		'b5' => new DateTime('1212-09-26'),
-	'b6%d' => new DateTime('1212-09-26'),
+		'b6%d' => new DateTime('1212-09-26'),
-	'b7%t' => new DateTime('1212-09-26'),
+		'b7%t' => new DateTime('1212-09-26'),
-	'b8%d' => NULL,
+		'b8%d' => null,
-	'b9%t' => NULL,
+		'b9%t' => null,
-]));
+		'c1%t' => new DateTime('1212-09-26 16:51:34.0124'),
+	])
+);
 
 Assert::exception(function () use ($conn) {
 	$conn->translate('SELECT %s', new DateTime('1212-09-26'));
@@ -284,7 +288,7 @@ $array3 = [
 ];
 $array4 = [
 	'a' => 12,
-	'b' => NULL,
+	'b' => null,
 	'c' => new DateTime('12.3.2007'),
 	'd' => 'any string',
 ];
@@ -395,9 +399,9 @@ WHERE ([test.a] LIKE %d', '1995-03-01', '
 	OR [b10] IN (', [], ")
 	AND [c] = 'embedded '' string'
 	OR [d]=%i", 10.3, '
-	OR [e]=%i', NULL, '
+	OR [e]=%i', null, '
-	OR [true]=', TRUE, '
+	OR [true]=', true, '
-	OR [false]=', FALSE, '
+	OR [false]=', false, '
 	OR [str_null]=%sn', '', '
 	OR [str_not_null]=%sn', 'hello', '
 LIMIT 10')
@@ -439,7 +443,7 @@ Assert::same(
 
 
 $where = [
-		'tablename.column' => 1,
+	'tablename.column' => 1,
 ];
 Assert::same(
 	reformat('SELECT * FROM [tablename] WHERE ([tablename].[column] = 1)'),
@@ -449,7 +453,7 @@ Assert::same(
 
 Assert::same(
 	reformat('SELECT FROM ... '),
-	$conn->translate('SELECT FROM ... %lmt', NULL)
+	$conn->translate('SELECT FROM ... %lmt', null)
 );
 
 Assert::same(
@@ -466,20 +470,36 @@ Assert::same(
 Assert::same(
 	reformat('INSERT INTO [products] ([product_id], [title]) VALUES (1, SHA1(\'Test product\')) , (1, SHA1(\'Test product\'))'),
 	$conn->translate('INSERT INTO [products]', [
-	'product_id' => 1,
+		'product_id' => 1,
-	'title' => ['SHA1(%s)', 'Test product'],
+		'title' => ['SHA1(%s)', 'Test product'],
-], [
+	], [
-	'product_id' => 1,
+		'product_id' => 1,
-	'title' => ['SHA1(%s)', 'Test product'],
+		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
-])
+	])
 );
 
 Assert::same(
 	reformat('UPDATE [products] [product_id]=1, [title]=SHA1(\'Test product\')'),
 	$conn->translate('UPDATE [products]', [
-	'product_id' => 1,
+		'product_id' => 1,
-	'title' => ['SHA1(%s)', 'Test product'],
+		'title' => ['SHA1(%s)', 'Test product'],
-])
+	])
+);
+
+Assert::same(
+	reformat('UPDATE [products] [product_id]=1, [title]=SHA1(\'Test product\')'),
+	$conn->translate('UPDATE [products]', [
+		'product_id' => 1,
+		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
+	])
+);
+
+Assert::same(
+	reformat('SELECT * FROM [products] WHERE [product_id]=1, [title]=SHA1(\'Test product\')'),
+	$conn->translate('SELECT * FROM [products] WHERE', [
+		'product_id' => 1,
+		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
+	])
 );
 
 
@@ -496,11 +516,11 @@ Assert::same('INSERT INTO test **Multi-insert array "num%i" is different**', $e-
 $array6 = [
 	'id' => [1, 2, 3, 4],
 	'text' => ['ahoj', 'jak', 'se', ['SUM(%i)', '5']],
-	'num%i' => ['1', '', 10.3, 1],
+	'num%i' => ['1', '-1', 10.3, 1],
 ];
 
 Assert::same(
-	reformat('INSERT INTO test ([id], [text], [num]) VALUES (1, \'ahoj\', 1), (2, \'jak\', 0), (3, \'se\', 10), (4, SUM(5), 1)'),
+	reformat('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)
 );
 
@@ -520,10 +540,13 @@ Assert::same(
 	$conn->translate('INSERT INTO [test.*]')
 );
 
-Assert::same(
+Assert::exception(function () use ($conn) {
-	reformat('INSERT INTO 0'),
+	$conn->translate('INSERT INTO %i', 'ahoj');
-	@$conn->translate('INSERT INTO %f', 'ahoj') // triggers warning in PHP 7.1
+}, 'Dibi\Exception', "Expected number, 'ahoj' given.");
-);
+
+Assert::exception(function () use ($conn) {
+	$conn->translate('INSERT INTO %f', 'ahoj');
+}, 'Dibi\Exception', "Expected number, 'ahoj' given.");
 
 
 Assert::same(
@@ -548,17 +571,17 @@ Assert::same(
 );
 
 
-setLocale(LC_ALL, 'czech');
+setlocale(LC_ALL, 'czech');
 
 Assert::same(
 	reformat("UPDATE [colors] SET [color]='blue', [price]=-12.4, [spec]=-9E-005, [spec2]=1000, [spec3]=10000, [spec4]=10000 WHERE [price]=123.5"),
 
 	$conn->translate('UPDATE [colors] SET', [
-	'color' => 'blue',
+		'color' => 'blue',
-	'price' => -12.4,
+		'price' => -12.4,
-	'spec%f' => '-9E-005',
+		'spec%f' => '-9E-005',
-	'spec2%f' => 1000.00,
+		'spec2%f' => 1000.00,
-	'spec3%i' => 10000,
+		'spec3%i' => 10000,
-	'spec4' => 10000,
+		'spec4' => 10000,
-], 'WHERE [price]=%f', 123.5)
+	], 'WHERE [price]=%f', 123.5)
 );

tests/dibi/bootstrap.php

@@ -18,7 +18,7 @@ date_default_timezone_set('Europe/Prague');
 try {
 	$config = Tester\Environment::loadData();
 } catch (Exception $e) {
-	$config = parse_ini_file(__DIR__ . '/../databases.ini', TRUE);
+	$config = parse_ini_file(__DIR__ . '/../databases.ini', true);
 	$config = reset($config);
 }
 
@@ -63,7 +63,7 @@ function reformat($s)
 		return strtr($s, '[]', '``');
 	} elseif ($config['system'] === 'postgre') {
 		return strtr($s, '[]', '""');
-	} elseif (in_array($config['system'], ['odbc', 'sqlite', 'sqlsrv'])) {
+	} elseif (in_array($config['system'], ['odbc', 'sqlite', 'sqlsrv'], true)) {
 		return $s;
 	} else {
 		trigger_error("Unsupported driver $config[system]", E_USER_WARNING);

tests/dibi/exceptions.mysql.phpt

@@ -15,7 +15,7 @@ $conn->loadFile(__DIR__ . "/data/$config[system].sql");
 
 $e = Assert::exception(function () use ($conn) {
 	$conn->query('SELECT');
-}, 'Dibi\DriverException', "%a% error in your SQL syntax;%a%", 1064);
+}, 'Dibi\DriverException', '%a% error in your SQL syntax;%a%', 1064);
 
 Assert::same('SELECT', $e->getSql());
 

tests/dibi/exceptions.sqlite.phpt

@@ -22,14 +22,14 @@ Assert::same('SELECT', $e->getSql());
 
 $e = Assert::exception(function () use ($conn) {
 	$conn->query('INSERT INTO products (product_id, title) VALUES (1, "New")');
-}, 'Dibi\UniqueConstraintViolationException', NULL, 19);
+}, 'Dibi\UniqueConstraintViolationException', null, 19);
 
 Assert::same("INSERT INTO products (product_id, title) VALUES (1, 'New')", $e->getSql());
 
 
 $e = Assert::exception(function () use ($conn) {
 	$conn->query('INSERT INTO products (title) VALUES (NULL)');
-}, 'Dibi\NotNullConstraintViolationException', NULL, 19);
+}, 'Dibi\NotNullConstraintViolationException', null, 19);
 
 Assert::same('INSERT INTO products (title) VALUES (NULL)', $e->getSql());
 
@@ -37,6 +37,6 @@ Assert::same('INSERT INTO products (title) VALUES (NULL)', $e->getSql());
 $e = Assert::exception(function () use ($conn) {
 	$conn->query('PRAGMA foreign_keys=true');
 	$conn->query('INSERT INTO orders (customer_id, product_id, amount) VALUES (100, 1, 1)');
-}, 'Dibi\ForeignKeyConstraintViolationException', NULL, 19);
+}, 'Dibi\ForeignKeyConstraintViolationException', null, 19);
 
 Assert::same('INSERT INTO orders (customer_id, product_id, amount) VALUES (100, 1, 1)', $e->getSql());