From: Marcus Boerger <helly@php.net>
Date: Thu, 6 Oct 2005 18:52:51 +0000 (+0000)
Subject: - Fix test
X-Git-Tag: RELEASE_0_9_1~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df7f8a9df5da07f49729dc5d68766400c5e0afe4;p=php

- Fix test
- Convert to unicode
---

diff --git a/Zend/tests/bug26166.phpt b/Zend/tests/bug26166.phpt
index e2800ad878..e48a21afbb 100755
--- a/Zend/tests/bug26166.phpt
+++ b/Zend/tests/bug26166.phpt
@@ -2,6 +2,7 @@
 Bug #26166 (__toString() crash when no values returned)
 --FILE--
 <?php
+
 class Foo
 {
     function __toString()
@@ -28,6 +29,23 @@ class Bar
 $o = new Bar;
 echo $o;
 
+echo "===NONE===\n";
+
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
+class None
+{
+	function __toString() {
+	}
+}
+
+$o = new None;
+echo $o;
+
 echo "===THROW===\n";
 
 class Error 
@@ -45,23 +63,12 @@ catch (Exception $e) {
 	echo "Got the exception\n";
 }
 
-echo "===NONE===\n";
-
-class None
-{
-	function __toString() {
-	}
-}
-
-$o = new None;
-echo $o;
-
 ?>
 ===DONE===
 --EXPECTF--
 Hello World!
-===THROW===
-Got the exception
 ===NONE===
+string(52) "Method None::__toString() must return a string value"
+===THROW===
 
-Catchable fatal error: Method None::__toString() must return a string value in %sbug26166.php on line %d
+Fatal error: Object of class Error could not be converted to string in %sbug26166.php on line %d