rasmus Sat Feb 2 01:01:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array array_filter.phpt
Log:
Fix test and convert to UNIX line endings
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_filter.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_filter.phpt
diff -u php-src/ext/standard/tests/array/array_filter.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/array/array_filter.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/array/array_filter.phpt:1.1.2.2.2.1 Fri Nov
2 19:41:11 2007
+++ php-src/ext/standard/tests/array/array_filter.phpt Sat Feb 2 01:01:04 2008
@@ -1,93 +1,93 @@
---TEST--
-basic array_filter test
---FILE--
-<?php
-function odd($var)
-{
- return($var & 1);
-}
-
-function even($var)
-{
- return(!($var & 1));
-}
-
-$array1 = array("a"=>1, "b"=>2, "c"=>3, "d"=>4, "e"=>5);
-$array2 = array(6, 7, 8, 9, 10, 11, 12, 0);
-$array3 = array(TRUE, FALSE, NULL);
-
-echo "Odd :\n";
-var_dump(array_filter($array1, "odd"));
-var_dump(array_filter($array2, "odd"));
-var_dump(array_filter($array3, "odd"));
-echo "Even:\n";
-var_dump(array_filter($array1, "even"));
-var_dump(array_filter($array2, "even"));
-var_dump(array_filter($array3, "even"));
-
-var_dump(array_filter(array()));
-var_dump(array_filter(array(), array()));
-var_dump(array_filter("", null));
-var_dump(array_filter($array1, 1));
-
-echo '== DONE ==';
-?>
---EXPECTF--
-Odd :
-array(3) {
- ["a"]=>
- int(1)
- ["c"]=>
- int(3)
- ["e"]=>
- int(5)
-}
-array(3) {
- [1]=>
- int(7)
- [3]=>
- int(9)
- [5]=>
- int(11)
-}
-array(1) {
- [0]=>
- bool(true)
-}
-Even:
-array(2) {
- ["b"]=>
- int(2)
- ["d"]=>
- int(4)
-}
-array(5) {
- [0]=>
- int(6)
- [2]=>
- int(8)
- [4]=>
- int(10)
- [6]=>
- int(12)
- [7]=>
- int(0)
-}
-array(2) {
- [1]=>
- bool(false)
- [2]=>
- NULL
-}
-array(0) {
-}
-
-Warning: array_filter() expects parameter 2 to be valid callback, array given
in %s on line %d
-NULL
-
-Warning: array_filter() expects parameter 1 to be array, string given in %s on
line %d
-NULL
-
-Warning: array_filter() expects parameter 2 to be valid callback, integer
given in %s on line %d
-NULL
-== DONE ==
+--TEST--
+basic array_filter test
+--FILE--
+<?php
+function odd($var)
+{
+ return($var & 1);
+}
+
+function even($var)
+{
+ return(!($var & 1));
+}
+
+$array1 = array("a"=>1, "b"=>2, "c"=>3, "d"=>4, "e"=>5);
+$array2 = array(6, 7, 8, 9, 10, 11, 12, 0);
+$array3 = array(TRUE, FALSE, NULL);
+
+echo "Odd :\n";
+var_dump(array_filter($array1, "odd"));
+var_dump(array_filter($array2, "odd"));
+var_dump(array_filter($array3, "odd"));
+echo "Even:\n";
+var_dump(array_filter($array1, "even"));
+var_dump(array_filter($array2, "even"));
+var_dump(array_filter($array3, "even"));
+
+var_dump(array_filter(array()));
+var_dump(array_filter(array(), array()));
+var_dump(array_filter("", null));
+var_dump(array_filter($array1, 1));
+
+echo '== DONE ==';
+?>
+--EXPECTF--
+Odd :
+array(3) {
+ ["a"]=>
+ int(1)
+ ["c"]=>
+ int(3)
+ ["e"]=>
+ int(5)
+}
+array(3) {
+ [1]=>
+ int(7)
+ [3]=>
+ int(9)
+ [5]=>
+ int(11)
+}
+array(1) {
+ [0]=>
+ bool(true)
+}
+Even:
+array(2) {
+ ["b"]=>
+ int(2)
+ ["d"]=>
+ int(4)
+}
+array(5) {
+ [0]=>
+ int(6)
+ [2]=>
+ int(8)
+ [4]=>
+ int(10)
+ [6]=>
+ int(12)
+ [7]=>
+ int(0)
+}
+array(2) {
+ [1]=>
+ bool(false)
+ [2]=>
+ NULL
+}
+array(0) {
+}
+
+Warning: array_filter() expects parameter 2 to be a valid callback, array must
have exactly two members in %s on line %d
+NULL
+
+Warning: array_filter() expects parameter 1 to be array, string given in %s on
line %d
+NULL
+
+Warning: array_filter() expects parameter 2 to be a valid callback, no array
or string given in %s on line %d
+NULL
+== DONE ==
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
