summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-07-16 17:08:11 +0300
committerDmitry Stogov <dmitry@zend.com>2018-07-16 17:08:11 +0300
commit70d0175a13134e7abeb54ea67c1f4a29f0edf22b (patch)
tree38c36c39260efd7935f1ce1312ddd2391c38b908
parent5cf64742773ddbf9af69d962a4d12b567fcf0084 (diff)
downloadphp-git-70d0175a13134e7abeb54ea67c1f4a29f0edf22b.tar.gz
Fixed error messages.
-rw-r--r--Zend/zend_execute.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 5012688c6b..0778c19ddd 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1157,7 +1157,7 @@ static zend_never_inline void zend_binary_assign_op_obj_dim(zval *object, zval *
}
zval_ptr_dtor(&res);
} else {
- zend_error(E_WARNING, "Attempt to assign property of non-object");
+ zend_use_object_as_array();
if (retval) {
ZVAL_NULL(retval);
}
@@ -2111,7 +2111,7 @@ static zend_never_inline int ZEND_FASTCALL zend_isset_dim_slow(zval *container,
if (EXPECTED(Z_OBJ_HT_P(container)->has_dimension)) {
return Z_OBJ_HT_P(container)->has_dimension(container, offset, 0);
} else {
- zend_error(E_NOTICE, "Trying to check element of non-array");
+ zend_use_object_as_array();
return 0;
}
} else if (EXPECTED(Z_TYPE_P(container) == IS_STRING)) { /* string offsets */
@@ -2156,7 +2156,7 @@ static zend_never_inline int ZEND_FASTCALL zend_isempty_dim_slow(zval *container
if (EXPECTED(Z_OBJ_HT_P(container)->has_dimension)) {
return !Z_OBJ_HT_P(container)->has_dimension(container, offset, 1);
} else {
- zend_error(E_NOTICE, "Trying to check element of non-array");
+ zend_use_object_as_array();
return 1;
}
} else if (EXPECTED(Z_TYPE_P(container) == IS_STRING)) { /* string offsets */