From: Marcus Boerger <helly@php.net>
Date: Thu, 4 Dec 2003 20:56:32 +0000 (+0000)
Subject: Update __toString() issues
X-Git-Tag: php-5.0.0b3RC1~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ae70cc44af20ee92dada276e0d812db6bfcb9f0;p=php

Update __toString() issues
---

diff --git a/ext/spl/examples/cachingiterator.inc b/ext/spl/examples/cachingiterator.inc
index 9146ceeaf6..c54f650e7e 100644
--- a/ext/spl/examples/cachingiterator.inc
+++ b/ext/spl/examples/cachingiterator.inc
@@ -24,7 +24,11 @@ class CachingIterator
 		if ($this->more = $this->it->hasMore()) {
 			$this->current = $this->it->current();
 			$this->key = $this->it->key();
-			$this->strvalue = (string)$this->current;
+			if (is_object($this->current)) {
+				$this->strvalue = $this->current->__toString();
+			} else {
+				$this->strvalue = (string)$this->current;
+			}
 		} else {
 			$this->current = NULL;
 			$this->key = NULL;
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 02839e191f..ebbbc3c6c8 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -59,7 +59,6 @@ SPL_METHOD(RecursiveDirectoryIterator, next);
 SPL_METHOD(RecursiveDirectoryIterator, key);
 SPL_METHOD(RecursiveDirectoryIterator, hasChildren);
 SPL_METHOD(RecursiveDirectoryIterator, getChildren);
-SPL_METHOD(RecursiveDirectoryIterator, __toString);
 
 
 /* declare method parameters */
@@ -94,7 +93,6 @@ static zend_function_entry spl_ce_dir_tree_class_functions[] = {
 	SPL_ME(RecursiveDirectoryIterator, key,           NULL, ZEND_ACC_PUBLIC)
 	SPL_ME(RecursiveDirectoryIterator, hasChildren,   NULL, ZEND_ACC_PUBLIC)
 	SPL_ME(RecursiveDirectoryIterator, getChildren,   NULL, ZEND_ACC_PUBLIC)
-	SPL_MA(RecursiveDirectoryIterator, __toString, DirectoryIterator, getPathname, NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL}
 };