Various ext/spl stub fixes

Author: kocsismate

ext/spl/spl_array.stub.php

@@ -6,29 +6,17 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
 {
     public function __construct(array|object $array = [], int $flags = 0, string $iteratorClass = ArrayIterator::class) {}
 
-    /**
-     * @param string|int $key
-     * @return bool
-     */
-    public function offsetExists($key) {}
+    /** @return bool */
+    public function offsetExists(mixed $key) {}
 
-    /**
-     * @param string|int $key
-     * @return mixed
-     */
-    public function offsetGet($key) {}
+    /** @return mixed */
+    public function offsetGet(mixed $key) {}
 
-    /**
-     * @param string|int $key
-     * @return void
-     */
-    public function offsetSet($key, mixed $value) {}
+    /** @return void */
+    public function offsetSet(mixed $key, mixed $value) {}
 
-    /**
-     * @param string|int $key
-     * @return void
-     */
-    public function offsetUnset($key) {}
+    /** @return void */
+    public function offsetUnset(mixed $key) {}
 
     /** @return void */
     public function append(mixed $value) {}
@@ -96,32 +84,28 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Serializable, Coun
     public function __construct(array|object $array = [], int $flags = 0) {}
 
     /**
-     * @param string|int $key
      * @return bool
      * @implementation-alias ArrayObject::offsetExists
      */
-    public function offsetExists($key) {}
+    public function offsetExists(mixed $key) {}
 
     /**
-     * @param string|int $key
      * @return mixed
      * @implementation-alias ArrayObject::offsetGet
      */
-    public function offsetGet($key) {}
+    public function offsetGet(mixed $key) {}
 
     /**
-     * @param string|int $key
      * @return void
      * @implementation-alias ArrayObject::offsetSet
      */
-    public function offsetSet($key, mixed $value) {}
+    public function offsetSet(mixed $key, mixed $value) {}
 
     /**
-     * @param string|int $key
      * @return void
      * @implementation-alias ArrayObject::offsetUnset
      */
-    public function offsetUnset($key) {}
+    public function offsetUnset(mixed $key) {}
 
     /**
      * @return void

ext/spl/spl_directory.stub.php

@@ -211,7 +211,7 @@ public function fgetcsv(string $separator = ",", string $enclosure = "\"", strin
     /** @return int|false */
     public function fputcsv(array $fields, string $separator = ",", string $enclosure = "\"", string $escape = "\\") {}
 
-    /** @return bool|null */
+    /** @return void */
     public function setCsvControl(string $separator = ",", string $enclosure = "\"", string $escape = "\\") {}
 
     /** @return array */
@@ -274,7 +274,7 @@ public function getMaxLineLen() {}
     /** @return bool */
     public function hasChildren() {}
 
-    /** @return null */
+    /** @return void */
     public function getChildren() {}
 
     /** @return void */

ext/spl/spl_iterators.stub.php

@@ -53,7 +53,7 @@ public function getChildren();
 
 class RecursiveIteratorIterator implements OuterIterator
 {
-    public function __construct(Traversable $iterator, int $mode = self::LEAVES_ONLY, int $flags = 0) {}
+    public function __construct(Traversable $iterator, int $mode = RecursiveIteratorIterator::LEAVES_ONLY, int $flags = 0) {}
 
     /** @return void */
     public function rewind() {}
@@ -200,7 +200,7 @@ public function getPosition() {}
 
 class CachingIterator extends IteratorIterator implements ArrayAccess, Countable
 {
-    public function __construct(Iterator $iterator, int $flags = self::CALL_TOSTRING) {}
+    public function __construct(Iterator $iterator, int $flags = CachingIterator::CALL_TOSTRING) {}
 
     /** @return void */
     public function rewind() {}
@@ -255,7 +255,7 @@ public function count() {}
 
 class RecursiveCachingIterator extends CachingIterator implements RecursiveIterator
 {
-    public function __construct(Iterator $iterator, int $flags = self::CALL_TOSTRING) {}
+    public function __construct(Iterator $iterator, int $flags = RecursiveCachingIterator::CALL_TOSTRING) {}
 
     /** @return bool */
     public function hasChildren() {}
@@ -320,7 +320,7 @@ public function next() {}
 
 class RegexIterator extends FilterIterator
 {
-    public function __construct(Iterator $iterator, string $pattern, int $mode = self::MATCH, int $flags = 0, int $pregFlags = 0) {}
+    public function __construct(Iterator $iterator, string $pattern, int $mode = RegexIterator::MATCH, int $flags = 0, int $pregFlags = 0) {}
 
     /** @return bool */
     public function accept() {}
@@ -349,7 +349,7 @@ public function setPregFlags(int $pregFlags) {}
 
 class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator
 {
-    public function __construct(RecursiveIterator $iterator, string $pattern, int $mode = self::MATCH, int $flags = 0, int $pregFlags = 0) {}
+    public function __construct(RecursiveIterator $iterator, string $pattern, int $mode = RecursiveRegexIterator::MATCH, int $flags = 0, int $pregFlags = 0) {}
 
     /** @return bool */
     public function accept() {}
@@ -369,9 +369,9 @@ class RecursiveTreeIterator extends RecursiveIteratorIterator
     /** @param RecursiveIterator|IteratorAggregate $iterator */
     public function __construct(
         $iterator,
-        int $flags = self::BYPASS_KEY,
+        int $flags = RecursiveTreeIterator::BYPASS_KEY,
         int $cachingIteratorFlags = CachingIterator::CATCH_GET_CHILD,
-        int $mode = self::SELF_FIRST
+        int $mode = RecursiveTreeIterator::SELF_FIRST
     ) {}
 
     /** @return mixed */