php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix strlen error message param name

Closes GH-10784
This commit is contained in:
Kamil Tekiela
2023-03-10 12:52:28 +00:00
parent d9edda0822 e223bf2015
commit 69ec3c6bc6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/type_declarations/internal_function_strict_mode.phpt
+1 -1
View File
@@ -32,4 +32,4 @@ try {
*** Trying Array Map With Invalid Callback
*** Caught array_map(): Argument #1 ($callback) must be a valid callback or null, first array member is not a valid class name or object
*** Trying Strlen With Float
*** Caught strlen(): Argument #1 ($str) must be of type string, float given
*** Caught strlen(): Argument #1 ($string) must be of type string, float given
Zend/zend_vm_def.h
+1 -1
View File
@@ -8574,7 +8574,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);
Zend/zend_vm_execute.h
Generated
+3 -3
View File
@@ -5620,7 +5620,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CONST
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);
@@ -14961,7 +14961,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_TMPVAR_HANDLER(ZEN
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);
@@ -39987,7 +39987,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CV_HANDLER(ZEND_OP
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);