andrei Fri Dec 12 23:59:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/standard/tests/array array_unique_error.phpt
array_unique_variation2.phpt
array_unique_variation6.phpt
array_unique_variation8.phpt
Log:
Fix tests, add NEWS entry.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.413&r2=1.2027.2.547.2.965.2.414&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.413
php-src/NEWS:1.2027.2.547.2.965.2.414
--- php-src/NEWS:1.2027.2.547.2.965.2.413 Fri Dec 12 23:21:22 2008
+++ php-src/NEWS Fri Dec 12 23:59:47 2008
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 200?, PHP 5.3.0 Alpha 4
+- Added optional sorting type flag parameter to array_unique(), default is
+ SORT_REGULAR. (Andrei)
- Changed opendir(), dir() and scandir() to use default context when no context
argument is passed. (Sara)
- Changed open_basedir to allow tightening in runtime contexts. (Sara)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unique_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_unique_error.phpt
diff -u php-src/ext/standard/tests/array/array_unique_error.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_unique_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_unique_error.phpt:1.1.2.2 Sun Dec
9 14:41:10 2007
+++ php-src/ext/standard/tests/array/array_unique_error.phpt Fri Dec 12
23:59:48 2008
@@ -17,7 +17,7 @@
echo "\n-- Testing array_unique() function with more than expected no. of
arguments --\n";
$input = array(1, 2);
$extra_arg = 10;
-var_dump( array_unique($input, $extra_arg) );
+var_dump( array_unique($input, SORT_NUMERIC, $extra_arg) );
echo "Done";
?>
@@ -26,11 +26,11 @@
-- Testing array_unique() function with zero arguments --
-Warning: array_unique() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: array_unique() expects at least 1 parameter, 0 given in %s on line %d
NULL
-- Testing array_unique() function with more than expected no. of arguments --
-Warning: array_unique() expects exactly 1 parameter, 2 given in %s on line %d
+Warning: array_unique() expects at most 2 parameters, 3 given in %s on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unique_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_unique_variation2.phpt
diff -u php-src/ext/standard/tests/array/array_unique_variation2.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_unique_variation2.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_unique_variation2.phpt:1.1.2.2
Sun Dec 9 14:41:10 2007
+++ php-src/ext/standard/tests/array/array_unique_variation2.phpt Fri Dec
12 23:59:48 2008
@@ -74,7 +74,7 @@
$iterator = 1;
foreach($inputs as $input) {
echo "-- Iteration $iterator --\n";
- var_dump( array_unique($input) );
+ var_dump( array_unique($input, SORT_STRING) );
$iterator++;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unique_variation6.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_unique_variation6.phpt
diff -u php-src/ext/standard/tests/array/array_unique_variation6.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_unique_variation6.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_unique_variation6.phpt:1.1.2.2
Sun Dec 9 14:41:10 2007
+++ php-src/ext/standard/tests/array/array_unique_variation6.phpt Fri Dec
12 23:59:48 2008
@@ -29,7 +29,7 @@
5 => $value4
);
-var_dump( array_unique($input) );
+var_dump( array_unique($input, SORT_STRING) );
echo "Done";
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unique_variation8.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_unique_variation8.phpt
diff -u php-src/ext/standard/tests/array/array_unique_variation8.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_unique_variation8.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_unique_variation8.phpt:1.1.2.2
Sun Dec 9 14:41:10 2007
+++ php-src/ext/standard/tests/array/array_unique_variation8.phpt Fri Dec
12 23:59:48 2008
@@ -22,7 +22,7 @@
array(1, 2, 3, 1)
);
-var_dump( array_unique($input) );
+var_dump( array_unique($input, SORT_STRING) );
echo "Done";
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
