From 3eb255899faee0c06ab5fa5cd1b53102957705e2 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 2 May 2018 12:32:39 +0200
Subject: [PATCH] result drivers: resultSet is not nullable

---
 src/Dibi/Drivers/FirebirdResult.php | 3 +--
 src/Dibi/Drivers/MySqliResult.php   | 5 ++---
 src/Dibi/Drivers/OdbcResult.php     | 3 +--
 src/Dibi/Drivers/OracleResult.php   | 3 +--
 src/Dibi/Drivers/PostgreResult.php  | 3 +--
 src/Dibi/Drivers/Sqlite3Result.php  | 5 ++---
 src/Dibi/Drivers/SqlsrvResult.php   | 3 +--
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Dibi/Drivers/FirebirdResult.php b/src/Dibi/Drivers/FirebirdResult.php
index c31968d1..2e9fe34a 100644
--- a/src/Dibi/Drivers/FirebirdResult.php
+++ b/src/Dibi/Drivers/FirebirdResult.php
@@ -20,7 +20,7 @@ class FirebirdResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource|null */
+	/** @var resource */
 	private $resultSet;
 
 	/** @var bool */
@@ -94,7 +94,6 @@ class FirebirdResult implements Dibi\ResultDriver
 	public function free(): void
 	{
 		ibase_free_result($this->resultSet);
-		$this->resultSet = null;
 	}
 
 
diff --git a/src/Dibi/Drivers/MySqliResult.php b/src/Dibi/Drivers/MySqliResult.php
index 56db987a..298e5f96 100644
--- a/src/Dibi/Drivers/MySqliResult.php
+++ b/src/Dibi/Drivers/MySqliResult.php
@@ -19,7 +19,7 @@ class MySqliResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var \mysqli_result|null */
+	/** @var \mysqli_result */
 	private $resultSet;
 
 	/** @var bool */
@@ -88,7 +88,6 @@ class MySqliResult implements Dibi\ResultDriver
 	public function free(): void
 	{
 		mysqli_free_result($this->resultSet);
-		$this->resultSet = null;
 	}
 
 
@@ -129,7 +128,7 @@ class MySqliResult implements Dibi\ResultDriver
 	/**
 	 * Returns the result set resource.
 	 */
-	public function getResultResource(): ?\mysqli_result
+	public function getResultResource(): \mysqli_result
 	{
 		$this->autoFree = false;
 		return $this->resultSet;
diff --git a/src/Dibi/Drivers/OdbcResult.php b/src/Dibi/Drivers/OdbcResult.php
index 0cfaaadb..aff407a4 100644
--- a/src/Dibi/Drivers/OdbcResult.php
+++ b/src/Dibi/Drivers/OdbcResult.php
@@ -19,7 +19,7 @@ class OdbcResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource|null */
+	/** @var resource */
 	private $resultSet;
 
 	/** @var bool */
@@ -98,7 +98,6 @@ class OdbcResult implements Dibi\ResultDriver
 	public function free(): void
 	{
 		odbc_free_result($this->resultSet);
-		$this->resultSet = null;
 	}
 
 
diff --git a/src/Dibi/Drivers/OracleResult.php b/src/Dibi/Drivers/OracleResult.php
index 9be396ca..100e1ec7 100644
--- a/src/Dibi/Drivers/OracleResult.php
+++ b/src/Dibi/Drivers/OracleResult.php
@@ -19,7 +19,7 @@ class OracleResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource|null */
+	/** @var resource */
 	private $resultSet;
 
 	/** @var bool */
@@ -80,7 +80,6 @@ class OracleResult implements Dibi\ResultDriver
 	public function free(): void
 	{
 		oci_free_statement($this->resultSet);
-		$this->resultSet = null;
 	}
 
 
diff --git a/src/Dibi/Drivers/PostgreResult.php b/src/Dibi/Drivers/PostgreResult.php
index 9b8d4ac6..4c853d7f 100644
--- a/src/Dibi/Drivers/PostgreResult.php
+++ b/src/Dibi/Drivers/PostgreResult.php
@@ -20,7 +20,7 @@ class PostgreResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource|null */
+	/** @var resource */
 	private $resultSet;
 
 	/** @var bool */
@@ -81,7 +81,6 @@ class PostgreResult implements Dibi\ResultDriver
 	public function free(): void
 	{
 		pg_free_result($this->resultSet);
-		$this->resultSet = null;
 	}
 
 
diff --git a/src/Dibi/Drivers/Sqlite3Result.php b/src/Dibi/Drivers/Sqlite3Result.php
index a87554a1..ae67fde7 100644
--- a/src/Dibi/Drivers/Sqlite3Result.php
+++ b/src/Dibi/Drivers/Sqlite3Result.php
@@ -20,7 +20,7 @@ class Sqlite3Result implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var \SQLite3Result|null */
+	/** @var \SQLite3Result */
 	private $resultSet;
 
 	/** @var bool */
@@ -80,7 +80,6 @@ class Sqlite3Result implements Dibi\ResultDriver
 	public function free(): void
 	{
 		$this->resultSet->finalize();
-		$this->resultSet = null;
 	}
 
 
@@ -107,7 +106,7 @@ class Sqlite3Result implements Dibi\ResultDriver
 	/**
 	 * Returns the result set resource.
 	 */
-	public function getResultResource(): ?\SQLite3Result
+	public function getResultResource(): \SQLite3Result
 	{
 		$this->autoFree = false;
 		return $this->resultSet;
diff --git a/src/Dibi/Drivers/SqlsrvResult.php b/src/Dibi/Drivers/SqlsrvResult.php
index 7878bf5e..aef1ddb0 100644
--- a/src/Dibi/Drivers/SqlsrvResult.php
+++ b/src/Dibi/Drivers/SqlsrvResult.php
@@ -19,7 +19,7 @@ class SqlsrvResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource|null */
+	/** @var resource */
 	private $resultSet;
 
 	/** @var bool */
@@ -80,7 +80,6 @@ class SqlsrvResult implements Dibi\ResultDriver
 	public function free(): void
 	{
 		sqlsrv_free_stmt($this->resultSet);
-		$this->resultSet = null;
 	}