diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-03-10 15:16:01 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-03-10 15:16:01 +0800 |
| commit | 9f263c257a4e5838d8766b833e468795b07e9183 (patch) | |
| tree | eb74f9c524e602d223ba4d20d593423787208941 /ext/spl | |
| parent | 7cb3e90162d4e1ea57f52e354686ad56effc1b93 (diff) | |
| parent | c398198c0a8e58bc37a441bcfbfe1eb0e8058d9f (diff) | |
| download | php-git-9f263c257a4e5838d8766b833e468795b07e9183.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74218 (ArrayIterator error message is confusing)
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/spl_array.c | 2 | ||||
| -rw-r--r-- | ext/spl/tests/arrayObject_exchangeArray_basic3.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 8095c8cb19..c31ddf80ec 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1117,7 +1117,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 ed2b8e89e1..d89ca821a2 100644 --- 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) { |