[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests spl_004.phpt

2008-08-11 Thread Marcus Boerger 
helly   Mon Aug 11 17:30:37 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/tests  spl_004.phpt 
  Log:
  - MFH EXPECT rather than EXPECTF
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_004.phpt?r1=1.1.2.2.2.3r2=1.1.2.2.2.4diff_format=u
Index: php-src/ext/spl/tests/spl_004.phpt
diff -u php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.3 
php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.4
--- php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.3  Sat May 24 14:10:44 2008
+++ php-src/ext/spl/tests/spl_004.phpt  Mon Aug 11 17:30:37 2008
@@ -49,7 +49,7 @@
 ?
 ===DONE===
 ?php exit(0); ?
---EXPECTF--
+--EXPECT--
 int(0)
 int(1)
 int(2)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests spl_004.phpt spl_autoload_001.phpt spl_autoload_005.phpt spl_autoload_007.phpt spl_autoload_008.phpt

2008-02-01 Thread Felipe Pena 
felipe  Sat Feb  2 03:20:51 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/tests  spl_autoload_008.phpt spl_autoload_007.phpt 
spl_autoload_005.phpt spl_autoload_001.phpt 
spl_004.phpt 
  Log:
  Fix tests (new error message)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_008.phpt?r1=1.1.2.3r2=1.1.2.3.4.1diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_008.phpt
diff -u php-src/ext/spl/tests/spl_autoload_008.phpt:1.1.2.3 
php-src/ext/spl/tests/spl_autoload_008.phpt:1.1.2.3.4.1
--- php-src/ext/spl/tests/spl_autoload_008.phpt:1.1.2.3 Thu Mar 23 19:55:16 2006
+++ php-src/ext/spl/tests/spl_autoload_008.phpt Sat Feb  2 03:20:51 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) {
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_007.phpt?r1=1.1.2.2r2=1.1.2.2.4.1diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_007.phpt
diff -u php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2 
php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2.4.1
--- php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2 Wed Dec 21 22:22:33 2005
+++ php-src/ext/spl/tests/spl_autoload_007.phpt Sat Feb  2 03:20:51 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]=
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_005.phpt?r1=1.1.2.3r2=1.1.2.3.4.1diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_005.phpt
diff -u php-src/ext/spl/tests/spl_autoload_005.phpt:1.1.2.3 
php-src/ext/spl/tests/spl_autoload_005.phpt:1.1.2.3.4.1
--- php-src/ext/spl/tests/spl_autoload_005.phpt:1.1.2.3 Wed Dec 21 22:22:33 2005
+++ php-src/ext/spl/tests/spl_autoload_005.phpt Sat Feb  2 03:20:51 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_001.phpt?r1=1.3.2.2r2=1.3.2.2.4.1diff_format=u
Index: php-src/ext/spl/tests/spl_autoload_001.phpt
diff -u php-src/ext/spl/tests/spl_autoload_001.phpt:1.3.2.2 
php-src/ext/spl/tests/spl_autoload_001.phpt:1.3.2.2.4.1
--- php-src/ext/spl/tests/spl_autoload_001.phpt:1.3.2.2 Wed Dec 21 22:22:33 2005
+++ php-src/ext/spl/tests/spl_autoload_001.phpt Sat Feb  2 03:20:51 2008
@@