From: Christopher Jones <sixd@php.net>
Date: Fri, 15 May 2009 16:44:51 +0000 (+0000)
Subject: New array_multisort() test and code comment fix (Simon Westcott)
X-Git-Tag: php-5.4.0alpha1~191^2~3657
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79be235483fd72b26e20e0241ad6f49686791f0e;p=php

New array_multisort() test and code comment fix (Simon Westcott)
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index c14217f611..b34ea9ba44 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3979,7 +3979,7 @@ PHP_FUNCTION(array_multisort)
 		}
 	}
 
-	/* If all arrays are empty or have only one entry, we don't need to do anything. */
+	/* If all arrays are empty we don't need to do anything. */
 	if (array_size < 1) {
 		for (k = 0; k < MULTISORT_LAST; k++) {
 			efree(ARRAYG(multisort_flags)[k]);
diff --git a/ext/standard/tests/array/array_multisort_variation11.phpt b/ext/standard/tests/array/array_multisort_variation11.phpt
new file mode 100644
index 0000000000..520dd3d51a
--- /dev/null
+++ b/ext/standard/tests/array/array_multisort_variation11.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Test array_multisort() function : usage variation - testing with empty array
+--FILE--
+<?php
+/* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING]], ...])
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
+ * Source code: ext/standard/array.c
+ * Alias to functions:
+ */
+
+echo "*** Testing array_multisort() : Testing with empty array ***\n";
+
+var_dump(array_multisort(array()));
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+*** Testing array_multisort() : Testing with empty array ***
+bool(true)
+===DONE===