diff options
| -rw-r--r-- | Zend/tests/foreach_undefined.phpt | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 6 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 16 | ||||
| -rw-r--r-- | ext/simplexml/tests/bug38347.phpt | 2 | ||||
| -rw-r--r-- | ext/simplexml/tests/sxe_003.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/bug27468.phpt | 2 | ||||
| -rw-r--r-- | tests/lang/bug27439.phpt | 6 | ||||
| -rw-r--r-- | tests/lang/bug29566.phpt | 2 | ||||
| -rw-r--r-- | tests/lang/foreachLoop.003.phpt | 10 |
9 files changed, 24 insertions, 24 deletions
diff --git a/Zend/tests/foreach_undefined.phpt b/Zend/tests/foreach_undefined.phpt index bc1d8bbc71..0d46f7cec4 100644 --- a/Zend/tests/foreach_undefined.phpt +++ b/Zend/tests/foreach_undefined.phpt @@ -10,5 +10,5 @@ echo "Done\n"; --EXPECTF-- Warning: Undefined variable: a in %s on line %d -Warning: Invalid argument supplied for foreach() in %s on line %d +Warning: foreach() argument must be of type array|object, null given in %s on line %d Done diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index bf5a156389..5d8293dfd7 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -6188,7 +6188,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET_R, CONST|TMP|VAR|CV, JMP_ADDR) } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; FREE_OP1(); @@ -6277,7 +6277,7 @@ ZEND_VM_COLD_CONST_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR) } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; if (OP1_TYPE == IS_VAR) { @@ -6587,7 +6587,7 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY, JMP_ADDR) value_type = Z_TYPE_INFO_P(value); } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array))); if (UNEXPECTED(EG(exception))) { UNDEF_RESULT(); HANDLE_EXCEPTION(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index c87df4e871..d07c6c0f51 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -4175,7 +4175,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_ } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; if (IS_CONST == IS_VAR) { @@ -17685,7 +17685,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_TMP_HANDLER(ZE } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); @@ -17773,7 +17773,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_TMP_HANDLER(Z } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; if (IS_TMP_VAR == IS_VAR) { @@ -20345,7 +20345,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_VAR_HANDLER(ZE } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); @@ -20434,7 +20434,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_VAR_HANDLER(Z } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; if (IS_VAR == IS_VAR) { @@ -20744,7 +20744,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_RW_SPEC_VAR_HANDLER(Z value_type = Z_TYPE_INFO_P(value); } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array))); if (UNEXPECTED(EG(exception))) { UNDEF_RESULT(); HANDLE_EXCEPTION(); @@ -36334,7 +36334,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_CV_HANDLER(ZEN } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; @@ -36422,7 +36422,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_CV_HANDLER(ZE } } } else { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr))); ZVAL_UNDEF(EX_VAR(opline->result.var)); Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1; if (IS_CV == IS_VAR) { diff --git a/ext/simplexml/tests/bug38347.phpt b/ext/simplexml/tests/bug38347.phpt index c6b5bf7fac..73bcd06e82 100644 --- a/ext/simplexml/tests/bug38347.phpt +++ b/ext/simplexml/tests/bug38347.phpt @@ -24,5 +24,5 @@ SimpleXMLElement Object ( ) -Warning: Invalid argument supplied for foreach() in %sbug38347.php on line 6 +Warning: foreach() argument must be of type array|object, null given in %sbug38347.php on line 6 Done diff --git a/ext/simplexml/tests/sxe_003.phpt b/ext/simplexml/tests/sxe_003.phpt index 37a4e554d2..0705919b69 100644 --- a/ext/simplexml/tests/sxe_003.phpt +++ b/ext/simplexml/tests/sxe_003.phpt @@ -58,7 +58,7 @@ for ($sxe->rewind(); $sxe->valid(); $sxe->next()) { ?> --EXPECTF-- -Warning: Invalid argument supplied for foreach() in %ssxe_003.php on line %d +Warning: foreach() argument must be of type array|object, null given in %ssxe_003.php on line %d ===RESET=== bool(true) string(5) "elem1" diff --git a/tests/classes/bug27468.phpt b/tests/classes/bug27468.phpt index 4ef8d44a61..d590683c82 100644 --- a/tests/classes/bug27468.phpt +++ b/tests/classes/bug27468.phpt @@ -13,5 +13,5 @@ echo 'OK'; --EXPECTF-- Warning: Undefined property: foo::$x in %s on line %d -Warning: Invalid argument supplied for foreach() in %sbug27468.php on line 4 +Warning: foreach() argument must be of type array|object, null given in %sbug27468.php on line 4 OK diff --git a/tests/lang/bug27439.phpt b/tests/lang/bug27439.phpt index ceb714d81b..c9f08a0403 100644 --- a/tests/lang/bug27439.phpt +++ b/tests/lang/bug27439.phpt @@ -67,10 +67,10 @@ echo "===DONE==="; 123 Warning: Undefined property: test::$foobar in %s on line %d -Warning: Invalid argument supplied for foreach() in %s on line %d +Warning: foreach() argument must be of type array|object, null given in %s on line %d -Warning: Invalid argument supplied for foreach() in %s on line %d +Warning: foreach() argument must be of type array|object, string given in %s on line %d -Warning: Invalid argument supplied for foreach() in %s on line %d +Warning: foreach() argument must be of type array|object, string given in %s on line %d 123 ===DONE=== diff --git a/tests/lang/bug29566.phpt b/tests/lang/bug29566.phpt index 9c9a466388..0e6d45158b 100644 --- a/tests/lang/bug29566.phpt +++ b/tests/lang/bug29566.phpt @@ -13,4 +13,4 @@ foreach($var['nosuchkey'] as $v) { --EXPECTF-- Warning: Illegal string offset 'nosuchkey' in %sbug29566.php on line %d -Warning: Invalid argument supplied for foreach() in %sbug29566.php on line %d +Warning: foreach() argument must be of type array|object, string given in %sbug29566.php on line %d diff --git a/tests/lang/foreachLoop.003.phpt b/tests/lang/foreachLoop.003.phpt index 352ac335b7..c4ca3019f3 100644 --- a/tests/lang/foreachLoop.003.phpt +++ b/tests/lang/foreachLoop.003.phpt @@ -33,13 +33,13 @@ echo "done.\n"; --EXPECTF-- Not an array. -Warning: Invalid argument supplied for foreach() in %s on line 4 +Warning: foreach() argument must be of type array|object, bool given in %s on line 4 -Warning: Invalid argument supplied for foreach() in %s on line 9 +Warning: foreach() argument must be of type array|object, null given in %s on line 9 -Warning: Invalid argument supplied for foreach() in %s on line 14 +Warning: foreach() argument must be of type array|object, int given in %s on line 14 -Warning: Invalid argument supplied for foreach() in %s on line 19 +Warning: foreach() argument must be of type array|object, float given in %s on line 19 -Warning: Invalid argument supplied for foreach() in %s on line 24 +Warning: foreach() argument must be of type array|object, string given in %s on line 24 done. |