Released version 3.2.1

This reverts commit 5c806ea517.

appveyor.yml

@@ -56,4 +56,4 @@ test_script:
 
 on_failure:
     # Print *.actual content
-    - type tests\dibi\output\*.actual
+    - for /r %%x in (*.actual) do ( type "%%x" )

composer.json

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

examples/connecting-to-databases.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 // connects to SQlite using dibi class

examples/database-reflection.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

examples/dumping-sql-and-result-set.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

examples/importing-dump-from-file.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

examples/query-language-and-conditions.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

examples/query-language-basic-examples.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-datetime.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-fluent-syntax.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-limit-and-offset.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

examples/using-logger.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-profiler.php

@@ -6,7 +6,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

examples/using-substitutions.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

examples/using-transactions.php

@@ -4,7 +4,9 @@
 
 <?php
 
-require __DIR__ . '/../src/loader.php';
+if (@!include __DIR__ . '/../vendor/autoload.php') {
+	die('Install packages using `composer install`');
+}
 
 
 dibi::connect([

readme.md

@@ -7,22 +7,28 @@
 [![Latest Stable Version](https://poser.pugx.org/dibi/dibi/v/stable)](https://github.com/dg/dibi/releases)
 [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/dg/dibi/blob/master/license.md)
 
+
+Introduction
+------------
+
 Database access functions in PHP are not standardised. This library
 hides the differences between them, and above all, it gives you a very handy interface.
 
-The best way to install Dibi is to use a [Composer](https://getcomposer.org/download):
 
-    php composer.phar require dibi/dibi
+Installation
+------------
 
-Or you can download the latest package from https://dibiphp.com. In this
-package is also `Dibi.minified`, shrinked single-file version of whole Dibi,
-useful when you don't want to modify the library, but just use it.
+The recommended way to install Dibi is via Composer (alternatively you can [download package](https://github.com/dg/dibi/releases)):
 
-Dibi requires PHP 5.4.4 or later. It has been tested with PHP 7 too.
+```bash
+composer require dibi/dibi
+```
+
+The Dibi 3.x requires PHP version 5.4.4 and supports PHP up to 7.2.
 
 
-Examples
---------
+Usage
+-----
 
 Refer to the `examples` directory for examples. Dibi documentation is
 available on the [homepage](https://dibiphp.com).
@@ -30,34 +36,34 @@ available on the [homepage](https://dibiphp.com).
 Connect to database:
 
 ```php
-// connect to database (static way)
-dibi::connect([
-    'driver'   => 'mysql',
+$dibi = new Dibi\Connection([
+    'driver'   => 'mysqli',
     'host'     => 'localhost',
     'username' => 'root',
     'password' => '***',
 ]);
 
-// or object way; in all other examples use $connection-> instead of dibi::
-$connection = new DibiConnection($options);
+
+// or static way; in all other examples use dibi:: instead of $dibi->
+dibi::connect($options);
 ```
 
 SELECT, INSERT, UPDATE
 
 ```php
-dibi::query('SELECT * FROM users WHERE id = ?', $id);
+$dibi->query('SELECT * FROM users WHERE id = ?', $id);
 
 $arr = [
     'name' => 'John',
     'is_admin'  => true,
 ];
-dibi::query('INSERT INTO users', $arr);
+$dibi->query('INSERT INTO users', $arr);
 // INSERT INTO users (`name`, `is_admin`) VALUES ('John', 1)
 
-dibi::query('UPDATE users SET', $arr, 'WHERE `id`=?', $x);
+$dibi->query('UPDATE users SET', $arr, 'WHERE `id`=?', $x);
 // UPDATE users SET `name`='John', `is_admin`=1 WHERE `id` = 123
 
-dibi::query('UPDATE users SET', [
+$dibi->query('UPDATE users SET', [
 	'title' => array('SHA1(?)', 'tajneheslo'),
 ]);
 // UPDATE users SET 'title' = SHA1('tajneheslo')
@@ -66,7 +72,7 @@ dibi::query('UPDATE users SET', [
 Getting results
 
 ```php
-$result = dibi::query('SELECT * FROM users');
+$result = $dibi->query('SELECT * FROM users');
 
 $value = $result->fetchSingle(); // single value
 $all = $result->fetchAll(); // all rows
@@ -82,7 +88,7 @@ foreach ($result as $n => $row) {
 Modifiers for arrays:
 
 ```php
-dibi::query('SELECT * FROM users WHERE %and', [
+$dibi->query('SELECT * FROM users WHERE %and', [
 	array('number > ?', 10),
 	array('number < ?', 100),
 ]);
@@ -105,7 +111,7 @@ dibi::query('SELECT * FROM users WHERE %and', [
 Modifiers for LIKE
 
 ```php
-dibi::query("SELECT * FROM table WHERE name LIKE %like~", $query);
+$dibi->query("SELECT * FROM table WHERE name LIKE %like~", $query);
 ```
 
 <table>
@@ -117,7 +123,7 @@ dibi::query("SELECT * FROM table WHERE name LIKE %like~", $query);
 DateTime:
 
 ```php
-dibi::query('UPDATE users SET', [
+$dibi->query('UPDATE users SET', [
     'time' => new DateTime,
 ]);
 // UPDATE users SET ('2008-01-01 01:08:10')

src/Dibi/Drivers/FirebirdDriver.php

@@ -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.u'");
+		return "'" . substr($value->format('Y-m-d H:i:s.u'), 0, -2) . "'";
 	}
 
 

src/Dibi/Drivers/PdoDriver.php

@@ -104,23 +104,14 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
 	 */
 	public function query($sql)
 	{
-		// 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;
-
-		if (isset($list[$cmd])) {
-			$this->affectedRows = $this->connection->exec($sql);
-			if ($this->affectedRows !== false) {
-				return null;
-			}
-		} else {
-			$res = $this->connection->query($sql);
-			if ($res) {
-				return $this->createResultDriver($res);
-			}
+		$res = $this->connection->query($sql);
+		if ($res) {
+			$this->affectedRows = $res->rowCount();
+			return $res->columnCount() ? $this->createResultDriver($res) : null;
 		}
 
+		$this->affectedRows = false;
+
 		list($sqlState, $code, $message) = $this->connection->errorInfo();
 		$message = "SQLSTATE[$sqlState]: $message";
 		switch ($this->driverName) {

src/Dibi/Translator.php

@@ -315,7 +315,11 @@ final class Translator
 		if ($modifier) {
 			if ($value !== null && !is_scalar($value)) {  // array is already processed
 				if ($value instanceof Literal && ($modifier === 'sql' || $modifier === 'SQL')) {
-					$modifier = 'SQL';
+					return (string) $value;
+
+				} elseif ($value instanceof Expression && $modifier === 'ex') {
+					return call_user_func_array([$this->connection, 'translate'], $value->getValues());
+
 				} elseif (($value instanceof \DateTime || $value instanceof \DateTimeInterface) && ($modifier === 'd' || $modifier === 't' || $modifier === 'dt')) {
 					// continue
 				} else {

src/Dibi/dibi.php

@@ -22,8 +22,8 @@ class dibi
 
 	/** version */
 	const
-		VERSION = '3.1.1',
-		REVISION = 'released on 2018-03-09';
+		VERSION = '3.2.1',
+		REVISION = 'released on 2018-04-14';
 
 	/** sorting order */
 	const
@@ -64,7 +64,7 @@ class dibi
 	/** @var string  Default dibi driver */
 	public static $defaultDriver = 'mysqli';
 
-	/** @var Dibi\Connection[]  Connection registry storage for DibiConnection objects */
+	/** @var Dibi\Connection[]  Connection registry storage for Dibi\Connection objects */
 	private static $registry = [];
 
 	/** @var Dibi\Connection  Current connection */

src/loader.php

@@ -114,26 +114,9 @@ spl_autoload_register(function ($class) {
 	if (isset($map[$class])) {
 		require __DIR__ . '/Dibi/' . $map[$class];
 	} elseif (isset($old2new[$class])) {
+		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$location = isset($trace[1]['file']) ? 'used in ' . $trace[1]['file'] . ':' . $trace[1]['line'] : '';
+		trigger_error("Class $class $location has been renamed to {$old2new[$class]}.", E_USER_DEPRECATED);
 		class_alias($old2new[$class], $class);
 	}
 });
-
-
-// preload for compatiblity
-array_map('class_exists', [
-	'DibiConnection',
-	'DibiDateTime',
-	'DibiDriverException',
-	'DibiEvent',
-	'DibiException',
-	'DibiFluent',
-	'DibiLiteral',
-	'DibiNotImplementedException',
-	'DibiNotSupportedException',
-	'DibiPcreException',
-	'DibiProcedureException',
-	'DibiResult',
-	'DibiRow',
-	'IDataSource',
-	'IDibiDriver',
-]);

tests/dibi/Translator.phpt

@@ -505,6 +505,18 @@ Assert::same(
 );
 
 
+Assert::same(
+	reformat('SELECT * FROM [table] WHERE (([left] = 1) OR ([top] = 2)) AND (number < 100)'),
+	$conn->translate('SELECT * FROM `table` WHERE %and', [
+		new Dibi\Expression('%or', [
+			'left' => 1,
+			'top' => 2,
+		]),
+		new Dibi\Expression('number < %i', 100),
+	])
+);
+
+
 $e = Assert::exception(function () use ($conn) {
 	$array6 = [
 		'id' => [1, 2, 3, 4],

tests/dibi/bootstrap.php

@@ -40,9 +40,6 @@ if ($config['driver'] === 'mysql' && PHP_VERSION_ID >= 70000) {
 }
 
 
-$conn = new Dibi\Connection($config);
-
-
 function test(Closure $function)
 {
 	$function();