From: Stanislav Malyshev <stas@php.net>
Date: Thu, 13 Oct 2016 06:08:30 +0000 (-0700)
Subject: Syncronize with 5.6 - __toString should return ""
X-Git-Tag: php-7.1.0RC4~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94b7ab185c589c61b16a172376c386ad82ae7be7;p=php

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 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) ""