From: Antony Dovgal <tony2001@php.net>
Date: Thu, 19 Jan 2006 21:27:15 +0000 (+0000)
Subject: fix test
X-Git-Tag: RELEASE_0_9_4~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04ad1d146259b4efa8296a71ba7762be02163606;p=php

fix test
---

diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt
index c038083775..a9f9c69435 100755
--- a/Zend/tests/bug32290.phpt
+++ b/Zend/tests/bug32290.phpt
@@ -98,7 +98,7 @@ var_dump($x->doSomethingStatic(1));
 ===A===
 TestB::doSomething(1)
 
-Strict Standards: Non-static method TestA::doSomething() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d
+Strict Standards: Non-static method TestA::doSomething() cannot be called statically in %s on line %d
 TestA::doSomething(2)
 int(1)
 
@@ -110,7 +110,7 @@ int(1)
 ===C===
 TestB::doSomethingParent(1)
 
-Strict Standards: Non-static method TestA::doSomethingParent() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d
+Strict Standards: Non-static method TestA::doSomethingParent() cannot be called statically in %s on line %d
 TestA::doSomethingParent(2)
 int(1)
 
diff --git a/ext/standard/tests/strings/bug22224.phpt b/ext/standard/tests/strings/bug22224.phpt
index b9a1191537..82c295c1a6 100644
--- a/ext/standard/tests/strings/bug22224.phpt
+++ b/ext/standard/tests/strings/bug22224.phpt
@@ -4,9 +4,14 @@ Bug #22224 (implode changes object references in array)
 error_reporting=0
 --FILE--
 <?php
-class foo {
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	//ignore all errors
 }
 
+set_error_handler('test_error_handler');
+	
+class foo {
+}
 
 $a = new foo();