- Fix test

diff --git a/tests/classes/tostring_001.phpt b/tests/classes/tostring_001.phpt
index 24c3a9e190d69a62db188a1881cc78eda0e33bab..ecc64b0860d4a25fed5a2f66aae4a7cb3ac956c1 100755 (executable)
--- a/tests/classes/tostring_001.phpt
+++ b/tests/classes/tostring_001.phpt
@@ -5,16 +5,33 @@ ZE2 __toString()
 --FILE--
 <?php
 
-class test1 {
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+       var_dump($errstr);
 }
 
-class test2 {
-    function __toString() {
+set_error_handler('my_error_handler');
+
+class test1
+{
+}
+
+class test2
+{
+    function __toString()
+    {
        echo __METHOD__ . "()\n";
         return "Converted\n";
     }
 }
 
+class test3
+{
+    function __toString()
+    {
+       echo __METHOD__ . "()\n";
+        return 42;
+    }
+}
 echo "====test1====\n";
 $o = new test1;
 print_r($o);
@@ -34,11 +51,11 @@ echo "string:".$o;
 
 echo "====test5====\n";
 echo 1 . $o;
-echo 1 . $o;
+echo 1 , $o;
 
 echo "====test6====\n";
-echo $o.$o;
-echo $o,$o;
+echo $o . $o;
+echo $o , $o;
 
 echo "====test7====\n";
 $ar = array();
@@ -51,14 +68,21 @@ var_dump(trim((string)$o));
 
 echo "====test9====\n";
 echo sprintf("%s", $o);
+
+echo "====test10====\n";
+$o = new test3;
+var_dump($o);
+echo $o;
+
 ?>
-====DONE!====
+====DONE====
 --EXPECTF--
 ====test1====
 test1 Object
 (
 )
-string(12) "Object id #%d"
+string(54) "Object of class test1 could not be converted to string"
+string(0) ""
 object(test1)#%d (0) {
 }
 ====test2====
@@ -67,7 +91,7 @@ test2 Object
 )
 test2::__toString()
 Converted
-object(test2)#%d (%d) {
+object(test2)#%d (0) {
 }
 ====test3====
 test2::__toString()
@@ -78,8 +102,8 @@ string:Converted
 ====test5====
 test2::__toString()
 1Converted
-test2::__toString()
-1Converted
+1test2::__toString()
+Converted
 ====test6====
 test2::__toString()
 test2::__toString()
@@ -91,8 +115,7 @@ test2::__toString()
 Converted
 ====test7====
 test2::__toString()
-
-Warning: Illegal offset type in %stostring_001.php on line %d
+string(19) "Illegal offset type"
 ====test8====
 test2::__toString()
 string(9) "Converted"
@@ -101,53 +124,9 @@ string(9) "Converted"
 ====test9====
 test2::__toString()
 Converted
-====DONE!====
---UEXPECTF--
-====test1====
-test1 Object
-(
-)
-string(12) "Object id #%d"
-object(test1)#%d (0) {
-}
-====test2====
-test2 Object
-(
-)
-test2::__toString()
-Converted
-object(test2)#%d (%d) {
+====test10====
+object(test3)#%d (0) {
 }
-====test3====
-test2::__toString()
-Converted
-====test4====
-test2::__toString()
-string:Converted
-====test5====
-test2::__toString()
-1Converted
-test2::__toString()
-1Converted
-====test6====
-test2::__toString()
-test2::__toString()
-Converted
-Converted
-test2::__toString()
-Converted
-test2::__toString()
-Converted
-====test7====
-test2::__toString()
-
-Warning: Illegal offset type in %stostring_001.php on line %d
-====test8====
-test2::__toString()
-unicode(9) "Converted"
-test2::__toString()
-unicode(9) "Converted"
-====test9====
-test2::__toString()
-Converted
-====DONE!====
+test3::__toString()
+string(53) "Method test3::__toString() must return a string value"
+====DONE====