diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-10-12 23:08:30 -0700 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-14 01:58:08 +0200 |
| commit | 94b7ab185c589c61b16a172376c386ad82ae7be7 (patch) | |
| tree | 5769274e3cfe9b7e7d526d11990714e8740d12eb | |
| parent | 0362d61ab75c4b6faa99ca57d49cd800530b482f (diff) | |
| download | php-git-94b7ab185c589c61b16a172376c386ad82ae7be7.tar.gz | |
Syncronize with 5.6 - __toString should return ""
(cherry picked from commit 2301608736c82183f8210053a45f78eeef5b0c74)
| -rw-r--r-- | ext/spl/spl_iterators.c | 2 | ||||
| -rw-r--r-- | ext/spl/tests/spl_cachingiterator___toString_basic.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 6af40af39b..af458dae4a 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -2801,7 +2801,7 @@ SPL_METHOD(CachingIterator, __toString) if (Z_TYPE(intern->u.caching.zstr) == IS_STRING) { RETURN_STR_COPY(Z_STR_P(&intern->u.caching.zstr)); } else { - RETURN_NULL(); + RETURN_EMPTY_STRING(); } } /* }}} */ diff --git a/ext/spl/tests/spl_cachingiterator___toString_basic.phpt b/ext/spl/tests/spl_cachingiterator___toString_basic.phpt index 0395b3794d..57ca5152ed 100644 --- a/ext/spl/tests/spl_cachingiterator___toString_basic.phpt +++ b/ext/spl/tests/spl_cachingiterator___toString_basic.phpt @@ -13,4 +13,4 @@ $ci->__toString() // if conversion to string is done by echo, for example, an ex ); ?> --EXPECTF-- -NULL +string(0) "" |