Skip to content

Commit a72bd6e

Browse files
kocsismatekocsismate
committed
Zend parameter renames amendment
1 parent 7553c69 commit a72bd6e

8 files changed

+19
-19
lines changed

‎Zend/tests/015.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ var_dump(trigger_error("error", E_USER_DEPRECATED));
2323
--EXPECTF--
2424
Notice: error in %s on line %d
2525
bool(true)
26-
trigger_error(): Argument #2 ($error_type) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
27-
trigger_error(): Argument #2 ($error_type) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
26+
trigger_error(): Argument #2 ($error_level) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
27+
trigger_error(): Argument #2 ($error_level) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
2828

2929
Warning: error in %s on line %d
3030
bool(true)

‎Zend/tests/exception_handler_004.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ try {
1616

1717
?>
1818
--EXPECT--
19-
set_exception_handler(): Argument #1 ($exception_handler) must be a valid callback or null, function "fo" not found or invalid function name
20-
set_exception_handler(): Argument #1 ($exception_handler) must be a valid callback or null, class "" not found
19+
set_exception_handler(): Argument #1 ($callback) must be a valid callback or null, function "fo" not found or invalid function name
20+
set_exception_handler(): Argument #1 ($callback) must be a valid callback or null, class "" not found

‎Zend/zend_builtin_functions.stub.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ function get_included_files(): array {}
6868
/** @alias get_included_files */
6969
function get_required_files(): array {}
7070

71-
function trigger_error(string $message, int $error_type = E_USER_NOTICE): bool {}
71+
function trigger_error(string $message, int $error_level = E_USER_NOTICE): bool {}
7272

7373
/** @alias trigger_error */
74-
function user_error(string $message, int $error_type = E_USER_NOTICE): bool {}
74+
function user_error(string $message, int $error_level = E_USER_NOTICE): bool {}
7575

7676
/** @return string|array|object|null */
77-
function set_error_handler(?callable $error_handler, int $error_types = E_ALL) {}
77+
function set_error_handler(?callable $callback, int $error_level_flags = E_ALL) {}
7878

7979
function restore_error_handler(): bool {}
8080

8181
/** @return string|array|object|null */
82-
function set_exception_handler(?callable $exception_handler) {}
82+
function set_exception_handler(?callable $callback) {}
8383

8484
function restore_exception_handler(): bool {}
8585

‎Zend/zend_builtin_functions_arginfo.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: fed3b572fbcae7bda87efc377b56e027da12b511 */
2+
* Stub hash: 097f3957979971c1664e50fc88fdabfcaacd3946 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0)
55
ZEND_END_ARG_INFO()
@@ -124,21 +124,21 @@ ZEND_END_ARG_INFO()
124124

125125
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_trigger_error, 0, 1, _IS_BOOL, 0)
126126
ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
127-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_type, IS_LONG, 0, "E_USER_NOTICE")
127+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_level, IS_LONG, 0, "E_USER_NOTICE")
128128
ZEND_END_ARG_INFO()
129129

130130
#define arginfo_user_error arginfo_trigger_error
131131

132132
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1)
133-
ZEND_ARG_TYPE_INFO(0, error_handler, IS_CALLABLE, 1)
134-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_types, IS_LONG, 0, "E_ALL")
133+
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1)
134+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_level_flags, IS_LONG, 0, "E_ALL")
135135
ZEND_END_ARG_INFO()
136136

137137
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_restore_error_handler, 0, 0, _IS_BOOL, 0)
138138
ZEND_END_ARG_INFO()
139139

140140
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
141-
ZEND_ARG_TYPE_INFO(0, exception_handler, IS_CALLABLE, 1)
141+
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1)
142142
ZEND_END_ARG_INFO()
143143

144144
#define arginfo_restore_exception_handler arginfo_restore_error_handler

‎Zend/zend_closures.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static function bind(
1414

1515
public function bindTo(?object $newThis, object|string|null $newScope = "static"): ?Closure {}
1616

17-
public function call(object $newThis, mixed ...$arguments): mixed {}
17+
public function call(object $newThis, mixed ...$args): mixed {}
1818

1919
public static function fromCallable(callable $callback): Closure {}
2020
}

‎Zend/zend_closures_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 6c9840dd5c2e4c597cd0133bf2d0b523c272d3fe */
2+
* Stub hash: 0a2dd53716d30893aa5dd92a9907b2298abb3f70 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Closure___construct, 0, 0, 0)
55
ZEND_END_ARG_INFO()
@@ -17,7 +17,7 @@ ZEND_END_ARG_INFO()
1717

1818
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Closure_call, 0, 1, IS_MIXED, 0)
1919
ZEND_ARG_TYPE_INFO(0, newThis, IS_OBJECT, 0)
20-
ZEND_ARG_VARIADIC_TYPE_INFO(0, arguments, IS_MIXED, 0)
20+
ZEND_ARG_VARIADIC_TYPE_INFO(0, args, IS_MIXED, 0)
2121
ZEND_END_ARG_INFO()
2222

2323
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Closure_fromCallable, 0, 1, Closure, 0)

‎Zend/zend_exceptions.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __toString(): string {}
4848

4949
class ErrorException extends Exception
5050
{
51-
public function __construct(string $message = "", int $code = 0, int $severity = E_ERROR, ?string $filename = null, ?int $line = null, ?Throwable $previous = null) {}
51+
public function __construct(string $message = "", int $code = 0, int $error_level = E_ERROR, ?string $filename = null, ?int $line = null, ?Throwable $previous = null) {}
5252

5353
final public function getSeverity(): int {}
5454
}

‎Zend/zend_exceptions_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: bc49b326136997660887b12f0c59f8a57b17ecaf */
2+
* Stub hash: b2e278ed6b12adfb01d8d6dabef5e379eabed17a */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Throwable_getMessage, 0, 0, IS_STRING, 0)
55
ZEND_END_ARG_INFO()
@@ -49,7 +49,7 @@ ZEND_END_ARG_INFO()
4949
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ErrorException___construct, 0, 0, 0)
5050
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, message, IS_STRING, 0, "\"\"")
5151
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code, IS_LONG, 0, "0")
52-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, severity, IS_LONG, 0, "E_ERROR")
52+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_level, IS_LONG, 0, "E_ERROR")
5353
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 1, "null")
5454
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, line, IS_LONG, 1, "null")
5555
ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, previous, Throwable, 1, "null")

0 commit comments

Comments
 (0)