Remove usage of ReturnTypeWillChange

twigphp · Dec 24, 2023 · 5c9723e · 5c9723e
1 parent fa91edf
commit 5c9723e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 51 deletions.
diff --git a/src/Markup.php b/src/Markup.php
@@ -32,20 +32,12 @@ public function __toString()
         return $this->content;
     }
 
-    /**
-     * @return int
-     */
-    #[\ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return mb_strlen($this->content, $this->charset);
     }
 
-    /**
-     * @return mixed
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->content;
     }

diff --git a/src/Node/Node.php b/src/Node/Node.php
@@ -144,11 +144,7 @@ public function removeNode(string $name): void
         unset($this->nodes[$name]);
     }
 
-    /**
-     * @return int
-     */
-    #[\ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return \count($this->nodes);
     }

diff --git a/src/Util/TemplateDirIterator.php b/src/Util/TemplateDirIterator.php
@@ -16,20 +16,12 @@
  */
 class TemplateDirIterator extends \IteratorIterator
 {
-    /**
-     * @return mixed
-     */
-    #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         return file_get_contents(parent::current());
     }
 
-    /**
-     * @return mixed
-     */
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return (string) parent::key();
     }

diff --git a/tests/Extension/CoreTest.php b/tests/Extension/CoreTest.php
@@ -381,8 +381,7 @@ public function rewind(): void
         $this->position = 0;
     }
 
-    #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         if ($this->allowValueAccess) {
             return $this->array[$this->key()];
@@ -391,8 +390,7 @@ public function current()
         throw new \LogicException('Code should only use the keys, not the values provided by iterator.');
     }
 
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return $this->arrayKeys[$this->position];
     }

diff --git a/tests/Fixtures/tags/for/objects.test b/tests/Fixtures/tags/for/objects.test
@@ -19,10 +19,8 @@
 class ItemsIterator implements \Iterator
 {
   protected $values = ['foo' => 'bar', 'bar' => 'foo'];
-  #[\ReturnTypeWillChange]
-  public function current() { return current($this->values); }
-  #[\ReturnTypeWillChange]
-  public function key() { return key($this->values); }
+  public function current(): mixed { return current($this->values); }
+  public function key(): mixed { return key($this->values); }
   public function next(): void { next($this->values); }
   public function rewind(): void { reset($this->values); }
   public function valid(): bool { return false !== current($this->values); }

diff --git a/tests/Fixtures/tags/for/objects_countable.test b/tests/Fixtures/tags/for/objects_countable.test
@@ -20,10 +20,8 @@
 class ItemsIteratorCountable implements \Iterator, \Countable
 {
   protected $values = ['foo' => 'bar', 'bar' => 'foo'];
-  #[\ReturnTypeWillChange]
-  public function current() { return current($this->values); }
-  #[\ReturnTypeWillChange]
-  public function key() { return key($this->values); }
+  public function current(): mixed { return current($this->values); }
+  public function key(): mixed { return key($this->values); }
   public function next(): void { next($this->values); }
   public function rewind(): void { reset($this->values); }
   public function valid(): bool { return false !== current($this->values); }

diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
@@ -106,14 +106,12 @@ public function rewind(): void
         $this->position = 0;
     }
 
-    #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         return $this->array[$this->position];
     }
 
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return 'a';
     }
@@ -366,8 +364,7 @@ class SimpleIteratorForTesting implements \Iterator
     private $data = [1, 2, 3, 4, 5, 6, 7];
     private $key = 0;
 
-    #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         return $this->key;
     }
@@ -377,8 +374,7 @@ public function next(): void
         ++$this->key;
     }
 
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return $this->key;
     }

diff --git a/tests/TemplateTest.php b/tests/TemplateTest.php
@@ -469,8 +469,7 @@ public function offsetExists($name): bool
         return \array_key_exists($name, $this->attributes);
     }
 
-    #[\ReturnTypeWillChange]
-    public function offsetGet($name)
+    public function offsetGet($name): mixed
     {
         return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : null;
     }
@@ -559,8 +558,7 @@ public function offsetExists($offset): bool
         return \array_key_exists($offset, $this->data);
     }
 
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->offsetExists($offset) ? $this->data[$offset] : 'n/a';
     }
@@ -708,8 +706,7 @@ public function offsetExists($offset): bool
         return \array_key_exists($offset, $this->children);
     }
 
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->children[$offset];
     }