Released version 4.2.8

.gitattributes

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

.github/workflows/tests.yml

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

readme.md

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

src/Dibi/Drivers/FirebirdResult.php

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

src/Dibi/Drivers/MySqliResult.php

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

src/Dibi/Drivers/OdbcResult.php

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

src/Dibi/Drivers/OracleResult.php

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

src/Dibi/Drivers/PostgreResult.php

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

src/Dibi/Drivers/SqliteResult.php

@@ -23,9 +23,6 @@ class SqliteResult implements Dibi\ResultDriver
 	/** @var \SQLite3Result */
 	private $resultSet;
 
-	/** @var bool */
-	private $autoFree = true;
-
 
 	public function __construct(\SQLite3Result $resultSet)
 	{
@@ -33,17 +30,6 @@ class SqliteResult implements Dibi\ResultDriver
 	}
 
 
-	/**
-	 * Automatically frees the resources allocated for this result set.
-	 */
-	public function __destruct()
-	{
-		if ($this->autoFree && $this->getResultResource()) {
-			@$this->free();
-		}
-	}
-
-
 	/**
 	 * Returns the number of rows in a result set.
 	 * @throws Dibi\NotSupportedException
@@ -109,7 +95,6 @@ class SqliteResult implements Dibi\ResultDriver
 	 */
 	public function getResultResource(): \SQLite3Result
 	{
-		$this->autoFree = false;
 		return $this->resultSet;
 	}
 

src/Dibi/Drivers/SqlsrvResult.php

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

src/Dibi/Fluent.php

@@ -27,6 +27,8 @@ namespace Dibi;
  * @method Fluent innerJoin(...$table)
  * @method Fluent rightJoin(...$table)
  * @method Fluent outerJoin(...$table)
+ * @method Fluent union(Fluent $fluent)
+ * @method Fluent unionAll(Fluent $fluent)
  * @method Fluent as(...$field)
  * @method Fluent on(...$cond)
  * @method Fluent and(...$cond)

src/Dibi/ResultIterator.php

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

src/Dibi/dibi.php

@@ -44,7 +44,7 @@ class dibi
 		IDENTIFIER = 'n';
 
 	/** version */
-	public const VERSION = '4.2.6';
+	public const VERSION = '4.2.8';
 
 	/** sorting order */
 	public const

tests/dibi/Sqlsrv.limits.phpt

@@ -82,10 +82,9 @@ $tests = function ($conn) {
 			$conn->translate('SELECT 1 %lmt', -10)
 		);
 
-		Assert::exception(
+		Assert::exception(function () {
-			$conn->translate('SELECT 1 %ofs %lmt', 10, 10),
+			$conn->translate('SELECT 1 %ofs %lmt', 10, 10);
-			Dibi\NotSupportedException::class
+		}, Dibi\NotSupportedException::class);
-		);
 	}
 };