Make compatible with PHP 8.1

xp-forge · Oct 21, 2021 · 4c5c0b9 · 4c5c0b9
1 parent 7df93f1
commit 4c5c0b9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,6 +5,8 @@ JSON for the XP Framework ChangeLog
 
 ## 5.0.0 / 2021-10-21
 
+* Made compatible with PHP 8.1 - add `ReturnTypeWillChange` attributes to
+  iterator, see https://wiki.php.net/rfc/internal_method_return_types
 * Implemented xp-framework/rfc#341, dropping compatibility with XP 9
   (@thekid)
 

diff --git a/src/main/php/text/json/Elements.class.php b/src/main/php/text/json/Elements.class.php
@@ -1,5 +1,6 @@
 <?php namespace text\json;
 
+use Iterator, ReturnTypeWillChange;
 use lang\FormatException;
 use util\Objects;
 
@@ -8,7 +9,7 @@
  * an element from the underlying input, then returns it immediately for
  * further processing instead of parsing the entire representation first.
  */
-class Elements implements \Iterator {
+class Elements implements Iterator {
   protected $input;
   protected $id= 0;
   protected $current= null;
@@ -23,6 +24,7 @@ public function __construct(Input $input) {
   }
 
   /** @return void */
+  #[ReturnTypeWillChange]
   public function rewind() {
     $token= $this->input->firstToken();
     if ('[' === $token) {
@@ -39,15 +41,19 @@ public function rewind() {
   }
 
   /** @return var */
+  #[ReturnTypeWillChange]
   public function current() { return $this->current; }
 
   /** @return var */
+  #[ReturnTypeWillChange]
   public function key() { return $this->id; }
 
   /** @return bool */
+  #[ReturnTypeWillChange]
   public function valid() { return null !== $this->id; }
 
   /** @return void */
+  #[ReturnTypeWillChange]
   public function next() {
     $token= $this->input->nextToken();
     if (',' === $token) {

diff --git a/src/main/php/text/json/Pairs.class.php b/src/main/php/text/json/Pairs.class.php
@@ -1,5 +1,6 @@
 <?php namespace text\json;
 
+use Iterator, ReturnTypeWillChange;
 use lang\FormatException;
 use util\Objects;
 
@@ -8,7 +9,7 @@
  * parses an element from the underlying input, then returns it immediately 
  * for further processing instead of parsing the entire representation first.
  */
-class Pairs implements \Iterator {
+class Pairs implements Iterator {
   protected $input;
   protected $key= null;
   protected $value= null;
@@ -38,6 +39,7 @@ private function nextValue() {
   }
 
   /** @return void */
+  #[ReturnTypeWillChange]
   public function rewind() {
     $token= $this->input->firstToken();
     if ('{' === $token) {
@@ -55,15 +57,19 @@ public function rewind() {
   }
 
   /** @return var */
+  #[ReturnTypeWillChange]
   public function current() { return $this->value; }
 
   /** @return var */
+  #[ReturnTypeWillChange]
   public function key() { return $this->key; }
 
   /** @return bool */
+  #[ReturnTypeWillChange]
   public function valid() { return null !== $this->key; }
 
   /** @return void */
+  #[ReturnTypeWillChange]
   public function next() {
     $token= $this->input->nextToken();
     if (',' === $token) {