Fixed bug #74218 (ArrayIterator error message is confusing)

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index fa3262d1037a9bcc9fe39542eddcd47bacc073b3..556878f0e1d15ba4d5c0f0325f4867ef34d81caf 100644 (file)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1112,7 +1112,7 @@ static void spl_array_it_rewind(zend_object_iterator *iter) /* {{{ */
 /* {{{ spl_array_set_array */
 static void spl_array_set_array(zval *object, spl_array_object *intern, zval *array, zend_long ar_flags, int just_array) {
        if (Z_TYPE_P(array) != IS_OBJECT && Z_TYPE_P(array) != IS_ARRAY) {
-               zend_throw_exception(spl_ce_InvalidArgumentException, "Passed variable is not an array or object, using empty array instead", 0);
+               zend_throw_exception(spl_ce_InvalidArgumentException, "Passed variable is not an array or object", 0);
                return;
        }
 

diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
index ed2b8e89e1a5ae6dc2e29949dc08897dbe2c5f82..d89ca821a28fc93f9c1c973e2da6c78d7dfd6712 100644 (file)
--- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
+++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
@@ -105,7 +105,7 @@ array(1) {
 
 
 --> exchangeArray() with bad arg type:
-Exception:Passed variable is not an array or object, using empty array instead
+Exception:Passed variable is not an array or object
 
 Notice: Undefined variable: copy in %s on line 46
 object(ArrayObject)#3 (1) {