Fix tests (new error message)

diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index 179ba0f7a61a2d55412fabf4748209a62fd0f900..dc630a19b1a236bd6689f5f82f636a9b39407783 100755 (executable)
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -79,7 +79,7 @@ int(4)
 Error: Argument 3 passed to iterator_apply() must be an array, integer given
 Error: iterator_apply() expects parameter 3 to be array, integer given
 NULL
-Error: iterator_apply() expects parameter 2 to be valid callback,%sstring given
+Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_functon' not found or invalid function name
 NULL
 Error: iterator_apply() expects at most 3 parameters, 4 given
 NULL

diff --git a/ext/spl/tests/spl_autoload_001.phpt b/ext/spl/tests/spl_autoload_001.phpt
index 57cfbb6e827fa953585e58e9f5be62a02fe1ec1d..92a2ca96c0e8324a76bd067d6d7840f90b1bbd93 100755 (executable)
--- a/ext/spl/tests/spl_autoload_001.phpt
+++ b/ext/spl/tests/spl_autoload_001.phpt
@@ -134,7 +134,7 @@ TestFunc2(TestClass)
 %stestclass.class.inc
 bool(true)
 ===NOFUNCTION===
-Exception: Function 'unavailable_autoload_function' not found
+Exception: Function 'unavailable_autoload_function' not found, (function 'unavailable_autoload_function' not found or invalid function name)
 ===DONE===
 --UEXPECTF--
 ===EMPTY===
@@ -165,5 +165,5 @@ TestFunc2(TestClass)
 %stestclass.class.inc
 bool(true)
 ===NOFUNCTION===
-Exception: Function 'unavailable_autoload_function' not found
+Exception: Function 'unavailable_autoload_function' not found, (function 'unavailable_autoload_function' not found or invalid function name)
 ===DONE===

diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt
index 1f946d9794c305364dd8a27e4bf828cbf1430c03..8ba7965f804dbc5018f0f6429421a63b11bd8ecd 100755 (executable)
--- a/ext/spl/tests/spl_autoload_005.phpt
+++ b/ext/spl/tests/spl_autoload_005.phpt
@@ -50,7 +50,7 @@ catch(Exception $e)
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Exception: Passed array specifies a non static method but no object
+Exception: Passed array specifies a non static method but no object (non-static method MyAutoLoader::autoLoad() should not be called statically)
 MyAutoLoader::autoLoad(TestClass)
 MyAutoLoader::autoThrow(TestClass)
 Exception: Unavailable

diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt
index 5c7bcbccc03b61617f53b4fa226343828ab8e617..00e41cd8bb2bb973f63ce90d52ac1d8bf725e6ab 100755 (executable)
--- a/ext/spl/tests/spl_autoload_007.phpt
+++ b/ext/spl/tests/spl_autoload_007.phpt
@@ -59,16 +59,16 @@ foreach($funcs as $idx => $func)
 <?php exit(0); ?>
 --EXPECTF--
 string(22) "MyAutoLoader::notExist"
-Function 'MyAutoLoader::notExist' not found
+Function 'MyAutoLoader::notExist' not found, (class 'MyAutoLoader' does not have a method 'notexist')
 
 string(22) "MyAutoLoader::noAccess"
-Function 'MyAutoLoader::noAccess' not callable
+Function 'MyAutoLoader::noAccess' not callable, (cannot access protected method MyAutoLoader::noAccess())
 
 string(22) "MyAutoLoader::autoLoad"
 ok
 
 string(22) "MyAutoLoader::dynaLoad"
-Function 'MyAutoLoader::dynaLoad' not callable
+Function 'MyAutoLoader::dynaLoad' not callable, (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 
 array(2) {
   [0]=>
@@ -76,7 +76,7 @@ array(2) {
   [1]=>
   string(8) "notExist"
 }
-Passed array does not specify an existing static method
+Passed array does not specify an existing static method (class 'MyAutoLoader' does not have a method 'notexist')
 
 array(2) {
   [0]=>
@@ -84,7 +84,7 @@ array(2) {
   [1]=>
   string(8) "noAccess"
 }
-Passed array does not specify a callable static method
+Passed array does not specify a callable static method (cannot access protected method MyAutoLoader::noAccess())
 
 array(2) {
   [0]=>
@@ -100,7 +100,7 @@ array(2) {
   [1]=>
   string(8) "dynaLoad"
 }
-Passed array specifies a non static method but no object
+Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 
 array(2) {
   [0]=>
@@ -109,7 +109,7 @@ array(2) {
   [1]=>
   string(8) "notExist"
 }
-Passed array does not specify an existing method
+Passed array does not specify an existing method (class 'MyAutoLoader' does not have a method 'notexist')
 
 array(2) {
   [0]=>
@@ -118,7 +118,7 @@ array(2) {
   [1]=>
   string(8) "noAccess"
 }
-Passed array does not specify a callable method
+Passed array does not specify a callable method (cannot access protected method MyAutoLoader::noAccess())
 
 array(2) {
   [0]=>
@@ -140,16 +140,16 @@ ok
 ===DONE===
 --UEXPECTF--
 unicode(22) "MyAutoLoader::notExist"
-Function 'MyAutoLoader::notExist' not found
+Function 'MyAutoLoader::notExist' not found, (class 'MyAutoLoader' does not have a method 'notexist')
 
 unicode(22) "MyAutoLoader::noAccess"
-Function 'MyAutoLoader::noAccess' not callable
+Function 'MyAutoLoader::noAccess' not callable, (cannot access protected method MyAutoLoader::noAccess())
 
 unicode(22) "MyAutoLoader::autoLoad"
 ok
 
 unicode(22) "MyAutoLoader::dynaLoad"
-Function 'MyAutoLoader::dynaLoad' not callable
+Function 'MyAutoLoader::dynaLoad' not callable, (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 
 array(2) {
   [0]=>
@@ -157,7 +157,7 @@ array(2) {
   [1]=>
   unicode(8) "notExist"
 }
-Passed array does not specify an existing static method
+Passed array does not specify an existing static method (class 'MyAutoLoader' does not have a method 'notexist')
 
 array(2) {
   [0]=>
@@ -165,7 +165,7 @@ array(2) {
   [1]=>
   unicode(8) "noAccess"
 }
-Passed array does not specify a callable static method
+Passed array does not specify a callable static method (cannot access protected method MyAutoLoader::noAccess())
 
 array(2) {
   [0]=>
@@ -181,7 +181,7 @@ array(2) {
   [1]=>
   unicode(8) "dynaLoad"
 }
-Passed array specifies a non static method but no object
+Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 
 array(2) {
   [0]=>
@@ -190,7 +190,7 @@ array(2) {
   [1]=>
   unicode(8) "notExist"
 }
-Passed array does not specify an existing method
+Passed array does not specify an existing method (class 'MyAutoLoader' does not have a method 'notexist')
 
 array(2) {
   [0]=>
@@ -199,7 +199,7 @@ array(2) {
   [1]=>
   unicode(8) "noAccess"
 }
-Passed array does not specify a callable method
+Passed array does not specify a callable method (cannot access protected method MyAutoLoader::noAccess())
 
 array(2) {
   [0]=>

diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt
index 95ab6bd5991500638a110daea35a2612053f8f2a..369b8303e0b3cf4cb4ed95a58eadb4ace1366375 100755 (executable)
--- a/ext/spl/tests/spl_autoload_008.phpt
+++ b/ext/spl/tests/spl_autoload_008.phpt
@@ -82,7 +82,7 @@ Exception: Bla
 int(0)
 ====2====
 string(22) "MyAutoLoader::dynaLoad"
-LogicException: Function 'MyAutoLoader::dynaLoad' not callable
+LogicException: Function 'MyAutoLoader::dynaLoad' not callable (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 int(0)
 ====3====
 array(2) {
@@ -102,7 +102,7 @@ array(2) {
   [1]=>
   string(8) "dynaLoad"
 }
-LogicException: Passed array specifies a non static method but no object
+LogicException: Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 int(0)
 ====5====
 array(2) {
@@ -144,7 +144,7 @@ Exception: Bla
 int(0)
 ====2====
 unicode(22) "MyAutoLoader::dynaLoad"
-LogicException: Function 'MyAutoLoader::dynaLoad' not callable
+LogicException: Function 'MyAutoLoader::dynaLoad' not callable (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 int(0)
 ====3====
 array(2) {
@@ -164,7 +164,7 @@ array(2) {
   [1]=>
   unicode(8) "dynaLoad"
 }
-LogicException: Passed array specifies a non static method but no object
+LogicException: Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically)
 int(0)
 ====5====
 array(2) {