From 8df36aaf3220a06f821434da1e893c035213d7a8 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Tue, 20 Jun 2006 13:06:50 +0000
Subject: [PATCH] fix test

---
 Zend/tests/objects_013.phpt       |  2 +-
 ext/simplexml/tests/bug37565.phpt | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Zend/tests/objects_013.phpt b/Zend/tests/objects_013.phpt
index cd65bb287a..3f7bea81af 100644
--- a/Zend/tests/objects_013.phpt
+++ b/Zend/tests/objects_013.phpt
@@ -12,4 +12,4 @@ class bar implements foo, foo {
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Cannot implement previously implemented interface foo in %s on line %d
+Fatal error: Class bar cannot implement previously implemented interface foo in %s on line %d
diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt
index 95f9795c67..85b50eb972 100755
--- a/ext/simplexml/tests/bug37565.phpt
+++ b/ext/simplexml/tests/bug37565.phpt
@@ -3,6 +3,12 @@ Bug #37565 Using reflection::export with simplexml causing a crash
 --FILE--
 <?php
 
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	    echo "Error: $errstr\n";
+}
+
+set_error_handler('my_error_handler');
+
 class Setting extends ReflectionObject
 {
 }
@@ -14,12 +20,10 @@ Reflection::export(simplexml_load_file('data:,<test/>', 'Setting'));
 ?>
 ===DONE===
 --EXPECTF--
-
-Warning: simplexml_load_string() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given in %sbug37565.php on line %d
-
-Warning: Reflection::export() expects parameter 1 to be Reflector, null given in %sbug37565.php on line %d
-
-Warning: simplexml_load_file() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given in %sbug37565.php on line %d
-
-Warning: Reflection::export() expects parameter 1 to be Reflector, null given in %sbug37565.php on line %d
+Error: simplexml_load_string() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given
+Error: Argument 1 passed to Reflection::export() must implement interface Reflector, null given
+Error: Reflection::export() expects parameter 1 to be Reflector, null given
+Error: simplexml_load_file() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given
+Error: Argument 1 passed to Reflection::export() must implement interface Reflector, null given
+Error: Reflection::export() expects parameter 1 to be Reflector, null given
 ===DONE===
-- 
2.50.1