Skip to content

Commit 5f79e77

Browse files
nikicnikic
committed
Change error message
1 parent 98b8995 commit 5f79e77

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎Zend/tests/bug43201.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,37 @@ Warning: Undefined variable $ref in %s on line %d
3030

3131
Warning: Undefined variable $undef in %s on line %d
3232

33-
Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
33+
Deprecated: chop(): Passing null to parameter of type string is deprecated in %s on line %d
3434

3535
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
3636

3737
Warning: Undefined variable $undef in %s on line %d
3838

39-
Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
39+
Deprecated: chop(): Passing null to parameter of type string is deprecated in %s on line %d
4040

4141
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
4242

4343
Warning: Undefined variable $undef in %s on line %d
4444

45-
Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
45+
Deprecated: chop(): Passing null to parameter of type string is deprecated in %s on line %d
4646

4747
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
4848

4949
Warning: Undefined variable $undef in %s on line %d
5050

51-
Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
51+
Deprecated: chop(): Passing null to parameter of type string is deprecated in %s on line %d
5252

5353
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
5454

5555
Warning: Undefined variable $undef in %s on line %d
5656

57-
Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
57+
Deprecated: chop(): Passing null to parameter of type string is deprecated in %s on line %d
5858

5959
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
6060

6161
Warning: Undefined variable $undef in %s on line %d
6262

63-
Deprecated: chop(): Passing null to argument of type string is deprecated in %s on line %d
63+
Deprecated: chop(): Passing null to parameter of type string is deprecated in %s on line %d
6464

6565
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
6666
ok

‎Zend/tests/null_to_non_nullable_special_func.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ var_dump(strlen($null));
88

99
?>
1010
--EXPECTF--
11-
Deprecated: strlen(): Passing null to argument of type string is deprecated in %s on line %d
11+
Deprecated: strlen(): Passing null to parameter of type string is deprecated in %s on line %d
1212
int(0)

‎Zend/tests/nullsafe_operator/013.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ dump_error(fn() => array_key_exists('foo', $foo?->foo()));
3838

3939
?>
4040
--EXPECTF--
41-
Deprecated: strlen(): Passing null to argument of type string is deprecated in %s on line %d
41+
Deprecated: strlen(): Passing null to parameter of type string is deprecated in %s on line %d
4242
int(0)
4343
bool(true)
4444
bool(false)
4545
bool(false)
4646
bool(false)
4747
bool(false)
4848

49-
Deprecated: defined(): Passing null to argument of type string is deprecated in %s on line %d
49+
Deprecated: defined(): Passing null to parameter of type string is deprecated in %s on line %d
5050
bool(false)
5151

52-
Deprecated: chr(): Passing null to argument of type int is deprecated in %s on line %d
52+
Deprecated: chr(): Passing null to parameter of type int is deprecated in %s on line %d
5353
string(1) "%s"
5454

55-
Deprecated: ord(): Passing null to argument of type string is deprecated in %s on line %d
55+
Deprecated: ord(): Passing null to parameter of type string is deprecated in %s on line %d
5656
int(0)
5757
string(98) "call_user_func_array(): Argument #1 ($function) must be a valid callback, no array or string given"
5858
string(77) "call_user_func_array(): Argument #2 ($args) must be of type array, null given"
@@ -63,7 +63,7 @@ string(52) "func_num_args() expects exactly 0 arguments, 1 given"
6363
string(52) "func_get_args() expects exactly 0 arguments, 1 given"
6464
string(69) "array_slice(): Argument #1 ($array) must be of type array, null given"
6565

66-
Deprecated: array_slice(): Passing null to argument of type int is deprecated in %s on line %d
66+
Deprecated: array_slice(): Passing null to parameter of type int is deprecated in %s on line %d
6767
array(1) {
6868
[0]=>
6969
string(3) "foo"

‎Zend/tests/str_or_obj_of_class_zpp.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ try {
5555
string(6) "string"
5656
string(1) "1"
5757

58-
Deprecated: zend_string_or_stdclass(): Passing null to argument of type string is deprecated in %s on line %d
58+
Deprecated: zend_string_or_stdclass(): Passing null to parameter of type string is deprecated in %s on line %d
5959
string(0) ""
6060
object(stdClass)#1 (0) {
6161
}

‎Zend/tests/str_or_obj_zpp.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ try {
3838
string(6) "string"
3939
string(1) "1"
4040

41-
Deprecated: zend_string_or_object(): Passing null to argument of type string is deprecated in %s on line %d
41+
Deprecated: zend_string_or_object(): Passing null to parameter of type string is deprecated in %s on line %d
4242
string(0) ""
4343
object(stdClass)#1 (0) {
4444
}

‎Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ ZEND_API bool ZEND_FASTCALL zend_parse_arg_class(zval *arg, zend_class_entry **p
428428

429429
static ZEND_COLD bool zend_null_arg_deprecated(const char *type) {
430430
zend_string *func_name = get_active_function_or_method_name();
431-
zend_error(E_DEPRECATED, "%s(): Passing null to argument of type %s is deprecated",
431+
zend_error(E_DEPRECATED, "%s(): Passing null to parameter of type %s is deprecated",
432432
ZSTR_VAL(func_name), type);
433433
zend_string_release(func_name);
434434
return !EG(exception);

‎Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8312,7 +8312,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)
83128312

83138313
if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) {
83148314
zend_error(E_DEPRECATED,
8315-
"strlen(): Passing null to argument of type string is deprecated");
8315+
"strlen(): Passing null to parameter of type string is deprecated");
83168316
if (UNEXPECTED(EG(exception))) {
83178317
HANDLE_EXCEPTION();
83188318
}

‎Zend/zend_vm_execute.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5288,7 +5288,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CONST
52885288

52895289
if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) {
52905290
zend_error(E_DEPRECATED,
5291-
"strlen(): Passing null to argument of type string is deprecated");
5291+
"strlen(): Passing null to parameter of type string is deprecated");
52925292
if (UNEXPECTED(EG(exception))) {
52935293
HANDLE_EXCEPTION();
52945294
}
@@ -14471,7 +14471,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_TMPVAR_HANDLER(ZEN
1447114471

1447214472
if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) {
1447314473
zend_error(E_DEPRECATED,
14474-
"strlen(): Passing null to argument of type string is deprecated");
14474+
"strlen(): Passing null to parameter of type string is deprecated");
1447514475
if (UNEXPECTED(EG(exception))) {
1447614476
HANDLE_EXCEPTION();
1447714477
}
@@ -38568,7 +38568,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CV_HANDLER(ZEND_OP
3856838568

3856938569
if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) {
3857038570
zend_error(E_DEPRECATED,
38571-
"strlen(): Passing null to argument of type string is deprecated");
38571+
"strlen(): Passing null to parameter of type string is deprecated");
3857238572
if (UNEXPECTED(EG(exception))) {
3857338573
HANDLE_EXCEPTION();
3857438574
}

‎ext/standard/tests/strings/chr_variation1.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ string(2) "01"
7777
string(2) "00"
7878
-- Iteration 12 --
7979

80-
Deprecated: Passing null to argument of type int is deprecated in %s on line %d
80+
Deprecated: Passing null to parameter of type int is deprecated in %s on line %d
8181
string(2) "00"
8282
-- Iteration 13 --
8383

84-
Deprecated: Passing null to argument of type int is deprecated in %s on line %d
84+
Deprecated: Passing null to parameter of type int is deprecated in %s on line %d
8585
string(2) "00"

0 commit comments

Comments
 (0)