Skip to content

Commit e223bf2

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix strlen error message param name
2 parents d3c9585 + ad705af commit e223bf2

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
@@ -8512,7 +8512,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)
85128512
zval_ptr_dtor(&tmp);
85138513
}
85148514
if (!EG(exception)) {
8515-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
8515+
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
85168516
}
85178517
ZVAL_UNDEF(EX_VAR(opline->result.var));
85188518
} while (0);

Zend/zend_vm_execute.h

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)