Add more precise type info for ArrayAccess methods

Author: kocsismate

Zend/zend_weakrefs.stub.php

@@ -15,15 +15,11 @@ final class WeakMap implements ArrayAccess, Countable, IteratorAggregate
 {
     /**
      * @param object $object
-     * @return mixed
      */
-    public function offsetGet($object) {}
+    public function offsetGet($object): mixed {}
 
-    /**
-     * @param object $object
-     * @param mixed $value
-     */
-    public function offsetSet($object, $value): void {}
+    /** @param object $object */
+    public function offsetSet($object, mixed $value): void {}
 
     /** @param object $object */
     public function offsetExists($object): bool {}

Zend/zend_weakrefs_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 8a90ffe614346c65d312bc5061fd304056b5640a */
+ * Stub hash: 0569bc7e10a1ec15a3a9eec481da27b647eb1d1d */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_WeakReference___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -11,13 +11,13 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_WeakReference_get, 0, 0, IS_OBJECT, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_WeakMap_offsetGet, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_WeakMap_offsetGet, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_WeakMap_offsetSet, 0, 2, IS_VOID, 0)
 	ZEND_ARG_INFO(0, object)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_WeakMap_offsetExists, 0, 1, _IS_BOOL, 0)

ext/spl/spl_array.stub.php

@@ -8,26 +8,25 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
     public function __construct($input = [], int $flags = 0, string $iterator_class = ArrayIterator::class) {}
 
     /**
-     * @param mixed $index
+     * @param array|string|float|int|bool|null $index
      * @return bool
      */
     public function offsetExists($index) {}
 
     /**
-     * @param mixed $index
+     * @param array|string|float|int|bool|null $index
      * @return mixed
      */
     public function offsetGet($index) {}
 
     /**
-     * @param mixed $index
-     * @param mixed $value
+     * @param array|string|float|int|bool|null $index
      * @return void
      */
-    public function offsetSet($index, $value) {}
+    public function offsetSet($index, mixed $value) {}
 
     /**
-     * @param mixed $index
+     * @param array|string|float|int|bool|null $index
      * @return void
      */
     public function offsetUnset($index) {}
@@ -132,11 +131,10 @@ public function offsetGet($index) {}
 
     /**
      * @param mixed $index
-     * @param mixed $value
      * @return void
      * @alias ArrayObject::offsetSet
      */
-    public function offsetSet($index, $value) {}
+    public function offsetSet($index, mixed $value) {}
 
     /**
      * @param mixed $index

ext/spl/spl_array_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1230e3161d7c7fb549c5ac2ec5cde2dec585d849 */
+ * Stub hash: df41901acc9accd0f2eb21c4886a54cfb6362f66 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject___construct, 0, 0, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, input, "[]")
@@ -15,7 +15,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_offsetSet, 0, 0, 2)
 	ZEND_ARG_INFO(0, index)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_offsetUnset arginfo_class_ArrayObject_offsetExists

ext/spl/spl_dllist.stub.php

@@ -50,27 +50,23 @@ public function setIteratorMode(int $mode) {}
     /** @return int */
     public function getIteratorMode() {}
 
-    /**
-     * @param int $index
-     * @return bool
-     */
-    public function offsetExists($index) {}
+    /** @return bool */
+    public function offsetExists(mixed $index) {}
 
     /**
-     * @param mixed $index
+     * @param resource|string|int|float|bool $index
      * @return mixed
      */
     public function offsetGet($index) {}
 
     /**
-     * @param mixed $index
-     * @param mixed $value
+     * @param resource|string|int|float|bool|null $index
      * @return void
      */
-    public function offsetSet($index, $value) {}
+    public function offsetSet($index, mixed $value) {}
 
     /**
-     * @param mixed $index
+     * @param resource|string|int|float|bool $index
      * @return void
      */
     public function offsetUnset($index) {}

ext/spl/spl_dllist_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9d2c9ec251d72065d4502bbbc29e927c6b597731 */
+ * Stub hash: 875e7a8dc94a423d567a2fcc46769a99ccbd47f0 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplDoublyLinkedList_add, 0, 0, 2)
 	ZEND_ARG_INFO(0, index)
@@ -34,14 +34,19 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplDoublyLinkedList_getIteratorMode arginfo_class_SplDoublyLinkedList_pop
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplDoublyLinkedList_offsetExists, 0, 0, 1)
-	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_TYPE_INFO(0, index, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_SplDoublyLinkedList_offsetGet arginfo_class_SplDoublyLinkedList_offsetExists
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplDoublyLinkedList_offsetGet, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_SplDoublyLinkedList_offsetSet arginfo_class_SplDoublyLinkedList_add
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplDoublyLinkedList_offsetSet, 0, 0, 2)
+	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_SplDoublyLinkedList_offsetUnset arginfo_class_SplDoublyLinkedList_offsetExists
+#define arginfo_class_SplDoublyLinkedList_offsetUnset arginfo_class_SplDoublyLinkedList_offsetGet
 
 #define arginfo_class_SplDoublyLinkedList_rewind arginfo_class_SplDoublyLinkedList_pop
 

ext/spl/spl_fixedarray.stub.php

@@ -24,27 +24,23 @@ public function getSize() {}
     /** @return bool */
     public function setSize(int $size) {}
 
-    /**
-     * @param mixed $index
-     * @return bool
-     */
-    public function offsetExists($index) {}
+    /** @return bool */
+    public function offsetExists(mixed $index) {}
 
     /**
-     * @param mixed $index
+     * @param resource|string|int|float|bool $index
      * @return mixed
      */
     public function offsetGet($index) {}
 
     /**
-     * @param mixed $index
-     * @param mixed $value
+     * @param resource|string|int|float|bool $index
      * @return void
      */
-    public function offsetSet($index, $value) {}
+    public function offsetSet($index, mixed $value) {}
 
     /**
-     * @param int $index
+     * @param resource|string|int|float|bool $index
      * @return void
      */
     public function offsetUnset($index) {}

ext/spl/spl_fixedarray_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a14156d542422823fcee53eb8a151576d055f38f */
+ * Stub hash: a7ea56878916417b15ed8e43eefd3e06b4b46238 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFixedArray___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, size, IS_LONG, 0, "0")
@@ -24,17 +24,19 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFixedArray_setSize, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFixedArray_offsetExists, 0, 0, 1)
-	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_TYPE_INFO(0, index, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_SplFixedArray_offsetGet arginfo_class_SplFixedArray_offsetExists
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFixedArray_offsetGet, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFixedArray_offsetSet, 0, 0, 2)
 	ZEND_ARG_INFO(0, index)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_SplFixedArray_offsetUnset arginfo_class_SplFixedArray_offsetExists
+#define arginfo_class_SplFixedArray_offsetUnset arginfo_class_SplFixedArray_offsetGet
 
 #define arginfo_class_SplFixedArray_rewind arginfo_class_SplFixedArray___wakeup
 

ext/spl/spl_iterators.stub.php

@@ -232,10 +232,9 @@ public function offsetGet($index) {}
 
     /**
      * @param string $index
-     * @param mixed $value
      * @return void
      */
-    public function offsetSet($index, $value) {}
+    public function offsetSet($index, mixed $value) {}
 
     /**
      * @param string $index

ext/spl/spl_iterators_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: fcf9d56587eb60bdc7824ff7587a5c7365eee5c0 */
+ * Stub hash: 46708c8aa0ea191974eaa08ef3130ecfde8ade2b */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_EmptyIterator_current, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -165,7 +165,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_CachingIterator_offsetSet, 0, 0, 2)
 	ZEND_ARG_INFO(0, index)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_CachingIterator_offsetUnset arginfo_class_CachingIterator_offsetGet

ext/spl/spl_observer.stub.php

@@ -91,11 +91,10 @@ public function offsetGet($object) {}
 
     /**
      * @param object $object
-     * @param mixed $info
      * @return void
      * @alias SplObjectStorage::attach
      */
-    public function offsetSet($object, $info = null) {}
+    public function offsetSet($object, mixed $info = null) {}
 
     /**
      * @param object $object

ext/spl/spl_observer_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4a31f2cc1b0c874f1256aef60afbd285dbe6c078 */
+ * Stub hash: c38addc16be8495c3a041aada023f762104c0ab4 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplObserver_update, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, subject, SplSubject, 0)
@@ -67,7 +67,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplObjectStorage_offsetSet, 0, 0, 1)
 	ZEND_ARG_INFO(0, object)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, info, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, info, IS_MIXED, 0, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplObjectStorage_offsetUnset arginfo_class_SplObjectStorage_offsetExists