From f05484fe768e574bb04023d2581d1247493c56d2 Mon Sep 17 00:00:00 2001
From: Brad Dutton <brad@duttonbrosllc.com>
Date: Sat, 4 Jun 2022 11:34:32 -0700
Subject: [PATCH] remove mixed type from current(), add
 #[\ReturnTypeWillChange]

---
 modules/gallery/libraries/MY_ORM.php        | 3 ++-
 system/libraries/Database_Cache_Result.php  | 3 ++-
 system/libraries/Database_Mysql_Result.php  | 3 ++-
 system/libraries/Database_Mysqli_Result.php | 3 ++-
 system/libraries/ORM_Iterator.php           | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 13d51bd5..a0ff0237 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -42,7 +42,8 @@ class ORM_Iterator extends ORM_Iterator_Core {
   /**
    * Cache the result row
    */
-  public function current(): mixed
+  #[\ReturnTypeWillChange]
+  public function current()
   {
     $row = parent::current();
     if (is_object($row)) {
diff --git a/system/libraries/Database_Cache_Result.php b/system/libraries/Database_Cache_Result.php
index 3945c42c..6cb97ffa 100644
--- a/system/libraries/Database_Cache_Result.php
+++ b/system/libraries/Database_Cache_Result.php
@@ -64,6 +64,7 @@ class Database_Cache_Result_Core extends Database_Result {
 		return TRUE;
 	}
 
+    #[\ReturnTypeWillChange]
 	public function current()
 	{
 		if ($this->return_objects)
@@ -78,4 +79,4 @@ class Database_Cache_Result_Core extends Database_Result {
 		}
 	}
 
-} // End Database_Cache_Result
\ No newline at end of file
+} // End Database_Cache_Result
diff --git a/system/libraries/Database_Mysql_Result.php b/system/libraries/Database_Mysql_Result.php
index 0f898984..357a72b0 100644
--- a/system/libraries/Database_Mysql_Result.php
+++ b/system/libraries/Database_Mysql_Result.php
@@ -146,6 +146,7 @@ class Database_Mysql_Result_Core extends Database_Result {
 	/**
 	 * Iterator: current
 	 */
+    #[\ReturnTypeWillChange]
 	public function current()
 	{
 		if ($this->current_row !== $this->internal_row AND ! $this->seek($this->current_row))
@@ -171,4 +172,4 @@ class Database_Mysql_Result_Core extends Database_Result {
 		}
 	}
 
-} // End Database_MySQL_Result
\ No newline at end of file
+} // End Database_MySQL_Result
diff --git a/system/libraries/Database_Mysqli_Result.php b/system/libraries/Database_Mysqli_Result.php
index 1d261626..96c4c721 100644
--- a/system/libraries/Database_Mysqli_Result.php
+++ b/system/libraries/Database_Mysqli_Result.php
@@ -141,7 +141,8 @@ class Database_Mysqli_Result_Core extends Database_Result {
 	/**
 	 * Iterator: current
 	 */
-	public function current(): mixed
+    #[\ReturnTypeWillChange]
+	public function current()
 	{
 		if ($this->current_row !== $this->internal_row AND ! $this->seek($this->current_row))
 			return NULL;
diff --git a/system/libraries/ORM_Iterator.php b/system/libraries/ORM_Iterator.php
index 97389479..2216cdb4 100644
--- a/system/libraries/ORM_Iterator.php
+++ b/system/libraries/ORM_Iterator.php
@@ -176,7 +176,8 @@ class ORM_Iterator_Core implements Iterator, ArrayAccess, Countable {
 	/**
 	 * Iterator: current
 	 */
-	public function current(): mixed
+    #[\ReturnTypeWillChange]
+	public function current()
 	{
 		if ($row = $this->result->current())
 		{