Fixed tests

diff --git a/Zend/tests/array_type_hint_001.phpt b/Zend/tests/array_type_hint_001.phpt
index def85b39bd1bc4d2b4f332b787d50b56e903438c..4c4f048df76496cd8af6bc164591483fde825617 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
 
-Catchable 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
+Catchable 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/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index ff9c61f63311bfe72b6f7314d627144c93cb36d0..17cf57e3441b53f31c3a256c96309fdc0f54acbf 100644 (file)
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -35,4 +35,4 @@ $a->b($b);
 ?>
 --EXPECTF--
 
-Catchable fatal error: Argument 1 must implement interface Foo, called in %s on line 27 and defined in %s on line 12
+Catchable 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 f799b17d5c04ad77c899e5e1c33cf81d0b0fca0e..5f3b324b61ee9a4c506260a5c6fcd5c575547790 100644 (file)
--- a/tests/lang/bug24658.phpt
+++ b/tests/lang/bug24658.phpt
@@ -53,4 +53,4 @@ int(2)
 object(foo)#%d (0) {
 }
 
-Catchable fatal error: Argument 1 must be an object of class foo in %s on line %d
+Catchable fatal error: Argument 1 passed to typehint() must be an object of class foo in %s on line %d

diff --git a/tests/lang/catchable_error_001.phpt b/tests/lang/catchable_error_001.phpt
index 77492768f9c728c6d411c68aacebcd09f7347ceb..d0161286d064639d1935015b6128078b0d2f848f 100644 (file)
--- a/tests/lang/catchable_error_001.phpt
+++ b/tests/lang/catchable_error_001.phpt
@@ -19,4 +19,4 @@ Catchable fatal error [1]
        echo "ALIVE!\n";
 ?>
 --EXPECTF--
-Catchable fatal error: Argument 1 must be an instance of Foo, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php on line 5
+Catchable fatal error: Argument 1 passed to blah() must be an instance of Foo, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php on line 5

diff --git a/tests/lang/catchable_error_002.phpt b/tests/lang/catchable_error_002.phpt
index 32d4b8bfe9615e9052bcc4be6f7558869d61f018..53f443696f775a609e47fc9f9773444ed2dbdaf7 100644 (file)
--- a/tests/lang/catchable_error_002.phpt
+++ b/tests/lang/catchable_error_002.phpt
@@ -25,7 +25,7 @@ array(5) {
   [0]=>
   int(4096)
   [1]=>
-  string(%d) "Argument 1 must be an instance of Foo, called in %scatchable_error_002.php on line 17 and defined"
+  string(%d) "Argument 1 passed to blah() must be an instance of Foo, called in %scatchable_error_002.php on line 17 and defined"
   [2]=>
   string(%d) "%scatchable_error_002.php"
   [3]=>

diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index 2af109632cf83062532f1127c45f78386cb84e1b..dc14706a362b9add036001529a3ba48c256f2a54 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--
 
-Catchable fatal error: Argument 1 must be an instance of Foo, called in %s on line 16 and defined in %s on line 9
+Catchable 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