Fix PHP 8 inheritance deprecation warnings in App\PAge and ParsedLogIterator

This commit is contained in:
Hypolite Petovan 2022-11-19 19:30:48 -05:00
parent 6f93ee7e49
commit 99df11e99b
2 changed files with 17 additions and 53 deletions

View File

@ -115,76 +115,40 @@ class Page implements ArrayAccess
} }
} }
// ArrayAccess interface
/** /**
* Whether a offset exists * @inheritDoc
*
* @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
*/ */
#[\ReturnTypeWillChange]
public function offsetExists($offset): bool public function offsetExists($offset): bool
{ {
return isset($this->page[$offset]); return isset($this->page[$offset]);
} }
/** /**
* Offset to retrieve * @inheritDoc
*
* @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
*/ */
#[\ReturnTypeWillChange]
public function offsetGet($offset) public function offsetGet($offset)
{ {
return $this->page[$offset] ?? null; return $this->page[$offset] ?? null;
} }
/** /**
* Offset to set * @inheritDoc
*
* @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
*/ */
public function offsetSet($offset, $value) #[\ReturnTypeWillChange]
public function offsetSet($offset, $value): void
{ {
$this->page[$offset] = $value; $this->page[$offset] = $value;
} }
/** /**
* Offset to unset * @inheritDoc
*
* @link https://php.net/manual/en/arrayaccess.offsetunset.php
*
* @param mixed $offset <p>
* The offset to unset.
* </p>
*
* @return void
* @since 5.0.0
*/ */
public function offsetUnset($offset) #[\ReturnTypeWillChange]
public function offsetUnset($offset): void
{ {
if (isset($this->page[$offset])) { if (isset($this->page[$offset])) {
unset($this->page[$offset]); unset($this->page[$offset]);
@ -310,7 +274,7 @@ class Page implements ArrayAccess
} }
return $pageURL; return $pageURL;
} }
/** /**
* Initializes Page->page['footer']. * Initializes Page->page['footer'].
* *

View File

@ -160,7 +160,7 @@ class ParsedLogIterator implements \Iterator
* @see Iterator::next() * @see Iterator::next()
* @return void * @return void
*/ */
public function next() public function next(): void
{ {
$parsed = $this->read(); $parsed = $this->read();
@ -177,7 +177,7 @@ class ParsedLogIterator implements \Iterator
* @see Iterator::rewind() * @see Iterator::rewind()
* @return void * @return void
*/ */
public function rewind() public function rewind(): void
{ {
$this->value = null; $this->value = null;
$this->reader->rewind(); $this->reader->rewind();
@ -200,9 +200,9 @@ class ParsedLogIterator implements \Iterator
* Return current iterator value * Return current iterator value
* *
* @see Iterator::current() * @see Iterator::current()
* @return ?ParsedLogLing * @return ?ParsedLogLine
*/ */
public function current() public function current(): ?ParsedLogLine
{ {
return $this->value; return $this->value;
} }