From 99df11e99b8d4df2594ae4cf7ad902a407e4a479 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 19:30:48 -0500
Subject: [PATCH] Fix PHP 8 inheritance deprecation warnings in App\PAge and
 ParsedLogIterator

---
 src/App/Page.php                    | 62 ++++++-----------------------
 src/Model/Log/ParsedLogIterator.php |  8 ++--
 2 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/src/App/Page.php b/src/App/Page.php
index 0f14d9f6e6..37141426c3 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -115,76 +115,40 @@ class Page implements ArrayAccess
 		}
 	}
 
+	// ArrayAccess interface
+
 	/**
-	 * Whether a offset exists
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetexists.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      An offset to check for.
-	 *                      </p>
-	 *
-	 * @return boolean true on success or false on failure.
-	 * </p>
-	 * <p>
-	 * The return value will be casted to boolean if non-boolean was returned.
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
+	#[\ReturnTypeWillChange]
 	public function offsetExists($offset): bool
 	{
 		return isset($this->page[$offset]);
 	}
 
 	/**
-	 * Offset to retrieve
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetget.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      The offset to retrieve.
-	 *                      </p>
-	 *
-	 * @return mixed Can return all value types.
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
+	#[\ReturnTypeWillChange]
 	public function offsetGet($offset)
 	{
 		return $this->page[$offset] ?? null;
 	}
 
 	/**
-	 * Offset to set
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetset.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      The offset to assign the value to.
-	 *                      </p>
-	 * @param mixed $value  <p>
-	 *                      The value to set.
-	 *                      </p>
-	 *
-	 * @return void
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
-	public function offsetSet($offset, $value)
+	#[\ReturnTypeWillChange]
+	public function offsetSet($offset, $value): void
 	{
 		$this->page[$offset] = $value;
 	}
 
 	/**
-	 * Offset to unset
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetunset.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      The offset to unset.
-	 *                      </p>
-	 *
-	 * @return void
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
-	public function offsetUnset($offset)
+	#[\ReturnTypeWillChange]
+	public function offsetUnset($offset): void
 	{
 		if (isset($this->page[$offset])) {
 			unset($this->page[$offset]);
@@ -310,7 +274,7 @@ class Page implements ArrayAccess
 		}
 		return $pageURL;
 	}
-      
+
 	/**
 	 * Initializes Page->page['footer'].
 	 *
diff --git a/src/Model/Log/ParsedLogIterator.php b/src/Model/Log/ParsedLogIterator.php
index 4309e4cd00..e3415da8ca 100644
--- a/src/Model/Log/ParsedLogIterator.php
+++ b/src/Model/Log/ParsedLogIterator.php
@@ -160,7 +160,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::next()
 	 * @return void
 	 */
-	public function next()
+	public function next(): void
 	{
 		$parsed = $this->read();
 
@@ -177,7 +177,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::rewind()
 	 * @return void
 	 */
-	public function rewind()
+	public function rewind(): void
 	{
 		$this->value = null;
 		$this->reader->rewind();
@@ -200,9 +200,9 @@ class ParsedLogIterator implements \Iterator
 	 * Return current iterator value
 	 *
 	 * @see Iterator::current()
-	 * @return ?ParsedLogLing
+	 * @return ?ParsedLogLine
 	 */
-	public function current()
+	public function current(): ?ParsedLogLine
 	{
 		return $this->value;
 	}
-- 
2.39.5