From 16f6918e0f698623d3de984e44c9ff5d281e2225 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 24 Mar 2008 18:33:54 +0000
Subject: [PATCH] Fixed test on systems where . and .. order not guaranteed

---
 ext/standard/tests/dir/rewinddir_basic.phpt | 32 +++++++++++++++------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/ext/standard/tests/dir/rewinddir_basic.phpt b/ext/standard/tests/dir/rewinddir_basic.phpt
index f7e3eb62db..e9c0278183 100644
--- a/ext/standard/tests/dir/rewinddir_basic.phpt
+++ b/ext/standard/tests/dir/rewinddir_basic.phpt
@@ -27,18 +27,24 @@ mkdir($dir_path2);
 var_dump($dh1 = opendir($dir_path1));
 var_dump($dh2 = opendir($dir_path2));
 
+$data = array();
 echo "\n-- Read and rewind first directory (argument supplied) --\n";
 while(FALSE !== $file1 = readdir($dh1)) {
-	var_dump($file1);
+	$data[] = $file1;
 }
+sort($data);
+var_dump($data);
 
 var_dump(rewinddir($dh1));
 var_dump(readdir($dh1));
 
+$data = array();
 echo "\n-- Read and rewind second directory (no argument supplied) --\n";
 while(FALSE !== $file2 = readdir()) {
-	var_dump($file2);
+	$data[] = $file2;
 }
+sort($data);
+var_dump($data);
 
 var_dump(rewinddir());
 var_dump(readdir());
@@ -63,16 +69,26 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 
 -- Read and rewind first directory (argument supplied) --
-string(1) "."
-string(2) ".."
-string(9) "file1.tmp"
+array(3) {
+  [0]=>
+  string(1) "."
+  [1]=>
+  string(2) ".."
+  [2]=>
+  string(9) "file1.tmp"
+}
 NULL
 string(1) "."
 
 -- Read and rewind second directory (no argument supplied) --
-string(1) "."
-string(2) ".."
-string(9) "file2.tmp"
+array(3) {
+  [0]=>
+  string(1) "."
+  [1]=>
+  string(2) ".."
+  [2]=>
+  string(9) "file2.tmp"
+}
 NULL
 string(1) "."
 ===DONE===
-- 
2.50.1