From: Greg Beaver <cellog@php.net>
Date: Sun, 15 Feb 2009 21:43:39 +0000 (+0000)
Subject: fix the last remaining failing test (explicitly pass in SKIP_DOTS to directory iterator)
X-Git-Tag: RELEASE_1_3_5~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c6a25e7502a7ebc66518bfdeb63b02dbf6cc57c;p=php

fix the last remaining failing test (explicitly pass in SKIP_DOTS to directory iterator)
---

diff --git a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
index 083a14178b..6d6d56187e 100644
--- a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
@@ -4,6 +4,7 @@ Phar: copy-on-write test 6 [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite6.phar.php
 phar.readonly=0
+open_basedir=
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE_EXTERNAL--
@@ -24,4 +25,4 @@ array(2) {
 phar://%scopyonwrite6.phar.php%cfile1 file1
 phar://%scopyonwrite6.phar.php%cfile2 file2
 phar://%scopyonwrite6.phar.php%chi hi
-ok
\ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/files/write6.phar b/ext/phar/tests/cache_list/files/write6.phar
index 68a4a8674d..8aa92131e6 100644
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 4010b60779..39b1e8158c 100644
--- a/ext/phar/tests/cache_list/files/write6.phar.inc
+++ b/ext/phar/tests/cache_list/files/write6.phar.inc
@@ -10,7 +10,7 @@ $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),$d));
+var_dump($phar->buildFromIterator(new RecursiveDirectoryIterator($d, RecursiveDirectoryIterator::SKIP_DOTS),$d));
 $phar2 = new Phar(__FILE__);
 $arr = array();
 foreach ($phar2 as $name => $file) {