felipe Mon Feb 4 14:02:01 2008 UTC
Modified files:
/php-src/ext/spl/tests spl_autoload_001.phpt spl_autoload_005.phpt
spl_autoload_007.phpt spl_autoload_008.phpt
spl_004.phpt
Log:
Fix tests (new error message)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_001.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_001.phpt
diff -u php-src/ext/spl/tests/spl_autoload_001.phpt:1.6
php-src/ext/spl/tests/spl_autoload_001.phpt:1.7
--- php-src/ext/spl/tests/spl_autoload_001.phpt:1.6 Wed Dec 20 22:08:51 2006
+++ php-src/ext/spl/tests/spl_autoload_001.phpt Mon Feb 4 14:02:01 2008
@@ -134,7 +134,7 @@
%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 @@
%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===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_005.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_005.phpt
diff -u php-src/ext/spl/tests/spl_autoload_005.phpt:1.2
php-src/ext/spl/tests/spl_autoload_005.phpt:1.3
--- php-src/ext/spl/tests/spl_autoload_005.phpt:1.2 Wed Dec 21 22:21:54 2005
+++ php-src/ext/spl/tests/spl_autoload_005.phpt Mon Feb 4 14:02:01 2008
@@ -50,7 +50,7 @@
===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
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_007.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_007.phpt
diff -u php-src/ext/spl/tests/spl_autoload_007.phpt:1.4
php-src/ext/spl/tests/spl_autoload_007.phpt:1.5
--- php-src/ext/spl/tests/spl_autoload_007.phpt:1.4 Wed Feb 22 12:15:09 2006
+++ php-src/ext/spl/tests/spl_autoload_007.phpt Mon Feb 4 14:02:01 2008
@@ -59,16 +59,16 @@
<?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 @@
[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 @@
[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 @@
[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 @@
[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 @@
[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 @@
===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 @@
[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 @@
[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 @@
[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 @@
[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 @@
[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]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_008.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_008.phpt
diff -u php-src/ext/spl/tests/spl_autoload_008.phpt:1.3
php-src/ext/spl/tests/spl_autoload_008.phpt:1.4
--- php-src/ext/spl/tests/spl_autoload_008.phpt:1.3 Mon Mar 27 13:53:19 2006
+++ php-src/ext/spl/tests/spl_autoload_008.phpt Mon Feb 4 14:02:01 2008
@@ -82,7 +82,7 @@
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 @@
[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 @@
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 @@
[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) {
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_004.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/spl_004.phpt
diff -u php-src/ext/spl/tests/spl_004.phpt:1.2
php-src/ext/spl/tests/spl_004.phpt:1.3
--- php-src/ext/spl/tests/spl_004.phpt:1.2 Fri Jul 21 20:11:24 2006
+++ php-src/ext/spl/tests/spl_004.phpt Mon Feb 4 14:02:01 2008
@@ -79,7 +79,7 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
