Syncronize with 5.6 - __toString should return ""

(cherry picked from commit 2301608736c82183f8210053a45f78eeef5b0c74)

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 6af40af39bbb3d5b67c1d173fc4f891eef343820..af458dae4a7cd3a8b855fb378394c6d2acc607ab 100644 (file)
--- 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 0395b3794d854d5845f6eed4e788c99ae91523ae..57ca5152ed74e996c80b939582de43d52a23ecc8 100644 (file)
--- 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) ""