cellog Sun Feb 15 21:43:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/cache_list copyonwrite6.phar.phpt
/php-src/ext/phar/tests/cache_list/files write6.phar
write6.phar.inc
Log:
fix the last remaining failing test (explicitly pass in SKIP_DOTS to
directory iterator)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
diff -u php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.1.2.1
php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.1.2.2
--- php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.1.2.1 Mon Oct
13 04:21:08 2008
+++ php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt Sun Feb 15
21:43:39 2009
@@ -4,6 +4,7 @@
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 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar.inc?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar.inc
diff -u php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.1
php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.2
--- php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.1 Mon Oct
13 04:21:09 2008
+++ php-src/ext/phar/tests/cache_list/files/write6.phar.inc Sun Feb 15
21:43:39 2009
@@ -10,7 +10,7 @@
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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
