- Fix tests due to changes in the error messages.

# Also nuked some CRLF's

diff --git a/Zend/tests/array_type_hint_001.phpt b/Zend/tests/array_type_hint_001.phpt
index b110622aeba1a1c2b0a23001b06804578b049ace..b8a8955f2dbb933c0711d1b0ffd4bb0ae53478df 100755 (executable)
--- a/Zend/tests/array_type_hint_001.phpt
+++ b/Zend/tests/array_type_hint_001.phpt
@@ -12,4 +12,4 @@ foo(123);
 --EXPECTF--
 3
 
-Fatal error: Argument 1 must be an array, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+Fatal error: Argument 1 passed to foo() must be an array, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2

diff --git a/Zend/tests/bug20240.phpt b/Zend/tests/bug20240.phpt
index 43950440067af7b40eefe0af1353c28627248a3a..acf673a277b7d32a77873ddd2e38df9b657cd645 100755 (executable)
--- a/Zend/tests/bug20240.phpt
+++ b/Zend/tests/bug20240.phpt
@@ -39,5 +39,5 @@ echo "Done\n";
 2
 3
 Done
-test::__destruct
 test::destructor
+test::__destruct

diff --git a/Zend/tests/bug33996.phpt b/Zend/tests/bug33996.phpt
index 9b52f02a8fd2e6f7bd9b4618ac9101df1b56a99d..1f02cae0f922a5d679cd054120d76d253b13842b 100755 (executable)
--- a/Zend/tests/bug33996.phpt
+++ b/Zend/tests/bug33996.phpt
@@ -26,4 +26,4 @@ FooTest(new Foo());
 --EXPECTF--
 Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line 17 and defined in %sbug33996.php on line 12
 Hi!
-Fatal error: Argument 1 must be an object of class Foo, called in %sbug33996.php on line 18 and defined in %sbug33996.php on line 7
+Fatal error: Argument 1 passed to FooTest() must be an object of class Foo, called in %sbug33996.php on line 18 and defined in %sbug33996.php on line 7

diff --git a/Zend/tests/bug34199.phpt b/Zend/tests/bug34199.phpt
index 9541eea9b4878e7fa101f988f5d5a29661df28a1..daae0deb3d5211a56345307619026a0d775520b2 100755 (executable)
--- a/Zend/tests/bug34199.phpt
+++ b/Zend/tests/bug34199.phpt
@@ -15,3 +15,4 @@ if(!$kids) echo "ok\n"; else echo "bug\n";
 bool(false)
 ok
 ok
+

diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index c46e420ab6646de3a0a7bba6d532badbbcb765f4..82241298d83297ffe282eaaabf2edcdd97e8f220 100644 (file)
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -35,4 +35,4 @@ $a->b($b);
 ?>
 --EXPECTF--
 
-Fatal error: Argument 1 must implement interface Foo, called in %s on line 27 and defined in %s on line 12
+Fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, called in %s on line 27 and defined in %s on line 12

diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt
index 399fd32cac7ddba5983fa674f41d2dec66a06f3d..d9bf0f5668b5a7ddb6e093864d9d88c42ae2b529 100644 (file)
--- a/tests/lang/bug24658.phpt
+++ b/tests/lang/bug24658.phpt
@@ -53,4 +53,4 @@ int(2)
 object(foo)#%d (0) {
 }
 
-Fatal error: Argument 1 must be an object of class foo in %s on line %d
+Fatal error: Argument 1 passed to typehint() must be an object of class foo in %s on line %d

diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index 2aea3e703ee239146d047209bd752977a4649184..2b5f6c82876c3a2d54604bb301188713d3e25b56 100644 (file)
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -23,4 +23,4 @@ type_hint_foo($bar);
 ?>
 --EXPECTF--
 
-Fatal error: Argument 1 must be an instance of Foo, called in %s on line 16 and defined in %s on line 9
+Fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo, called in %s on line 16 and defined in %s on line 9