From 52864069eeca5a693e8ee042dba0b6155d8eb885 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 25 Aug 2021 03:12:58 +0200
Subject: [PATCH] support for PHP 8.1

---
 .github/workflows/tests.yml |  2 +-
 readme.md                   |  2 +-
 src/Dibi/ResultIterator.php |  2 ++
 src/Dibi/Row.php            | 11 ++++++-----
 tests/dibi/DateTime.phpt    |  2 --
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b81c281de..94a1ff24f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1']
 
             fail-fast: false
 
diff --git a/readme.md b/readme.md
index a9ddde923..e0a96cb2c 100644
--- a/readme.md
+++ b/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.0.
+The Dibi 4.2 requires PHP version 7.2 and supports PHP up to 8.1.
 
 
 Usage
diff --git a/src/Dibi/ResultIterator.php b/src/Dibi/ResultIterator.php
index a4ee1daac..92b42018e 100644
--- a/src/Dibi/ResultIterator.php
+++ b/src/Dibi/ResultIterator.php
@@ -44,6 +44,7 @@ public function rewind(): void
 	}
 
 
+	#[\ReturnTypeWillChange]
 	/**
 	 * Returns the key of the current element.
 	 * @return mixed
@@ -54,6 +55,7 @@ public function key()
 	}
 
 
+	#[\ReturnTypeWillChange]
 	/**
 	 * Returns the current element.
 	 * @return mixed
diff --git a/src/Dibi/Row.php b/src/Dibi/Row.php
index f367fd456..eb82eecdc 100644
--- a/src/Dibi/Row.php
+++ b/src/Dibi/Row.php
@@ -62,37 +62,38 @@ public function __isset(string $key): bool
 	/********************* interfaces ArrayAccess, Countable & IteratorAggregate ****************d*g**/
 
 
-	final public function count()
+	final public function count(): int
 	{
 		return count((array) $this);
 	}
 
 
-	final public function getIterator()
+	final public function getIterator(): \ArrayIterator
 	{
 		return new \ArrayIterator($this);
 	}
 
 
-	final public function offsetSet($nm, $val)
+	final public function offsetSet($nm, $val): void
 	{
 		$this->$nm = $val;
 	}
 
 
+	#[\ReturnTypeWillChange]
 	final public function offsetGet($nm)
 	{
 		return $this->$nm;
 	}
 
 
-	final public function offsetExists($nm)
+	final public function offsetExists($nm): bool
 	{
 		return isset($this->$nm);
 	}
 
 
-	final public function offsetUnset($nm)
+	final public function offsetUnset($nm): void
 	{
 		unset($this->$nm);
 	}
diff --git a/tests/dibi/DateTime.phpt b/tests/dibi/DateTime.phpt
index 5621c9b0f..281be3c8e 100644
--- a/tests/dibi/DateTime.phpt
+++ b/tests/dibi/DateTime.phpt
@@ -14,8 +14,6 @@ Assert::same('1978-01-23 11:40:00.000000', (string) new DateTime(254400000));
 Assert::same('1978-01-23 11:40:00.000000', (string) (new DateTime)->setTimestamp(254400000));
 Assert::same(254400000, (new DateTime(254400000))->getTimestamp());
 
-Assert::same('2050-08-13 11:40:00.000000', (string) new DateTime(2544000000));
-Assert::same('2050-08-13 11:40:00.000000', (string) (new DateTime)->setTimestamp(2544000000));
 Assert::same(is_int(2544000000) ? 2544000000 : '2544000000', (new DateTime(2544000000))->getTimestamp()); // 64 bit
 
 Assert::same('1978-05-05 00:00:00.000000', (string) new DateTime('1978-05-05'));