MFB: fix faulty logic in tests, needed to use ksort instead of asort and to sort...

diff --git a/ext/phar/tests/cache_list/files/write5.phar b/ext/phar/tests/cache_list/files/write5.phar
index b3a318b5a2e99d3c40b83b76130d1c4e5e5c100e..52635b41ac3fd7fdce6a056690d956a7ff4c052b 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/write5.phar and b/ext/phar/tests/cache_list/files/write5.phar differ

diff --git a/ext/phar/tests/cache_list/files/write5.phar.inc b/ext/phar/tests/cache_list/files/write5.phar.inc
index 04a4dfe18d7ecf278bc711fa0ecb41cb82160e55..5e7b9bb8862f08b161e47fe187eb2c3811bb0d5b 100644 (file)
--- a/ext/phar/tests/cache_list/files/write5.phar.inc
+++ b/ext/phar/tests/cache_list/files/write5.phar.inc
@@ -10,13 +10,15 @@ $d = dirname(__FILE__) . "/copyonwrite5";
 mkdir($d);
 file_put_contents($d . "/file1", "file1\n");
 file_put_contents($d . "/file2", "file2\n");
-var_dump($phar->buildFromDirectory($d));
+$arr = $phar->buildFromDirectory($d);
+ksort($arr);
+var_dump($arr);
 $phar2 = new Phar(__FILE__);
 $arr = array();
 foreach ($phar2 as $name => $file) {
        $arr[$name] = $file->getContent();
 }
-asort($arr);
+ksort($arr);
 foreach ($arr as $name => $content) {
        echo $name, " ", $content;
 }

diff --git a/ext/phar/tests/cache_list/files/write6.phar b/ext/phar/tests/cache_list/files/write6.phar
index 8aa92131e64199143352365b1c4f4e12f26a04b4..e3e4341c67917ab2f7ef03c663a24b71385049a9 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/write6.phar and b/ext/phar/tests/cache_list/files/write6.phar differ

diff --git a/ext/phar/tests/cache_list/files/write6.phar.inc b/ext/phar/tests/cache_list/files/write6.phar.inc
index 39b1e8158c7a3569fc0544fab3c4cf1bb1c2a7a6..3ba5db3c544d8d5410f43ea965e333980c25d6e1 100644 (file)
--- a/ext/phar/tests/cache_list/files/write6.phar.inc
+++ b/ext/phar/tests/cache_list/files/write6.phar.inc
@@ -10,13 +10,16 @@ $d = dirname(__FILE__) . "/copyonwrite6";
 mkdir($d);
 file_put_contents($d . "/file1", "file1\n");
 file_put_contents($d . "/file2", "file2\n");
-var_dump($phar->buildFromIterator(new RecursiveDirectoryIterator($d, RecursiveDirectoryIterator::SKIP_DOTS),$d));
+$arr = $phar->buildFromIterator(new RecursiveDirectoryIterator($d, RecursiveDirectoryIterator::SKIP_DOTS),$d);
+$arr = $phar->buildFromDirectory($d);
+ksort($arr);
+var_dump($arr);
 $phar2 = new Phar(__FILE__);
 $arr = array();
 foreach ($phar2 as $name => $file) {
        $arr[$name] = $file->getContent();
 }
-asort($arr);
+ksort($arr);
 foreach ($arr as $name => $content) {
        echo $name, " ", $content;
 }