Fix PHP 8.1 fatal errors on classes that "implements ArrayAccess"

williamdes · williamdes · commit 57b6c4366da6 · 2021-08-17T00:11:59.000+02:00
"PHP Fatal error:  During inheritance of ArrayAccess: Uncaught Return type of PhpMyAdmin\SqlParser\TokensList::offsetExists($offset) should either be compatible with ArrayAccess::offsetExists(mixed $offset): bool, or the #[ReturnTypeWillChange] attribute should be used to temporarily suppress the notice"

"Fatal error: During inheritance of ArrayAccess: Uncaught Return type of PhpMyAdmin\SqlParser\TokensList::offsetExists($offset) should either be compatible with ArrayAccess::offsetExists(mixed $offset): bool, or the #[ReturnTypeWillChange] attribute should be used to temporarily suppress the notice"

I added "#[ReturnTypeWillChange]"

Signed-off-by: William Desportes &lt;williamdes@wdes.fr&gt;
diff --git a/src/TokensList.php b/src/TokensList.php
@@ -153,6 +153,7 @@ public function getNextOfTypeAndValue($type, $value)
      * @param int   $offset the offset to be set
      * @param Token $value  the token to be saved
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if ($offset === null) {
@@ -169,6 +170,7 @@ public function offsetSet($offset, $value)
      *
      * @return Token
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $offset < $this->count ? $this->tokens[$offset] : null;
@@ -181,6 +183,7 @@ public function offsetGet($offset)
      *
      * @return bool
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $offset < $this->count;
@@ -191,6 +194,7 @@ public function offsetExists($offset)
      *
      * @param int $offset the offset to be unset
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->tokens[$offset]);
diff --git a/src/UtfString.php b/src/UtfString.php
@@ -91,6 +91,7 @@ public function __construct($str)
      *
      * @return bool
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return ($offset >= 0) && ($offset < $this->charLen);
@@ -103,6 +104,7 @@ public function offsetExists($offset)
      *
      * @return string|null
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if (($offset < 0) || ($offset >= $this->charLen)) {
@@ -146,6 +148,7 @@ public function offsetGet($offset)
      *
      * @throws Exception not implemented.
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         throw new Exception('Not implemented.');
@@ -158,6 +161,7 @@ public function offsetSet($offset, $value)
      *
      * @throws Exception not implemented.
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         throw new Exception('Not implemented.');

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ public function getNextOfTypeAndValue($type, $value)`
`153`	`153`	`* @param int $offset the offset to be set`
`154`	`154`	`* @param Token $value the token to be saved`
`155`	`155`	`*/`
	`156`	`+ #[ReturnTypeWillChange]`
`156`	`157`	`public function offsetSet($offset, $value)`
`157`	`158`	`{`
`158`	`159`	`if ($offset === null) {`
`@@ -169,6 +170,7 @@ public function offsetSet($offset, $value)`
`169`	`170`	`*`
`170`	`171`	`* @return Token`
`171`	`172`	`*/`
	`173`	`+ #[ReturnTypeWillChange]`
`172`	`174`	`public function offsetGet($offset)`
`173`	`175`	`{`
`174`	`176`	`return $offset < $this->count ? $this->tokens[$offset] : null;`
`@@ -181,6 +183,7 @@ public function offsetGet($offset)`
`181`	`183`	`*`
`182`	`184`	`* @return bool`
`183`	`185`	`*/`
	`186`	`+ #[ReturnTypeWillChange]`
`184`	`187`	`public function offsetExists($offset)`
`185`	`188`	`{`
`186`	`189`	`return $offset < $this->count;`
`@@ -191,6 +194,7 @@ public function offsetExists($offset)`
`191`	`194`	`*`
`192`	`195`	`* @param int $offset the offset to be unset`
`193`	`196`	`*/`
	`197`	`+ #[ReturnTypeWillChange]`
`194`	`198`	`public function offsetUnset($offset)`
`195`	`199`	`{`
`196`	`200`	`unset($this->tokens[$offset]);`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ public function __construct($str)`
`91`	`91`	`*`
`92`	`92`	`* @return bool`
`93`	`93`	`*/`
	`94`	`+ #[ReturnTypeWillChange]`
`94`	`95`	`public function offsetExists($offset)`
`95`	`96`	`{`
`96`	`97`	`return ($offset >= 0) && ($offset < $this->charLen);`
`@@ -103,6 +104,7 @@ public function offsetExists($offset)`
`103`	`104`	`*`
`104`	`105`	`* @return string\|null`
`105`	`106`	`*/`
	`107`	`+ #[ReturnTypeWillChange]`
`106`	`108`	`public function offsetGet($offset)`
`107`	`109`	`{`
`108`	`110`	`if (($offset < 0) \|\| ($offset >= $this->charLen)) {`
`@@ -146,6 +148,7 @@ public function offsetGet($offset)`
`146`	`148`	`*`
`147`	`149`	`* @throws Exception not implemented.`
`148`	`150`	`*/`
	`151`	`+ #[ReturnTypeWillChange]`
`149`	`152`	`public function offsetSet($offset, $value)`
`150`	`153`	`{`
`151`	`154`	`throw new Exception('Not implemented.');`
`@@ -158,6 +161,7 @@ public function offsetSet($offset, $value)`
`158`	`161`	`*`
`159`	`162`	`* @throws Exception not implemented.`
`160`	`163`	`*/`
	`164`	`+ #[ReturnTypeWillChange]`
`161`	`165`	`public function offsetUnset($offset)`
`162`	`166`	`{`
`163`	`167`	`throw new Exception('Not implemented.');`