Adjust expected fatal error message

Now also includes "on [TYPE]" after merge from master

7 files changed, 15 insertions, 15 deletions

diff --git a/Zend/tests/methods-on-non-objects-args-catch.phpt b/Zend/tests/methods-on-non-objects-args-catch.phpt
index 2dd54cb65d..853d2d5602 100644
--- a/Zend/tests/methods-on-non-objects-args-catch.phpt
+++ b/Zend/tests/methods-on-non-objects-args-catch.phpt
@@ -13,6 +13,6 @@ echo "Alive\n";
 --EXPECTF--
 
 int(4096)
-string(%d) "Call to a member function method() on a non-object"
+string(%d) "Call to a member function method() on null"
 NULL
 Alive
diff --git a/Zend/tests/methods-on-non-objects-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt
index 30a9c774cc..bbfadac107 100644
--- a/Zend/tests/methods-on-non-objects-catch.phpt
+++ b/Zend/tests/methods-on-non-objects-catch.phpt
@@ -13,6 +13,6 @@ echo "Alive\n";
 --EXPECTF--
 
 int(4096)
-string(%d) "Call to a member function method() on a non-object"
+string(%d) "Call to a member function method() on null"
 NULL
 Alive
diff --git a/Zend/tests/methods-on-non-objects-chain.phpt b/Zend/tests/methods-on-non-objects-chain.phpt
index 0f299469e2..30da254cd5 100644
--- a/Zend/tests/methods-on-non-objects-chain.phpt
+++ b/Zend/tests/methods-on-non-objects-chain.phpt
@@ -13,10 +13,10 @@ echo "Alive\n";
 --EXPECTF--
 
 int(4096)
-string(%d) "Call to a member function method() on a non-object"
+string(%d) "Call to a member function method() on null"
 int(4096)
-string(%d) "Call to a member function chained() on a non-object"
+string(%d) "Call to a member function chained() on null"
 int(4096)
-string(%d) "Call to a member function invocations() on a non-object"
+string(%d) "Call to a member function invocations() on null"
 NULL
 Alive
diff --git a/Zend/tests/methods-on-non-objects-eval.phpt b/Zend/tests/methods-on-non-objects-eval.phpt
index c961ed385f..8ee494c434 100644
--- a/Zend/tests/methods-on-non-objects-eval.phpt
+++ b/Zend/tests/methods-on-non-objects-eval.phpt
@@ -13,6 +13,6 @@ echo "Alive\n";
 --EXPECTF--
 
 int(4096)
-string(%d) "Call to a member function method() on a non-object"
+string(%d) "Call to a member function method() on null"
 NULL
 Alive
diff --git a/Zend/tests/methods-on-non-objects-throw.phpt b/Zend/tests/methods-on-non-objects-throw.phpt
index ac27ac3f88..874f57cb24 100644
--- a/Zend/tests/methods-on-non-objects-throw.phpt
+++ b/Zend/tests/methods-on-non-objects-throw.phpt
@@ -25,5 +25,5 @@ echo "Alive\n";
 --EXPECTF--
 Calling...
 Raising...
-Caught expected Call to a member function method() on a non-object!
+Caught expected Call to a member function method() on null!
 Alive
diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt
index df702d3a9a..760d481b27 100644
--- a/Zend/tests/methods-on-non-objects-usort.phpt
+++ b/Zend/tests/methods-on-non-objects-usort.phpt
@@ -1,5 +1,5 @@
 --TEST--
-usort() in combination with "Call to a member function method() on a non-object"
+usort() in combination with "Call to a member function method() on null"
 --FILE--
 <?php
 set_error_handler(function($code, $message) {
@@ -16,17 +16,17 @@ echo "Alive\n";
 ?>
 --EXPECTF--
 int(4096)
-string(51) "Call to a member function compare() on a non-object"
+string(43) "Call to a member function compare() on null"
 int(4096)
-string(51) "Call to a member function compare() on a non-object"
+string(43) "Call to a member function compare() on null"
 int(4096)
-string(51) "Call to a member function compare() on a non-object"
+string(43) "Call to a member function compare() on null"
 int(4096)
-string(51) "Call to a member function compare() on a non-object"
+string(43) "Call to a member function compare() on null"
 int(4096)
-string(51) "Call to a member function compare() on a non-object"
+string(43) "Call to a member function compare() on null"
 int(4096)
-string(51) "Call to a member function compare() on a non-object"
+string(43) "Call to a member function compare() on null"
 array(5) {
   [0]=>
   int(-1)
diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt
index cc426374c8..01031b8b1d 100644
--- a/Zend/tests/methods-on-non-objects.phpt
+++ b/Zend/tests/methods-on-non-objects.phpt
@@ -9,4 +9,4 @@ echo "Should not get here!\n";
 ?>
 --EXPECTF--
 
-Catchable fatal error: Call to a member function method() on a non-object in %s on line %d 
+Catchable fatal error: Call to a member function method() on null in %s on line %d