Declare tentative return types in ext/spl - part 3

ext/spl/tests/array_005.phpt

@@ -35,7 +35,7 @@ class StudentIdFilter extends FilterIterator
         $this->id = $other->getId();
     }
 
-    public function accept()
+    public function accept(): bool
     {
         echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n";
         return $this->current()->getId() == $this->id;

ext/spl/tests/array_009a.phpt

@@ -10,7 +10,7 @@ class MyRecursiveArrayIterator extends ArrayIterator implements RecursiveIterato
         return is_array($this->current());
     }
 
-    function getChildren()
+    function getChildren(): MyRecursiveArrayIterator
     {
         return new MyRecursiveArrayIterator($this->current());
     }

ext/spl/tests/bug37457.phpt

@@ -13,25 +13,25 @@ class Collection implements Iterator
         $this->array = $a;
     }
 
-    public function current()
+    public function current(): mixed
     {
         echo __METHOD__ . "\n";
         return current($this->array);
     }
 
-    public function key()
+    public function key(): mixed
     {
         echo __METHOD__ . "\n";
         return key($this->array);
     }
 
-    public function next()
+    public function next(): void
     {
         echo __METHOD__ . "\n";
         $this->valid = (false !== next($this->array));
     }
 
-    public function valid()
+    public function valid(): bool
     {
         echo __METHOD__ . "\n";
         return $this->valid;
@@ -46,7 +46,7 @@ class Collection implements Iterator
 
 class TestFilter extends FilterIterator
 {
-    public function accept()
+    public function accept(): bool
     {
         echo __METHOD__ . "\n";
         throw new Exception("Failure in Accept");

ext/spl/tests/bug42703.phpt

@@ -6,18 +6,18 @@ class BlaIterator implements Iterator
 {
     public function rewind(): void { }
 
-    public function next() { }
+    public function next(): void { }
 
-    public function valid() {
+    public function valid(): bool {
         return true;
     }
 
-    public function current()
+    public function current(): mixed
     {
       throw new Exception('boo');
     }
 
-    public function key() { }
+    public function key(): mixed { return null; }
 }
 
 $it = new BlaIterator();

ext/spl/tests/bug54384.phpt

@@ -24,7 +24,7 @@ test( function() {
 echo "FilterIterator... ";
 class FilterIteratorTest extends FilterIterator {
     function __construct(){}
-    function accept(){}
+    function accept(): bool {}
 }
 test( function() {
     $o = new FilterIteratorTest;
@@ -34,7 +34,7 @@ test( function() {
 echo "RecursiveFilterIterator... ";
 class RecursiveFilterIteratorTest extends RecursiveFilterIterator {
     function __construct(){}
-    function accept(){}
+    function accept(): bool {}
 }
 test( function() {
 $o = new RecursiveFilterIteratorTest;

ext/spl/tests/bug69970.phpt

@@ -9,7 +9,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator {
   function rewind(): void {
     echo "dummy\n";
   }
-  function endChildren() {
+  function endChildren(): void {
       global $count;
       echo $this->getDepth();
       if (--$count > 0) {

ext/spl/tests/bug73423.phpt

@@ -7,39 +7,39 @@ class foo implements \RecursiveIterator
   {
     public $foo = [];
 
-    public Function current ()
+    public Function current(): mixed
       {
         return current ($this->foo);
       }
 
-    public Function key ()
+    public Function key(): mixed
       {
         return key ($this->foo);
       }
 
-    public Function next ()
+    public Function next(): void
       {
         next ($this->foo);
       }
 
-    public Function rewind ()
+    public Function rewind(): void
       {
         reset ($this->foo);
       }
 
-    public Function valid ()
+    public Function valid(): bool
       {
         return current ($this->foo) !== false;
       }
 
-    public Function getChildren ()
+    public Function getChildren(): ?RecursiveIterator
       {
         return current ($this->foo);
       }
 
-    public Function hasChildren ()
+    public Function hasChildren(): bool
       {
-        return (bool) count ($this->foo);
+        return (bool) count($this->foo);
       }
   }
 
@@ -53,7 +53,7 @@ class fooIterator extends \RecursiveFilterIterator
         /* CRASH */
       }
 
-    public Function accept ()
+    public Function accept(): bool
       {
         return true;
       }

ext/spl/tests/bug74669.phpt

@@ -19,22 +19,22 @@ class Container implements Iterator
         $this->container->append($element);
     }
 
-    public function current()
+    public function current(): mixed
     {
         return $this->iterator->current();
     }
 
-    public function next()
+    public function next(): void
     {
         $this->iterator->next();
     }
 
-    public function key()
+    public function key(): mixed
     {
         return $this->iterator->key();
     }
 
-    public function valid()
+    public function valid(): bool
     {
         return $this->iterator->valid();
     }

ext/spl/tests/bug77263.phpt

@@ -9,11 +9,11 @@ touch("$dir/file1");
 touch("$dir/subdir/file2");
 
 class Filter1 extends RecursiveFilterIterator {
-    public function accept() { return $this->getInnerIterator()->getSubPathname() != ''; }
+    public function accept(): bool { return $this->getInnerIterator()->getSubPathname() != ''; }
 }
 
 class Filter2 extends RecursiveFilterIterator {
-    public function accept() { return $this->getInnerIterator()->getSubPathname() != ' '; }
+    public function accept(): bool { return $this->getInnerIterator()->getSubPathname() != ' '; }
 }
 
 $iterator = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS );

ext/spl/tests/iterator_001.phpt

@@ -20,26 +20,26 @@ class NumericArrayIterator implements Iterator
         $this->i = 0;
     }
 
-    public function valid()
+    public function valid(): bool
     {
         $ret = $this->i < count($this->a);
         echo __METHOD__ . '(' . ($ret ? 'true' : 'false') . ")\n";
         return $ret;
     }
 
-    public function key()
+    public function key(): mixed
     {
         echo __METHOD__ . "\n";
         return $this->i;
     }
 
-    public function current()
+    public function current(): mixed
     {
         echo __METHOD__ . "\n";
         return $this->a[$this->i];
     }
 
-    public function next()
+    public function next(): void
     {
         echo __METHOD__ . "\n";
         $this->i++;
@@ -54,7 +54,7 @@ class NumericArrayIterator implements Iterator
 
 class SeekableNumericArrayIterator extends NumericArrayIterator implements SeekableIterator
 {
-    public function seek($index)
+    public function seek($index): void
     {
         if ($index < count($this->a)) {
             $this->i = $index;

ext/spl/tests/iterator_003.phpt

@@ -35,7 +35,7 @@ class StudentIdFilter extends FilterIterator
         $this->id = $other->getId();
     }
 
-    public function accept()
+    public function accept(): bool
     {
         echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n";
         return $this->current()->getId() == $this->id;

ext/spl/tests/iterator_004.phpt

@@ -20,26 +20,26 @@ class NumericArrayIterator implements Iterator
         $this->i = 0;
     }
 
-    public function valid()
+    public function valid(): bool
     {
         $ret = $this->i < count($this->a);
         echo __METHOD__ . '(' . ($ret ? 'true' : 'false') . ")\n";
         return $ret;
     }
 
-    public function key()
+    public function key(): mixed
     {
         echo __METHOD__ . "\n";
         return $this->i;
     }
 
-    public function current()
+    public function current(): mixed
     {
         echo __METHOD__ . "\n";
         return $this->a[$this->i];
     }
 
-    public function next()
+    public function next(): void
     {
         echo __METHOD__ . "\n";
         $this->i++;
@@ -48,7 +48,7 @@ class NumericArrayIterator implements Iterator
 
 class SeekableNumericArrayIterator extends NumericArrayIterator implements SeekableIterator
 {
-    public function seek($index)
+    public function seek($index): void
     {
         if ($index < count($this->a)) {
             $this->i = $index;

ext/spl/tests/iterator_007.phpt

@@ -39,22 +39,22 @@ class NoRewindIteratorEx extends NoRewindIterator
         echo __METHOD__ . "\n";
         parent::rewind();
     }
-    function valid()
+    function valid(): bool
     {
         echo __METHOD__ . "\n";
         return parent::valid();
     }
-    function current()
+    function current(): mixed
     {
         echo __METHOD__ . "\n";
         return parent::current();
     }
-    function key()
+    function key(): mixed
     {
         echo __METHOD__ . "\n";
         return parent::key();
     }
-    function next()
+    function next(): void
     {
         echo __METHOD__ . "\n";
         parent::next();

ext/spl/tests/iterator_009.phpt

@@ -5,27 +5,27 @@ SPL: EmptyIterator
 
 class EmptyIteratorEx extends EmptyIterator
 {
-    function rewind()
+    function rewind(): void
     {
         echo __METHOD__ . "\n";
         parent::rewind();
     }
-    function valid()
+    function valid(): bool
     {
         echo __METHOD__ . "\n";
         return parent::valid();
     }
-    function current()
+    function current(): never
     {
         echo __METHOD__ . "\n";
-        return parent::current();
+        parent::current();
     }
-    function key()
+    function key(): never
     {
         echo __METHOD__ . "\n";
-        return parent::key();
+        parent::key();
     }
-    function next()
+    function next(): void
     {
         echo __METHOD__ . "\n";
         parent::next();