Skip to content

Commit ad705af

Browse files
committed
Merge branch 'Fix-strlen-error-message-param-name' into PHP-8.1
* Fix-strlen-error-message-param-name: Fix strlen error message param name
2 parents 6b88473 + 1be99fa commit ad705af

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Zend/tests/type_declarations/internal_function_strict_mode.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ try {
3232
*** Trying Array Map With Invalid Callback
3333
*** Caught array_map(): Argument #1 ($callback) must be a valid callback or null, first array member is not a valid class name or object
3434
*** Trying Strlen With Float
35-
*** Caught strlen(): Argument #1 ($str) must be of type string, float given
35+
*** Caught strlen(): Argument #1 ($string) must be of type string, float given

Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8451,7 +8451,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)
84518451
zval_ptr_dtor(&tmp);
84528452
}
84538453
if (!EG(exception)) {
8454-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
8454+
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
84558455
}
84568456
ZVAL_UNDEF(EX_VAR(opline->result.var));
84578457
} while (0);

Zend/zend_vm_execute.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5523,7 +5523,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CONST
55235523
zval_ptr_dtor(&tmp);
55245524
}
55255525
if (!EG(exception)) {
5526-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
5526+
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
55275527
}
55285528
ZVAL_UNDEF(EX_VAR(opline->result.var));
55295529
} while (0);
@@ -14679,7 +14679,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_TMPVAR_HANDLER(ZEN
1467914679
zval_ptr_dtor(&tmp);
1468014680
}
1468114681
if (!EG(exception)) {
14682-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
14682+
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
1468314683
}
1468414684
ZVAL_UNDEF(EX_VAR(opline->result.var));
1468514685
} while (0);
@@ -39285,7 +39285,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CV_HANDLER(ZEND_OP
3928539285
zval_ptr_dtor(&tmp);
3928639286
}
3928739287
if (!EG(exception)) {
39288-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
39288+
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
3928939289
}
3929039290
ZVAL_UNDEF(EX_VAR(opline->result.var));
3929139291
} while (0);

0 commit comments

Comments
 (0)