From 68195bd481291922db666966334294a6faacab61 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 6 Oct 2020 14:58:45 +0200
Subject: [PATCH] Update ext/spl parameter names

Closes GH-6284.
---
 Zend/zend_interfaces.stub.php                 |  2 +-
 Zend/zend_interfaces_arginfo.h                |  4 +-
 ext/hash/hash.stub.php                        |  2 +-
 ext/hash/hash_arginfo.h                       |  4 +-
 ext/phar/tests/phar_oo_006.phpt               |  2 +-
 ext/spl/php_spl.stub.php                      |  8 +--
 ext/spl/php_spl_arginfo.h                     | 10 ++--
 ext/spl/spl_array.stub.php                    | 58 +++++++++----------
 ext/spl/spl_array_arginfo.h                   | 20 +++----
 ext/spl/spl_directory.stub.php                | 46 +++++++--------
 ext/spl/spl_directory_arginfo.h               | 48 +++++++--------
 ext/spl/spl_dllist.stub.php                   |  2 +-
 ext/spl/spl_dllist_arginfo.h                  |  4 +-
 ext/spl/spl_fixedarray.stub.php               |  2 +-
 ext/spl/spl_fixedarray_arginfo.h              |  4 +-
 ext/spl/spl_iterators.stub.php                | 36 ++++++------
 ext/spl/spl_iterators_arginfo.h               | 26 ++++-----
 ext/spl/spl_observer.stub.php                 |  2 +-
 ext/spl/spl_observer_arginfo.h                |  4 +-
 .../DirectoryIterator_empty_constructor.phpt  |  2 +-
 .../tests/SplFileInfo_setFileClass_error.phpt |  2 +-
 .../tests/SplFileInfo_setInfoClass_error.phpt |  2 +-
 ...SplFileObject_fgetcsv_delimiter_error.phpt |  2 +-
 .../SplFileObject_fputcsv_variation13.phpt    |  2 +-
 .../tests/SplFileObject_seek_error_001.phpt   |  2 +-
 .../SplFileObject_setCsvControl_error001.phpt |  2 +-
 .../SplTempFileObject_constructor_error.phpt  |  2 +-
 .../tests/arrayObject___construct_error1.phpt |  4 +-
 .../arrayObject_exchangeArray_basic3.phpt     |  2 +-
 .../arrayObject_setIteratorClass_error1.phpt  |  4 +-
 ext/spl/tests/bug54291.phpt                   |  2 +-
 ext/spl/tests/bug54292.phpt                   |  2 +-
 ext/spl/tests/bug60201.phpt                   |  2 +-
 ext/spl/tests/bug68479.phpt                   |  2 +-
 ext/spl/tests/bug77431.phpt                   |  2 +-
 ext/spl/tests/bug78863.phpt                   |  2 +-
 .../fileobject_setmaxlinelen_error001.phpt    |  2 +-
 ext/spl/tests/iterator_028.phpt               |  2 +-
 ext/spl/tests/iterator_044.phpt               |  8 +--
 ext/spl/tests/spl_004.phpt                    |  2 +-
 ext/spl/tests/spl_autoload_001.phpt           |  2 +-
 ext/spl/tests/spl_autoload_005.phpt           |  2 +-
 ext/spl/tests/spl_autoload_007.phpt           | 16 ++---
 ext/spl/tests/spl_autoload_008.phpt           |  4 +-
 ...ith_spl_autoloader_call_as_autoloader.phpt |  2 +-
 .../spl_limit_iterator_check_limits.phpt      |  2 +-
 ext/standard/basic_functions.stub.php         |  2 +-
 ext/standard/basic_functions_arginfo.h        |  4 +-
 48 files changed, 186 insertions(+), 184 deletions(-)
 mode change 100755 => 100644 ext/spl/php_spl.stub.php
 mode change 100755 => 100644 ext/spl/spl_array.stub.php
 mode change 100755 => 100644 ext/spl/spl_directory.stub.php
 mode change 100755 => 100644 ext/spl/spl_dllist.stub.php
 mode change 100755 => 100644 ext/spl/spl_fixedarray.stub.php

diff --git a/Zend/zend_interfaces.stub.php b/Zend/zend_interfaces.stub.php
index bb94190f8a..f58d8abc20 100644
--- a/Zend/zend_interfaces.stub.php
+++ b/Zend/zend_interfaces.stub.php
@@ -52,7 +52,7 @@ interface Serializable
     public function serialize();
 
     /** @return void */
-    public function unserialize(string $serialized);
+    public function unserialize(string $data);
 }
 
 interface Countable
diff --git a/Zend/zend_interfaces_arginfo.h b/Zend/zend_interfaces_arginfo.h
index 4b9d30ecd6..71dc72b95c 100644
--- a/Zend/zend_interfaces_arginfo.h
+++ b/Zend/zend_interfaces_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1aa9ef81a738328a334176d37683646b60b2f6fa */
+ * Stub hash: 29a5ed0b859b0732074c81cf9d26047a6eb9059a */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IteratorAggregate_getIterator, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -30,7 +30,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Serializable_serialize arginfo_class_IteratorAggregate_getIterator
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Serializable_unserialize, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Countable_count arginfo_class_IteratorAggregate_getIterator
diff --git a/ext/hash/hash.stub.php b/ext/hash/hash.stub.php
index 4cce866136..c0d4cbca7c 100644
--- a/ext/hash/hash.stub.php
+++ b/ext/hash/hash.stub.php
@@ -52,5 +52,5 @@ final class HashContext
 
     public function __serialize(): array {}
 
-    public function __unserialize(array $serialized): void {}
+    public function __unserialize(array $data): void {}
 }
diff --git a/ext/hash/hash_arginfo.h b/ext/hash/hash_arginfo.h
index cb8815de35..db043da97b 100644
--- a/ext/hash/hash_arginfo.h
+++ b/ext/hash/hash_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5298231334ab85edd67ae46c33b7e6cffb2ecc53 */
+ * Stub hash: 9352e0ac98e2ac53dc15d5024f9ef0c8092c4e9c */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_hash, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, algo, IS_STRING, 0)
@@ -121,7 +121,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_HashContext___serialize arginfo_hash_algos
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_HashContext___unserialize, 0, 1, IS_VOID, 0)
-	ZEND_ARG_TYPE_INFO(0, serialized, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index 5aefaaaa59..0ab8fff048 100644
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
@@ -40,7 +40,7 @@ unlink(__DIR__ . '/files/phar_oo_006.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
-SplFileInfo::setFileClass(): Argument #1 ($class_name) must be a class name derived from SplFileObject, SplFileInfo given
+SplFileInfo::setFileClass(): Argument #1 ($class) must be a class name derived from SplFileObject, SplFileInfo given
 MyFile::__construct(phar://%s/a.php)
 a.php
 MyFile::__construct(phar://%s/b/c.php)
diff --git a/ext/spl/php_spl.stub.php b/ext/spl/php_spl.stub.php
old mode 100755
new mode 100644
index 9171e4756f..61b2165c9f
--- a/ext/spl/php_spl.stub.php
+++ b/ext/spl/php_spl.stub.php
@@ -19,9 +19,9 @@ function spl_autoload_extensions(?string $file_extensions = null): string {}
 
 function spl_autoload_functions(): array {}
 
-function spl_autoload_register(?callable $autoload_function = null, bool $throw = true, bool $prepend = false): bool {}
+function spl_autoload_register(?callable $callback = null, bool $throw = true, bool $prepend = false): bool {}
 
-function spl_autoload_unregister(callable $autoload_function): bool {}
+function spl_autoload_unregister(callable $callback): bool {}
 
 function spl_classes(): array {}
 
@@ -29,8 +29,8 @@ function spl_object_hash(object $object): string {}
 
 function spl_object_id(object $object): int {}
 
-function iterator_apply(Traversable $iterator, callable $function, ?array $args = null): int {}
+function iterator_apply(Traversable $iterator, callable $callback, ?array $args = null): int {}
 
 function iterator_count(Traversable $iterator): int {}
 
-function iterator_to_array(Traversable $iterator, bool $use_keys = true): array {}
+function iterator_to_array(Traversable $iterator, bool $preserve_keys = true): array {}
diff --git a/ext/spl/php_spl_arginfo.h b/ext/spl/php_spl_arginfo.h
index 841dff23b9..5711e6d699 100644
--- a/ext/spl/php_spl_arginfo.h
+++ b/ext/spl/php_spl_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 31d99979ea43e3d0d2592495977465976ca67760 */
+ * Stub hash: 920cc4fca334f59316fc4276277958c9738afb3e */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_implements, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, object_or_class)
@@ -27,13 +27,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload_functions, 0, 0, IS
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload_register, 0, 0, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload_function, IS_CALLABLE, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, callback, IS_CALLABLE, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, throw, _IS_BOOL, 0, "true")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, prepend, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_spl_autoload_unregister, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, autoload_function, IS_CALLABLE, 0)
+	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_spl_classes arginfo_spl_autoload_functions
@@ -48,7 +48,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_iterator_apply, 0, 2, IS_LONG, 0)
 	ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
-	ZEND_ARG_TYPE_INFO(0, function, IS_CALLABLE, 0)
+	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, args, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
@@ -58,7 +58,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_iterator_to_array, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, use_keys, _IS_BOOL, 0, "true")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preserve_keys, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/spl/spl_array.stub.php b/ext/spl/spl_array.stub.php
old mode 100755
new mode 100644
index b3a058806c..1567d107f2
--- a/ext/spl/spl_array.stub.php
+++ b/ext/spl/spl_array.stub.php
@@ -4,31 +4,31 @@
 
 class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Countable
 {
-    public function __construct(array|object $input = [], int $flags = 0, string $iterator_class = ArrayIterator::class) {}
+    public function __construct(array|object $array = [], int $flags = 0, string $iteratorClass = ArrayIterator::class) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return bool
      */
-    public function offsetExists($index) {}
+    public function offsetExists($key) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return mixed
      */
-    public function offsetGet($index) {}
+    public function offsetGet($key) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return void
      */
-    public function offsetSet($index, mixed $value) {}
+    public function offsetSet($key, mixed $value) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return void
      */
-    public function offsetUnset($index) {}
+    public function offsetUnset($key) {}
 
     /** @return void */
     public function append(mixed $value) {}
@@ -46,16 +46,16 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
     public function setFlags(int $flags) {}
 
     /** @return bool */
-    public function asort(int $sort_flags = SORT_REGULAR) {}
+    public function asort(int $flags = SORT_REGULAR) {}
 
     /** @return bool */
-    public function ksort(int $sort_flags = SORT_REGULAR) {}
+    public function ksort(int $flags = SORT_REGULAR) {}
 
     /** @return bool */
-    public function uasort(callable $cmp_function) {}
+    public function uasort(callable $callback) {}
 
     /** @return bool */
-    public function uksort(callable $cmp_function) {}
+    public function uksort(callable $callback) {}
 
     /** @return bool */
     public function natsort() {}
@@ -64,7 +64,7 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
     public function natcasesort() {}
 
     /** @return void */
-    public function unserialize(string $serialized) {}
+    public function unserialize(string $data) {}
 
     /** @return string */
     public function serialize() {}
@@ -79,7 +79,7 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
     public function getIterator() {}
 
     /** @return array|null */
-    public function exchangeArray(array|object $input) {}
+    public function exchangeArray(array|object $array) {}
 
     /** @return void */
     public function setIteratorClass(string $iteratorClass) {}
@@ -96,32 +96,32 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Serializable, Coun
     public function __construct(array|object $array = [], int $flags = 0) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return bool
      * @implementation-alias ArrayObject::offsetExists
      */
-    public function offsetExists($index) {}
+    public function offsetExists($key) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return mixed
      * @implementation-alias ArrayObject::offsetGet
      */
-    public function offsetGet($index) {}
+    public function offsetGet($key) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return void
      * @implementation-alias ArrayObject::offsetSet
      */
-    public function offsetSet($index, mixed $value) {}
+    public function offsetSet($key, mixed $value) {}
 
     /**
-     * @param string|int $index
+     * @param string|int $key
      * @return void
      * @implementation-alias ArrayObject::offsetUnset
      */
-    public function offsetUnset($index) {}
+    public function offsetUnset($key) {}
 
     /**
      * @return void
@@ -157,25 +157,25 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Serializable, Coun
      * @return bool
      * @implementation-alias ArrayObject::asort
      */
-    public function asort(int $sort_flags = SORT_REGULAR) {}
+    public function asort(int $flags = SORT_REGULAR) {}
 
     /**
      * @return bool
      * @implementation-alias ArrayObject::ksort
      */
-    public function ksort(int $sort_flags = SORT_REGULAR) {}
+    public function ksort(int $flags = SORT_REGULAR) {}
 
     /**
      * @return bool
      * @implementation-alias ArrayObject::uasort
      */
-    public function uasort(callable $cmp_function) {}
+    public function uasort(callable $callback) {}
 
     /**
      * @return bool
      * @implementation-alias ArrayObject::uksort
      */
-    public function uksort(callable $cmp_function) {}
+    public function uksort(callable $callback) {}
 
     /**
      * @return bool
@@ -193,7 +193,7 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Serializable, Coun
      * @return void
      * @implementation-alias ArrayObject::unserialize
      */
-    public function unserialize(string $serialized) {}
+    public function unserialize(string $data) {}
 
     /**
      * @return string
@@ -229,7 +229,7 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Serializable, Coun
     public function valid() {}
 
     /** @return void */
-    public function seek(int $position) {}
+    public function seek(int $offset) {}
 
     /**
      * @return array
diff --git a/ext/spl/spl_array_arginfo.h b/ext/spl/spl_array_arginfo.h
index 75bc357613..860b2e363d 100644
--- a/ext/spl/spl_array_arginfo.h
+++ b/ext/spl/spl_array_arginfo.h
@@ -1,20 +1,20 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1b93d102c6dfa12f65a95a50bbc78c03802e261c */
+ * Stub hash: da85db1e5e985ddbefaf38598133e3cba46475f2 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject___construct, 0, 0, 0)
-	ZEND_ARG_TYPE_MASK(0, input, MAY_BE_ARRAY|MAY_BE_OBJECT, "[]")
+	ZEND_ARG_TYPE_MASK(0, array, MAY_BE_ARRAY|MAY_BE_OBJECT, "[]")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, iterator_class, IS_STRING, 0, "ArrayIterator::class")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, iteratorClass, IS_STRING, 0, "ArrayIterator::class")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_offsetExists, 0, 0, 1)
-	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_offsetGet arginfo_class_ArrayObject_offsetExists
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_offsetSet, 0, 0, 2)
-	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
@@ -36,13 +36,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_setFlags, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_asort, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sort_flags, IS_LONG, 0, "SORT_REGULAR")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "SORT_REGULAR")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_ksort arginfo_class_ArrayObject_asort
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_uasort, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, cmp_function, IS_CALLABLE, 0)
+	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_uksort arginfo_class_ArrayObject_uasort
@@ -52,7 +52,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_ArrayObject_natcasesort arginfo_class_ArrayObject_getArrayCopy
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_unserialize, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_serialize arginfo_class_ArrayObject_getArrayCopy
@@ -66,7 +66,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_ArrayObject_getIterator arginfo_class_ArrayObject_getArrayCopy
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_exchangeArray, 0, 0, 1)
-	ZEND_ARG_TYPE_MASK(0, input, MAY_BE_ARRAY|MAY_BE_OBJECT, NULL)
+	ZEND_ARG_TYPE_MASK(0, array, MAY_BE_ARRAY|MAY_BE_OBJECT, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject_setIteratorClass, 0, 0, 1)
@@ -131,7 +131,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_ArrayIterator_valid arginfo_class_ArrayObject_getArrayCopy
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayIterator_seek, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, position, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayIterator___debugInfo arginfo_class_ArrayObject_getArrayCopy
diff --git a/ext/spl/spl_directory.stub.php b/ext/spl/spl_directory.stub.php
old mode 100755
new mode 100644
index e72a4e5f41..094b278d21
--- a/ext/spl/spl_directory.stub.php
+++ b/ext/spl/spl_directory.stub.php
@@ -4,7 +4,7 @@
 
 class SplFileInfo
 {
-    public function __construct(string $file_name) {}
+    public function __construct(string $filename) {}
 
     /** @return string */
     public function getPath() {}
@@ -73,22 +73,22 @@ class SplFileInfo
     public function getRealPath() {}
 
     /** @return SplFileInfo */
-    public function getFileInfo(?string $class_name = null) {}
+    public function getFileInfo(?string $class = null) {}
 
     /** @return SplFileInfo|null */
-    public function getPathInfo(?string $class_name = null) {}
+    public function getPathInfo(?string $class = null) {}
 
     /**
      * @param resource|null $context
      * @return SplFileObject
      */
-    public function openFile(string $open_mode = "r", bool $use_include_path = false, $context = null) {}
+    public function openFile(string $mode = "r", bool $useIncludePath = false, $context = null) {}
 
     /** @return void */
-    public function setFileClass(string $class_name = SplFileObject::class) {}
+    public function setFileClass(string $class = SplFileObject::class) {}
 
     /** @return void */
-    public function setInfoClass(string $class_name = SplFileInfo::class) {}
+    public function setInfoClass(string $class = SplFileInfo::class) {}
 
     /** @implementation-alias SplFileInfo::getPathname */
     public function __toString(): string {}
@@ -102,7 +102,7 @@ class SplFileInfo
 
 class DirectoryIterator extends SplFileInfo implements SeekableIterator
 {
-    public function __construct(string $path) {}
+    public function __construct(string $directory) {}
 
     /** @return string */
     public function getFilename() {}
@@ -132,7 +132,7 @@ class DirectoryIterator extends SplFileInfo implements SeekableIterator
     public function next() {}
 
     /** @return void */
-    public function seek(int $position) {}
+    public function seek(int $offset) {}
 
     /** @implementation-alias DirectoryIterator::getFilename */
     public function __toString(): string {}
@@ -140,7 +140,7 @@ class DirectoryIterator extends SplFileInfo implements SeekableIterator
 
 class FilesystemIterator extends DirectoryIterator
 {
-    public function __construct(string $path, int $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS) {}
+    public function __construct(string $directory, int $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS) {}
 
     /** @return void */
     public function rewind() {}
@@ -160,10 +160,10 @@ class FilesystemIterator extends DirectoryIterator
 
 class RecursiveDirectoryIterator extends FilesystemIterator implements RecursiveIterator
 {
-    public function __construct(string $path, int $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO) {}
+    public function __construct(string $directory, int $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO) {}
 
     /** @return bool */
-    public function hasChildren(bool $allow_links = false) {}
+    public function hasChildren(bool $allowLinks = false) {}
 
     /** @return RecursiveDirectoryIterator */
     public function getChildren() {}
@@ -178,7 +178,7 @@ class RecursiveDirectoryIterator extends FilesystemIterator implements Recursive
 #ifdef HAVE_GLOB
 class GlobIterator extends FilesystemIterator implements Countable
 {
-    public function __construct(string $path, int $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO) {}
+    public function __construct(string $pattern, int $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO) {}
 
     /** @return int */
     public function count() {}
@@ -188,7 +188,7 @@ class GlobIterator extends FilesystemIterator implements Countable
 class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIterator
 {
     /** @param resource|null $context */
-    public function __construct(string $file_name, string $open_mode = "r", bool $use_include_path = false, $context = null) {}
+    public function __construct(string $filename, string $mode = "r", bool $useIncludePath = false, $context = null) {}
 
     /** @return void */
     public function rewind() {}
@@ -206,22 +206,22 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt
     public function fread(int $length) {}
 
     /** @return array|false */
-    public function fgetcsv(string $delimiter = ",", string $enclosure = "\"", string $escape = "\\") {}
+    public function fgetcsv(string $separator = ",", string $enclosure = "\"", string $escape = "\\") {}
 
     /** @return int|false */
-    public function fputcsv(array $fields, string $delimiter = ",", string $enclosure = "\"", string $escape = "\\") {}
+    public function fputcsv(array $fields, string $separator = ",", string $enclosure = "\"", string $escape = "\\") {}
 
     /** @return bool|null */
-    public function setCsvControl(string $delimiter = ",", string $enclosure = "\"", string $escape = "\\") {}
+    public function setCsvControl(string $separator = ",", string $enclosure = "\"", string $escape = "\\") {}
 
     /** @return array */
     public function getCsvControl() {}
 
     /**
-     * @param int $wouldblock
+     * @param int $wouldBlock
      * @return bool
      */
-    public function flock(int $operation, &$wouldblock = null) {}
+    public function flock(int $operation, &$wouldBlock = null) {}
 
     /** @return bool */
     public function fflush() {}
@@ -239,10 +239,10 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt
     public function fpassthru() {}
 
     /** @return array|int|false|null */
-    public function fscanf(string $format, mixed &...$params) {}
+    public function fscanf(string $format, mixed &...$vars) {}
 
     /** @return int|false */
-    public function fwrite(string $str, int $length = 0) {}
+    public function fwrite(string $data, int $length = 0) {}
 
     /** @return array */
     public function fstat() {}
@@ -266,7 +266,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt
     public function getFlags() {}
 
     /** @return void */
-    public function setMaxLineLen(int $max_len) {}
+    public function setMaxLineLen(int $maxLength) {}
 
     /** @return int */
     public function getMaxLineLen() {}
@@ -278,7 +278,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt
     public function getChildren() {}
 
     /** @return void */
-    public function seek(int $line_pos) {}
+    public function seek(int $line) {}
 
     /**
      * @return string|false
@@ -292,5 +292,5 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt
 
 class SplTempFileObject extends SplFileObject
 {
-    public function __construct(int $max_memory = 2 * 1024 * 1024) {}
+    public function __construct(int $maxMemory = 2 * 1024 * 1024) {}
 }
diff --git a/ext/spl/spl_directory_arginfo.h b/ext/spl/spl_directory_arginfo.h
index 3f961d2691..c0d80f0ae6 100644
--- a/ext/spl/spl_directory_arginfo.h
+++ b/ext/spl/spl_directory_arginfo.h
@@ -1,8 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 071a92d8e5998c518e377b5620dfdda6fb189a1d */
+ * Stub hash: b4aa4816381e8380d5dc0c5f9b9969992a72f9ed */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, file_name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo_getPath, 0, 0, 0)
@@ -53,23 +53,23 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplFileInfo_getRealPath arginfo_class_SplFileInfo_getPath
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo_getFileInfo, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplFileInfo_getPathInfo arginfo_class_SplFileInfo_getFileInfo
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo_openFile, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, open_mode, IS_STRING, 0, "\"r\"")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, use_include_path, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 0, "\"r\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, useIncludePath, _IS_BOOL, 0, "false")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, context, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo_setFileClass, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 0, "SplFileObject::class")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class, IS_STRING, 0, "SplFileObject::class")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo_setInfoClass, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 0, "SplFileInfo::class")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class, IS_STRING, 0, "SplFileInfo::class")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SplFileInfo___toString, 0, 0, IS_STRING, 0)
@@ -80,7 +80,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplFileInfo__bad_state_ex arginfo_class_SplFileInfo_getPath
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DirectoryIterator___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_DirectoryIterator_getFilename arginfo_class_SplFileInfo_getPath
@@ -102,13 +102,13 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_DirectoryIterator_next arginfo_class_SplFileInfo_getPath
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DirectoryIterator_seek, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, position, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_DirectoryIterator___toString arginfo_class_SplFileInfo___toString
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_FilesystemIterator___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS")
 ZEND_END_ARG_INFO()
 
@@ -125,12 +125,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_FilesystemIterator_setFlags, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RecursiveDirectoryIterator___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RecursiveDirectoryIterator_hasChildren, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, allow_links, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, allowLinks, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RecursiveDirectoryIterator_getChildren arginfo_class_SplFileInfo_getPath
@@ -141,7 +141,7 @@ ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GLOB)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_GlobIterator___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO")
 ZEND_END_ARG_INFO()
 #endif
@@ -152,9 +152,9 @@ ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, file_name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, open_mode, IS_STRING, 0, "\"r\"")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, use_include_path, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 0, "\"r\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, useIncludePath, _IS_BOOL, 0, "false")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, context, "null")
 ZEND_END_ARG_INFO()
 
@@ -171,14 +171,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_fread, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_fgetcsv, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, delimiter, IS_STRING, 0, "\",\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, separator, IS_STRING, 0, "\",\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enclosure, IS_STRING, 0, "\"\\\"\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, escape, IS_STRING, 0, "\"\\\\\"")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_fputcsv, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, fields, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, delimiter, IS_STRING, 0, "\",\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, separator, IS_STRING, 0, "\",\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enclosure, IS_STRING, 0, "\"\\\"\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, escape, IS_STRING, 0, "\"\\\\\"")
 ZEND_END_ARG_INFO()
@@ -189,7 +189,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_flock, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, operation, IS_LONG, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, wouldblock, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, wouldBlock, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplFileObject_fflush arginfo_class_SplFileInfo_getPath
@@ -207,11 +207,11 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_fscanf, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
-	ZEND_ARG_VARIADIC_TYPE_INFO(1, params, IS_MIXED, 0)
+	ZEND_ARG_VARIADIC_TYPE_INFO(1, vars, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_fwrite, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
@@ -232,7 +232,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplFileObject_getFlags arginfo_class_SplFileInfo_getPath
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_setMaxLineLen, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, max_len, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, maxLength, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplFileObject_getMaxLineLen arginfo_class_SplFileInfo_getPath
@@ -242,7 +242,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplFileObject_getChildren arginfo_class_SplFileInfo_getPath
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileObject_seek, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, line_pos, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, line, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplFileObject_getCurrentLine arginfo_class_SplFileInfo_getPath
@@ -250,7 +250,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplFileObject___toString arginfo_class_SplFileInfo___toString
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplTempFileObject___construct, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_memory, IS_LONG, 0, "2 * 1024 * 1024")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maxMemory, IS_LONG, 0, "2 * 1024 * 1024")
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/spl/spl_dllist.stub.php b/ext/spl/spl_dllist.stub.php
old mode 100755
new mode 100644
index d3f679a7fb..05f122204e
--- a/ext/spl/spl_dllist.stub.php
+++ b/ext/spl/spl_dllist.stub.php
@@ -83,7 +83,7 @@ class SplDoublyLinkedList implements Iterator, Countable, ArrayAccess, Serializa
     public function valid() {}
 
     /** @return void */
-    public function unserialize(string $serialized) {}
+    public function unserialize(string $data) {}
 
     /** @return string */
     public function serialize() {}
diff --git a/ext/spl/spl_dllist_arginfo.h b/ext/spl/spl_dllist_arginfo.h
index afd1278d58..eb612acb83 100644
--- a/ext/spl/spl_dllist_arginfo.h
+++ b/ext/spl/spl_dllist_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9d17266fba7a05a5fddca0ddf6b64b1c2f683cae */
+ * Stub hash: 404df73577d733275e386226e11887b37a500ade */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplDoublyLinkedList_add, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
@@ -59,7 +59,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplDoublyLinkedList_valid arginfo_class_SplDoublyLinkedList_pop
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplDoublyLinkedList_unserialize, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplDoublyLinkedList_serialize arginfo_class_SplDoublyLinkedList_pop
diff --git a/ext/spl/spl_fixedarray.stub.php b/ext/spl/spl_fixedarray.stub.php
old mode 100755
new mode 100644
index b169dfdeac..f2bb378f7a
--- a/ext/spl/spl_fixedarray.stub.php
+++ b/ext/spl/spl_fixedarray.stub.php
@@ -16,7 +16,7 @@ class SplFixedArray implements IteratorAggregate, ArrayAccess, Countable
     public function toArray() {}
 
     /** @return SplFixedArray */
-    public static function fromArray(array $array, bool $save_indexes = true) {}
+    public static function fromArray(array $array, bool $preserveKeys = true) {}
 
     /** @return int */
     public function getSize() {}
diff --git a/ext/spl/spl_fixedarray_arginfo.h b/ext/spl/spl_fixedarray_arginfo.h
index e82ea83a6a..6067a3ebde 100644
--- a/ext/spl/spl_fixedarray_arginfo.h
+++ b/ext/spl/spl_fixedarray_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c820bad6bcfcc7c60a221464008a882515b5c05e */
+ * Stub hash: 831fe70055eb62135ae49321e5e5f3fe08c3d95f */
 
 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")
@@ -14,7 +14,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFixedArray_fromArray, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, save_indexes, _IS_BOOL, 0, "true")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preserveKeys, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplFixedArray_getSize arginfo_class_SplFixedArray___wakeup
diff --git a/ext/spl/spl_iterators.stub.php b/ext/spl/spl_iterators.stub.php
index 4d99e60df4..437efec46b 100644
--- a/ext/spl/spl_iterators.stub.php
+++ b/ext/spl/spl_iterators.stub.php
@@ -101,7 +101,7 @@ class RecursiveIteratorIterator implements OuterIterator
     public function nextElement() {}
 
     /** @return void */
-    public function setMaxDepth(int $max_depth = -1) {}
+    public function setMaxDepth(int $maxDepth = -1) {}
 
     /** @return int|false */
     public function getMaxDepth() {}
@@ -115,7 +115,7 @@ interface OuterIterator extends Iterator
 
 class IteratorIterator implements OuterIterator
 {
-    public function __construct(Traversable $iterator, ?string $class_name = null) {}
+    public function __construct(Traversable $iterator, ?string $class = null) {}
 
     /** @return Iterator|null */
     public function getInnerIterator() {}
@@ -175,12 +175,12 @@ class ParentIterator extends RecursiveFilterIterator
 interface SeekableIterator extends Iterator
 {
     /** @return void */
-    public function seek(int $position);
+    public function seek(int $offset);
 }
 
 class LimitIterator extends IteratorIterator
 {
-    public function __construct(Iterator $iterator, int $offset = 0, int $count = -1) {}
+    public function __construct(Iterator $iterator, int $offset = 0, int $limit = -1) {}
 
     /** @return void */
     public function rewind() {}
@@ -192,7 +192,7 @@ class LimitIterator extends IteratorIterator
     public function next() {}
 
     /** @return int */
-    public function seek(int $position) {}
+    public function seek(int $offset) {}
 
     /** @return int */
     public function getPosition() {}
@@ -223,28 +223,28 @@ class CachingIterator extends IteratorIterator implements ArrayAccess, Countable
     public function setFlags(int $flags) {}
 
     /**
-     * @param string $index
+     * @param string $key
      * @return mixed
      */
-    public function offsetGet($index) {}
+    public function offsetGet($key) {}
 
     /**
-     * @param string $index
+     * @param string $key
      * @return void
      */
-    public function offsetSet($index, mixed $value) {}
+    public function offsetSet($key, mixed $value) {}
 
     /**
-     * @param string $index
+     * @param string $key
      * @return void
      */
-    public function offsetUnset($index) {}
+    public function offsetUnset($key) {}
 
     /**
-     * @param string $index
+     * @param string $key
      * @return bool
      */
-    public function offsetExists($index) {}
+    public function offsetExists($key) {}
 
     /** @return array */
     public function getCache() {}
@@ -320,7 +320,7 @@ class InfiniteIterator extends IteratorIterator
 
 class RegexIterator extends FilterIterator
 {
-    public function __construct(Iterator $iterator, string $regex, int $mode = self::MATCH, int $flags = 0, int $preg_flags = 0) {}
+    public function __construct(Iterator $iterator, string $pattern, int $mode = self::MATCH, int $flags = 0, int $pregFlags = 0) {}
 
     /** @return bool */
     public function accept() {}
@@ -344,12 +344,12 @@ class RegexIterator extends FilterIterator
     public function getPregFlags() {}
 
     /** @return void */
-    public function setPregFlags(int $preg_flags) {}
+    public function setPregFlags(int $pregFlags) {}
 }
 
 class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator
 {
-    public function __construct(RecursiveIterator $iterator, string $regex, int $mode = self::MATCH, int $flags = 0, int $preg_flags = 0) {}
+    public function __construct(RecursiveIterator $iterator, string $pattern, int $mode = self::MATCH, int $flags = 0, int $pregFlags = 0) {}
 
     /** @return bool */
     public function accept() {}
@@ -368,7 +368,9 @@ class RecursiveTreeIterator extends RecursiveIteratorIterator
 {
     /** @param RecursiveIterator|IteratorAggregate $iterator */
     public function __construct(
-        $iterator, int $flags = self::BYPASS_KEY, int $caching_it_flags = CachingIterator::CATCH_GET_CHILD,
+        $iterator,
+        int $flags = self::BYPASS_KEY,
+        int $cachingIteratorFlags = CachingIterator::CATCH_GET_CHILD,
         int $mode = self::SELF_FIRST
     ) {}
 
diff --git a/ext/spl/spl_iterators_arginfo.h b/ext/spl/spl_iterators_arginfo.h
index 7563521b46..999528883a 100644
--- a/ext/spl/spl_iterators_arginfo.h
+++ b/ext/spl/spl_iterators_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 65bcea1c2313ff50b3e15588e1cdba036995c131 */
+ * Stub hash: ae7df94646bf08874d7b9804833d0081c40e0348 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_EmptyIterator_current, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -71,7 +71,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RecursiveIteratorIterator_nextElement arginfo_class_EmptyIterator_current
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RecursiveIteratorIterator_setMaxDepth, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_depth, IS_LONG, 0, "-1")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maxDepth, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RecursiveIteratorIterator_getMaxDepth arginfo_class_EmptyIterator_current
@@ -80,7 +80,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IteratorIterator___construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IteratorIterator_getInnerIterator arginfo_class_EmptyIterator_current
@@ -118,13 +118,13 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_ParentIterator_accept arginfo_class_EmptyIterator_current
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SeekableIterator_seek, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, position, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_LimitIterator___construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "-1")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, limit, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_LimitIterator_rewind arginfo_class_EmptyIterator_current
@@ -160,11 +160,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_CachingIterator_setFlags, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_CachingIterator_offsetGet, 0, 0, 1)
-	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_INFO(0, key)
 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, key)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
@@ -216,10 +216,10 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RegexIterator___construct, 0, 0, 2)
 	ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
-	ZEND_ARG_TYPE_INFO(0, regex, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "self::MATCH")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preg_flags, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pregFlags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RegexIterator_accept arginfo_class_EmptyIterator_current
@@ -239,15 +239,15 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RegexIterator_getPregFlags arginfo_class_EmptyIterator_current
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RegexIterator_setPregFlags, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, preg_flags, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, pregFlags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RecursiveRegexIterator___construct, 0, 0, 2)
 	ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0)
-	ZEND_ARG_TYPE_INFO(0, regex, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "self::MATCH")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preg_flags, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pregFlags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RecursiveRegexIterator_accept arginfo_class_EmptyIterator_current
@@ -259,7 +259,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RecursiveTreeIterator___construct, 0, 0, 1)
 	ZEND_ARG_INFO(0, iterator)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "self::BYPASS_KEY")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, caching_it_flags, IS_LONG, 0, "CachingIterator::CATCH_GET_CHILD")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cachingIteratorFlags, IS_LONG, 0, "CachingIterator::CATCH_GET_CHILD")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "self::SELF_FIRST")
 ZEND_END_ARG_INFO()
 
diff --git a/ext/spl/spl_observer.stub.php b/ext/spl/spl_observer.stub.php
index ba880a3090..6fcd3c4c69 100644
--- a/ext/spl/spl_observer.stub.php
+++ b/ext/spl/spl_observer.stub.php
@@ -65,7 +65,7 @@ class SplObjectStorage implements Countable, Iterator, Serializable, ArrayAccess
     public function next() {}
 
     /** @return void */
-    public function unserialize(string $serialized) {}
+    public function unserialize(string $data) {}
 
     /** @return string */
     public function serialize() {}
diff --git a/ext/spl/spl_observer_arginfo.h b/ext/spl/spl_observer_arginfo.h
index 5956aedd0a..db9b1d1125 100644
--- a/ext/spl/spl_observer_arginfo.h
+++ b/ext/spl/spl_observer_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c526488c83b1de019f4257e2ddaaa8fb8f1bb323 */
+ * Stub hash: aaefa4d4ac3b795212191d9fe06982d29948f552 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplObserver_update, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, subject, SplSubject, 0)
@@ -54,7 +54,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_SplObjectStorage_next arginfo_class_SplSubject_notify
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplObjectStorage_unserialize, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_SplObjectStorage_serialize arginfo_class_SplSubject_notify
diff --git a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
index a2ae3f065c..01b7c7d72c 100644
--- a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
+++ b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
@@ -12,4 +12,4 @@ try {
 }
 ?>
 --EXPECT--
-DirectoryIterator::__construct(): Argument #1 ($path) cannot be empty
+DirectoryIterator::__construct(): Argument #1 ($directory) cannot be empty
diff --git a/ext/spl/tests/SplFileInfo_setFileClass_error.phpt b/ext/spl/tests/SplFileInfo_setFileClass_error.phpt
index 228a581809..4ace511e26 100644
--- a/ext/spl/tests/SplFileInfo_setFileClass_error.phpt
+++ b/ext/spl/tests/SplFileInfo_setFileClass_error.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-SplFileInfo::setFileClass(): Argument #1 ($class_name) must be a class name derived from SplFileObject, stdClass given
+SplFileInfo::setFileClass(): Argument #1 ($class) must be a class name derived from SplFileObject, stdClass given
diff --git a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt
index d3f49f1814..1f64c353d3 100644
--- a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt
+++ b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-SplFileInfo::setInfoClass(): Argument #1 ($class_name) must be a class name derived from SplFileInfo, stdClass given
+SplFileInfo::setInfoClass(): Argument #1 ($class) must be a class name derived from SplFileInfo, stdClass given
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
index 03010f3935..b14e7ca479 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
@@ -23,4 +23,4 @@ try {
 unlink('SplFileObject__fgetcsv3.csv');
 ?>
 --EXPECT--
-SplFileObject::fgetcsv(): Argument #1 ($delimiter) must be a single character
+SplFileObject::fgetcsv(): Argument #1 ($separator) must be a single character
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
index 0dc2a4fe7e..b213799942 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
@@ -27,5 +27,5 @@ unlink($file);
 ?>
 --EXPECT--
 *** Testing fputcsv() : with default enclosure & delimiter of two chars ***
-SplFileObject::fputcsv(): Argument #2 ($delimiter) must be a single character
+SplFileObject::fputcsv(): Argument #2 ($separator) must be a single character
 Done
diff --git a/ext/spl/tests/SplFileObject_seek_error_001.phpt b/ext/spl/tests/SplFileObject_seek_error_001.phpt
index 30ad772958..d29e86b955 100644
--- a/ext/spl/tests/SplFileObject_seek_error_001.phpt
+++ b/ext/spl/tests/SplFileObject_seek_error_001.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECT--
-SplFileObject::seek(): Argument #1 ($line_pos) must be greater than or equal to 0
+SplFileObject::seek(): Argument #1 ($line) must be greater than or equal to 0
diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt
index 75249dbce4..a2fea52d5a 100644
--- a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt
+++ b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt
@@ -24,4 +24,4 @@ try {
 unlink('csv_control_data_error001.csv');
 ?>
 --EXPECT--
-SplFileObject::setCsvControl(): Argument #1 ($delimiter) must be a single character
+SplFileObject::setCsvControl(): Argument #1 ($separator) must be a single character
diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
index 855479c54a..212a4df2ff 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECT--
-SplTempFileObject::__construct(): Argument #1 ($max_memory) must be of type int, string given
+SplTempFileObject::__construct(): Argument #1 ($maxMemory) must be of type int, string given
diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt
index beac9a76ab..91ef24f37e 100644
--- a/ext/spl/tests/arrayObject___construct_error1.phpt
+++ b/ext/spl/tests/arrayObject___construct_error1.phpt
@@ -20,6 +20,6 @@ try {
 ?>
 --EXPECT--
 Bad iterator type:
-ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, Exception given(6)
+ArrayObject::__construct(): Argument #3 ($iteratorClass) must be a class name derived from Iterator, Exception given(6)
 Non-existent class:
-ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, nonExistentClassName given(13)
+ArrayObject::__construct(): Argument #3 ($iteratorClass) must be a class name derived from Iterator, nonExistentClassName given(13)
diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
index ee149ad19b..57cfd2e51a 100644
--- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
+++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
@@ -103,7 +103,7 @@ NULL
 
 
 --> exchangeArray() with bad arg type:
-ArrayObject::exchangeArray(): Argument #1 ($input) must be of type array, null given
+ArrayObject::exchangeArray(): Argument #1 ($array) must be of type array, null given
 
 Warning: Undefined variable $copy in %s on line %d
 object(ArrayObject)#3 (1) {
diff --git a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
index d178c06701..b9ab040a21 100644
--- a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
+++ b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
@@ -45,5 +45,5 @@ try {
 --EXPECT--
 string(128) "ArrayObject::setIteratorClass(): Argument #1 ($iteratorClass) must be a class name derived from Iterator, nonExistentClass given"
 string(120) "ArrayObject::setIteratorClass(): Argument #1 ($iteratorClass) must be a class name derived from Iterator, stdClass given"
-string(124) "ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, nonExistentClass given"
-string(116) "ArrayObject::__construct(): Argument #3 ($iterator_class) must be a class name derived from Iterator, stdClass given"
+string(123) "ArrayObject::__construct(): Argument #3 ($iteratorClass) must be a class name derived from Iterator, nonExistentClass given"
+string(115) "ArrayObject::__construct(): Argument #3 ($iteratorClass) must be a class name derived from Iterator, stdClass given"
diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt
index 964cc866af..bd230f8b2e 100644
--- a/ext/spl/tests/bug54291.phpt
+++ b/ext/spl/tests/bug54291.phpt
@@ -6,7 +6,7 @@ $dir = new DirectoryIterator("\x00/abc");
 $dir->isFile();
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: DirectoryIterator::__construct(): Argument #1 ($path) must not contain any null bytes in %s:%d
+Fatal error: Uncaught ValueError: DirectoryIterator::__construct(): Argument #1 ($directory) must not contain any null bytes in %s:%d
 Stack trace:
 #0 %s(%d): DirectoryIterator->__construct('\x00/abc')
 #1 {main}
diff --git a/ext/spl/tests/bug54292.phpt b/ext/spl/tests/bug54292.phpt
index 27bd706ad8..39bfb6f4dd 100644
--- a/ext/spl/tests/bug54292.phpt
+++ b/ext/spl/tests/bug54292.phpt
@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-string(90) "SplFileObject::__construct(): Argument #2 ($open_mode) must be of type string, array given"
+string(85) "SplFileObject::__construct(): Argument #2 ($mode) must be of type string, array given"
diff --git a/ext/spl/tests/bug60201.phpt b/ext/spl/tests/bug60201.phpt
index 4087efcbc9..2074c9fa4c 100644
--- a/ext/spl/tests/bug60201.phpt
+++ b/ext/spl/tests/bug60201.phpt
@@ -13,7 +13,7 @@ array(3) {
   [0]=>
   object(ReflectionParameter)#%d (1) {
     ["name"]=>
-    string(9) "delimiter"
+    string(9) "separator"
   }
   [1]=>
   object(ReflectionParameter)#%d (1) {
diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt
index 0ce7c96968..e749d01120 100644
--- a/ext/spl/tests/bug68479.phpt
+++ b/ext/spl/tests/bug68479.phpt
@@ -18,7 +18,7 @@ array(4) {
   [1]=>
   object(ReflectionParameter)#3 (1) {
     ["name"]=>
-    string(9) "delimiter"
+    string(9) "separator"
   }
   [2]=>
   object(ReflectionParameter)#4 (1) {
diff --git a/ext/spl/tests/bug77431.phpt b/ext/spl/tests/bug77431.phpt
index 75ae1d14d0..2d14d082ec 100644
--- a/ext/spl/tests/bug77431.phpt
+++ b/ext/spl/tests/bug77431.phpt
@@ -5,7 +5,7 @@ Bug #77431 (SplFileInfo::__construct() accepts NUL bytes)
 new SplFileInfo("bad\0good");
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: SplFileInfo::__construct(): Argument #1 ($file_name) must not contain any null bytes in %s:%d
+Fatal error: Uncaught ValueError: SplFileInfo::__construct(): Argument #1 ($filename) must not contain any null bytes in %s:%d
 Stack trace:
 #0 %s(%d): SplFileInfo->__construct('bad\x00good')
 #1 {main}
diff --git a/ext/spl/tests/bug78863.phpt b/ext/spl/tests/bug78863.phpt
index 524711fc64..100d5c0c58 100644
--- a/ext/spl/tests/bug78863.phpt
+++ b/ext/spl/tests/bug78863.phpt
@@ -16,7 +16,7 @@ foreach ($it as $fileinfo) {
 }
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: DirectoryIterator::__construct(): Argument #1 ($path) must not contain any null bytes in %s:%d
+Fatal error: Uncaught ValueError: DirectoryIterator::__construct(): Argument #1 ($directory) must not contain any null bytes in %s:%d
 Stack trace:
 #0 %s(%d): DirectoryIterator->__construct('%s')
 #1 {main}
diff --git a/ext/spl/tests/fileobject_setmaxlinelen_error001.phpt b/ext/spl/tests/fileobject_setmaxlinelen_error001.phpt
index 5a4229616a..018ecd47b4 100644
--- a/ext/spl/tests/fileobject_setmaxlinelen_error001.phpt
+++ b/ext/spl/tests/fileobject_setmaxlinelen_error001.phpt
@@ -14,4 +14,4 @@ catch (\ValueError $e) {
 
 ?>
 --EXPECT--
-SplFileObject::setMaxLineLen(): Argument #1 ($max_len) must be greater than or equal to 0
+SplFileObject::setMaxLineLen(): Argument #1 ($maxLength) must be greater than or equal to 0
diff --git a/ext/spl/tests/iterator_028.phpt b/ext/spl/tests/iterator_028.phpt
index 0b8253d25b..92e00b4f78 100644
--- a/ext/spl/tests/iterator_028.phpt
+++ b/ext/spl/tests/iterator_028.phpt
@@ -102,5 +102,5 @@ int(0)
 0: 4
 ===-1===
 bool(false)
-RecursiveIteratorIterator::setMaxDepth(): Argument #1 ($max_depth) must be greater than or equal to -1
+RecursiveIteratorIterator::setMaxDepth(): Argument #1 ($maxDepth) must be greater than or equal to -1
 int(4)
diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt
index bc2e4896b0..66f722af9a 100644
--- a/ext/spl/tests/iterator_044.phpt
+++ b/ext/spl/tests/iterator_044.phpt
@@ -83,8 +83,8 @@ NULL
 ===1===
 object(stdClass)#%d (0) {
 }
-CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, stdClass given
-CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, stdClass given
+CachingIterator::offsetExists(): Argument #1 ($key) must be of type string, stdClass given
+CachingIterator::offsetGet(): Argument #1 ($key) must be of type string, stdClass given
 ===2===
 object(MyFoo)#%d (0) {
 }
@@ -124,8 +124,8 @@ int(0)
 ===1===
 object(stdClass)#1 (0) {
 }
-CachingIterator::offsetExists(): Argument #1 ($index) must be of type string, stdClass given
-CachingIterator::offsetGet(): Argument #1 ($index) must be of type string, stdClass given
+CachingIterator::offsetExists(): Argument #1 ($key) must be of type string, stdClass given
+CachingIterator::offsetGet(): Argument #1 ($key) must be of type string, stdClass given
 ===2===
 object(MyFoo)#2 (0) {
 }
diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index d87b114a67..3538fa6b48 100644
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -85,5 +85,5 @@ int(6)
 int(4)
 ===ERRORS===
 iterator_apply(): Argument #3 ($args) must be of type ?array, int given
-iterator_apply(): Argument #2 ($function) must be a valid callback, function "non_existing_function" not found or invalid function name
+iterator_apply(): Argument #2 ($callback) must be a valid callback, function "non_existing_function" not found or invalid function name
 iterator_apply() expects at most 3 arguments, 4 given
diff --git a/ext/spl/tests/spl_autoload_001.phpt b/ext/spl/tests/spl_autoload_001.phpt
index 90e863ce69..c7f5e573f3 100644
--- a/ext/spl/tests/spl_autoload_001.phpt
+++ b/ext/spl/tests/spl_autoload_001.phpt
@@ -100,4 +100,4 @@ TestFunc2(TestClass)
 %stestclass.class.inc
 bool(true)
 ===NOFUNCTION===
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, function "unavailable_autoload_function" not found or invalid function name
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, function "unavailable_autoload_function" not found or invalid function name
diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt
index 6fe71434f8..6eb8510325 100644
--- a/ext/spl/tests/spl_autoload_005.phpt
+++ b/ext/spl/tests/spl_autoload_005.phpt
@@ -43,7 +43,7 @@ catch(Exception $e)
 
 ?>
 --EXPECT--
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, non-static method MyAutoLoader::autoLoad() cannot be called statically
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::autoLoad() cannot be called statically
 MyAutoLoader::autoLoad(TestClass)
 MyAutoLoader::autoThrow(TestClass)
 Exception: Unavailable
diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt
index a460d259fb..589ce74b7f 100644
--- a/ext/spl/tests/spl_autoload_007.phpt
+++ b/ext/spl/tests/spl_autoload_007.phpt
@@ -52,16 +52,16 @@ foreach($funcs as $idx => $func)
 ?>
 --EXPECTF--
 string(22) "MyAutoLoader::notExist"
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, class MyAutoLoader does not have a method "notExist"
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, class MyAutoLoader does not have a method "notExist"
 
 string(22) "MyAutoLoader::noAccess"
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, cannot access protected method MyAutoLoader::noAccess()
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, cannot access protected method MyAutoLoader::noAccess()
 
 string(22) "MyAutoLoader::autoLoad"
 ok
 
 string(22) "MyAutoLoader::dynaLoad"
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
 
 array(2) {
   [0]=>
@@ -69,7 +69,7 @@ array(2) {
   [1]=>
   string(8) "notExist"
 }
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, class MyAutoLoader does not have a method "notExist"
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, class MyAutoLoader does not have a method "notExist"
 
 array(2) {
   [0]=>
@@ -77,7 +77,7 @@ array(2) {
   [1]=>
   string(8) "noAccess"
 }
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, cannot access protected method MyAutoLoader::noAccess()
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, cannot access protected method MyAutoLoader::noAccess()
 
 array(2) {
   [0]=>
@@ -93,7 +93,7 @@ array(2) {
   [1]=>
   string(8) "dynaLoad"
 }
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
 
 array(2) {
   [0]=>
@@ -102,7 +102,7 @@ array(2) {
   [1]=>
   string(8) "notExist"
 }
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, class MyAutoLoader does not have a method "notExist"
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, class MyAutoLoader does not have a method "notExist"
 
 array(2) {
   [0]=>
@@ -111,7 +111,7 @@ array(2) {
   [1]=>
   string(8) "noAccess"
 }
-spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, cannot access protected method MyAutoLoader::noAccess()
+spl_autoload_register(): Argument #1 ($callback) must be a valid callback, cannot access protected method MyAutoLoader::noAccess()
 
 array(2) {
   [0]=>
diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt
index 77b2ab5627..99f61cd561 100644
--- a/ext/spl/tests/spl_autoload_008.phpt
+++ b/ext/spl/tests/spl_autoload_008.phpt
@@ -81,7 +81,7 @@ Exception: Bla
 int(0)
 ====2====
 string(22) "MyAutoLoader::dynaLoad"
-TypeError: spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
+TypeError: spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
 int(0)
 ====3====
 array(2) {
@@ -101,7 +101,7 @@ array(2) {
   [1]=>
   string(8) "dynaLoad"
 }
-TypeError: spl_autoload_register(): Argument #1 ($autoload_function) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
+TypeError: spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically
 int(0)
 ====5====
 array(2) {
diff --git a/ext/spl/tests/spl_autoload_throw_with_spl_autoloader_call_as_autoloader.phpt b/ext/spl/tests/spl_autoload_throw_with_spl_autoloader_call_as_autoloader.phpt
index cde49dbac3..943d80ae25 100644
--- a/ext/spl/tests/spl_autoload_throw_with_spl_autoloader_call_as_autoloader.phpt
+++ b/ext/spl/tests/spl_autoload_throw_with_spl_autoloader_call_as_autoloader.phpt
@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-spl_autoload_register(): Argument #1 ($autoload_function) must not be the spl_autoload_call() function
+spl_autoload_register(): Argument #1 ($callback) must not be the spl_autoload_call() function
diff --git a/ext/spl/tests/spl_limit_iterator_check_limits.phpt b/ext/spl/tests/spl_limit_iterator_check_limits.phpt
index 91604abb3d..3cf4bbab17 100644
--- a/ext/spl/tests/spl_limit_iterator_check_limits.phpt
+++ b/ext/spl/tests/spl_limit_iterator_check_limits.phpt
@@ -25,4 +25,4 @@ $limitIterator = new LimitIterator($arrayIterator, 0, -1);
 ?>
 --EXPECT--
 LimitIterator::__construct(): Argument #2 ($offset) must be greater than or equal to 0
-LimitIterator::__construct(): Argument #3 ($count) must be greater than or equal to -1
+LimitIterator::__construct(): Argument #3 ($limit) must be greater than or equal to -1
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index ec97181854..915f8b5398 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -1477,7 +1477,7 @@ function debug_zval_dump(mixed $value, mixed ...$values): void {}
 
 function serialize(mixed $value): string {}
 
-function unserialize(string $value, array $options = []): mixed {}
+function unserialize(string $data, array $options = []): mixed {}
 
 function memory_get_usage(bool $real_usage = false): int {}
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 6af3931ad4..7495807f1b 100644
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5414c8c3ed41482650a15a7ec6ddf0bb6489091a */
+ * Stub hash: 4cac5b648d326f06e5866f32881583c87d9bce73 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -2156,7 +2156,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_serialize arginfo_gettype
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_unserialize, 0, 1, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
-- 
2.40.0