sebs Sun Apr 26 23:54:12 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl/tests spl_classes.phpt
/php-src/ext/standard/tests/general_functions call_user_method.phpt
/php-src/ext/standard/tests/versioning
php_sapi_name_variation001.phpt
Log:
- fixes to tests
- spl_classes only checks for is_array(), the output in 5_3_0 and 5_2_0 is
very different,
test will run this way in 5.2 and 5.3 w.o. problems
- call user method recognizes the different errormessage in 5_2_0 now
- the php_sap_name_variation001 check now goes for cgi instead of the
cgi-fcgi output string
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_classes.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/spl/tests/spl_classes.phpt
diff -u php-src/ext/spl/tests/spl_classes.phpt:1.2.2.2
php-src/ext/spl/tests/spl_classes.phpt:1.2.2.3
--- php-src/ext/spl/tests/spl_classes.phpt:1.2.2.2 Sat Apr 25 19:06:58 2009
+++ php-src/ext/spl/tests/spl_classes.phpt Sun Apr 26 23:54:12 2009
@@ -6,118 +6,8 @@
Testfest 2009 Munich
--FILE--
<?php
-var_dump(spl_classes());
+var_dump(is_array(spl_classes()));
?>
--EXPECT--
-array(54) {
- ["AppendIterator"]=>
- string(14) "AppendIterator"
- ["ArrayIterator"]=>
- string(13) "ArrayIterator"
- ["ArrayObject"]=>
- string(11) "ArrayObject"
- ["BadFunctionCallException"]=>
- string(24) "BadFunctionCallException"
- ["BadMethodCallException"]=>
- string(22) "BadMethodCallException"
- ["CachingIterator"]=>
- string(15) "CachingIterator"
- ["Countable"]=>
- string(9) "Countable"
- ["DirectoryIterator"]=>
- string(17) "DirectoryIterator"
- ["DomainException"]=>
- string(15) "DomainException"
- ["EmptyIterator"]=>
- string(13) "EmptyIterator"
- ["FilesystemIterator"]=>
- string(18) "FilesystemIterator"
- ["FilterIterator"]=>
- string(14) "FilterIterator"
- ["GlobIterator"]=>
- string(12) "GlobIterator"
- ["InfiniteIterator"]=>
- string(16) "InfiniteIterator"
- ["InvalidArgumentException"]=>
- string(24) "InvalidArgumentException"
- ["IteratorIterator"]=>
- string(16) "IteratorIterator"
- ["LengthException"]=>
- string(15) "LengthException"
- ["LimitIterator"]=>
- string(13) "LimitIterator"
- ["LogicException"]=>
- string(14) "LogicException"
- ["MultipleIterator"]=>
- string(16) "MultipleIterator"
- ["NoRewindIterator"]=>
- string(16) "NoRewindIterator"
- ["OuterIterator"]=>
- string(13) "OuterIterator"
- ["OutOfBoundsException"]=>
- string(20) "OutOfBoundsException"
- ["OutOfRangeException"]=>
- string(19) "OutOfRangeException"
- ["OverflowException"]=>
- string(17) "OverflowException"
- ["ParentIterator"]=>
- string(14) "ParentIterator"
- ["RangeException"]=>
- string(14) "RangeException"
- ["RecursiveArrayIterator"]=>
- string(22) "RecursiveArrayIterator"
- ["RecursiveCachingIterator"]=>
- string(24) "RecursiveCachingIterator"
- ["RecursiveDirectoryIterator"]=>
- string(26) "RecursiveDirectoryIterator"
- ["RecursiveFilterIterator"]=>
- string(23) "RecursiveFilterIterator"
- ["RecursiveIterator"]=>
- string(17) "RecursiveIterator"
- ["RecursiveIteratorIterator"]=>
- string(25) "RecursiveIteratorIterator"
- ["RecursiveRegexIterator"]=>
- string(22) "RecursiveRegexIterator"
- ["RecursiveTreeIterator"]=>
- string(21) "RecursiveTreeIterator"
- ["RegexIterator"]=>
- string(13) "RegexIterator"
- ["RuntimeException"]=>
- string(16) "RuntimeException"
- ["SeekableIterator"]=>
- string(16) "SeekableIterator"
- ["SplDoublyLinkedList"]=>
- string(19) "SplDoublyLinkedList"
- ["SplFileInfo"]=>
- string(11) "SplFileInfo"
- ["SplFileObject"]=>
- string(13) "SplFileObject"
- ["SplFixedArray"]=>
- string(13) "SplFixedArray"
- ["SplHeap"]=>
- string(7) "SplHeap"
- ["SplMinHeap"]=>
- string(10) "SplMinHeap"
- ["SplMaxHeap"]=>
- string(10) "SplMaxHeap"
- ["SplObjectStorage"]=>
- string(16) "SplObjectStorage"
- ["SplObserver"]=>
- string(11) "SplObserver"
- ["SplPriorityQueue"]=>
- string(16) "SplPriorityQueue"
- ["SplQueue"]=>
- string(8) "SplQueue"
- ["SplStack"]=>
- string(8) "SplStack"
- ["SplSubject"]=>
- string(10) "SplSubject"
- ["SplTempFileObject"]=>
- string(17) "SplTempFileObject"
- ["UnderflowException"]=>
- string(18) "UnderflowException"
- ["UnexpectedValueException"]=>
- string(24) "UnexpectedValueException"
-}
-
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/call_user_method.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/general_functions/call_user_method.phpt
diff -u
php-src/ext/standard/tests/general_functions/call_user_method.phpt:1.1.4.2
php-src/ext/standard/tests/general_functions/call_user_method.phpt:1.1.4.3
--- php-src/ext/standard/tests/general_functions/call_user_method.phpt:1.1.4.2
Sat Apr 25 18:59:54 2009
+++ php-src/ext/standard/tests/general_functions/call_user_method.phpt Sun Apr
26 23:54:12 2009
@@ -16,5 +16,6 @@
var_dump($res);
?>
--EXPECTF--
-Deprecated: Function call_user_method() is deprecated in %s on line 8
+Strict Standards: Function call_user_method() is deprecated in %s
bool(true)
+
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt
diff -u
php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt:1.2.2.2
php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt:1.2.2.3
---
php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt:1.2.2.2
Sat Apr 25 18:29:23 2009
+++ php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt
Sun Apr 26 23:54:12 2009
@@ -11,4 +11,4 @@
echo php_sapi_name();
?>
--EXPECT--
-cgi-fcgi
+cgi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
