sfox Thu Jul 24 09:22:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_object.c
/php-src/ext/phar/tests cached_manifest_1.phpt mounteddir.phpt
phar_dir_iterate.phpt phar_extract.phpt
phar_extract2.phpt phar_extract3.phpt
phar_oo_002.phpt
/php-src/ext/phar/tests/zip odt.phpt unixzip.phpt
Log:
- Utilize new UNIX_PATHS flag in SPL
- Fix tests
@Jani: hold back on the bunny-killing, HEAD will be in sync later today
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.36&r2=1.266.2.37&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.36
php-src/ext/phar/phar_object.c:1.266.2.37
--- php-src/ext/phar/phar_object.c:1.266.2.36 Tue Jul 22 07:03:00 2008
+++ php-src/ext/phar/phar_object.c Thu Jul 24 09:22:35 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.36 2008/07/22 07:03:00 dmitry Exp $ */
+/* $Id: phar_object.c,v 1.266.2.37 2008/07/24 09:22:35 sfox Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -1057,7 +1057,7 @@
#else
char *fname, *alias = NULL, *error, *arch = NULL, *entry = NULL,
*save_fname;
int fname_len, alias_len = 0, arch_len, entry_len, is_data;
- long flags = SPL_FILE_DIR_SKIPDOTS, format = 0;
+ long flags = SPL_FILE_DIR_SKIPDOTS|SPL_FILE_DIR_UNIXPATHS, format = 0;
phar_archive_object *phar_obj;
phar_archive_data *phar_data;
zval *zobj = getThis(), arg1, arg2;
@@ -1601,7 +1601,7 @@
INIT_PZVAL(&arg);
ZVAL_STRINGL(&arg, dir, dir_len, 0);
INIT_PZVAL(&arg2);
- ZVAL_LONG(&arg2, SPL_FILE_DIR_SKIPDOTS);
+ ZVAL_LONG(&arg2, SPL_FILE_DIR_SKIPDOTS|SPL_FILE_DIR_UNIXPATHS);
zend_call_method_with_2_params(&iter,
spl_ce_RecursiveDirectoryIterator,
&spl_ce_RecursiveDirectoryIterator->constructor,
"__construct", NULL, &arg, &arg2);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cached_manifest_1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/phar/tests/cached_manifest_1.phpt
diff -u php-src/ext/phar/tests/cached_manifest_1.phpt:1.1.2.2
php-src/ext/phar/tests/cached_manifest_1.phpt:1.1.2.3
--- php-src/ext/phar/tests/cached_manifest_1.phpt:1.1.2.2 Wed Jun 18
15:06:50 2008
+++ php-src/ext/phar/tests/cached_manifest_1.phpt Thu Jul 24 09:22:35 2008
@@ -26,10 +26,10 @@
string(1) "d"
string(9) "index.php"
string(7) "web.php"
-string(%d) "phar://%snophar.phar%cb%cc.php"
-string(%d) "phar://%snophar.phar%cd"
-string(%d) "phar://%snophar.phar%cindex.php"
-string(%d) "phar://%snophar.phar%cweb.php"
+string(%d) "phar://%snophar.phar/b/c.php"
+string(%d) "phar://%snophar.phar/d"
+string(%d) "phar://%snophar.phar/index.php"
+string(%d) "phar://%snophar.phar/web.php"
bool(true)
bool(false)
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/mounteddir.phpt?r1=1.5.2.1&r2=1.5.2.2&diff_format=u
Index: php-src/ext/phar/tests/mounteddir.phpt
diff -u php-src/ext/phar/tests/mounteddir.phpt:1.5.2.1
php-src/ext/phar/tests/mounteddir.phpt:1.5.2.2
--- php-src/ext/phar/tests/mounteddir.phpt:1.5.2.1 Thu May 15 16:09:01 2008
+++ php-src/ext/phar/tests/mounteddir.phpt Thu Jul 24 09:22:35 2008
@@ -105,9 +105,9 @@
directory
extfile.php
extfile2.php
-phar://%stempmanifest1.phar.php/testit%cdirectory
-phar://%stempmanifest1.phar.php/testit%cextfile.php
-phar://%stempmanifest1.phar.php/testit%cextfile2.php
+phar://%stempmanifest1.phar.php/testit/directory
+phar://%stempmanifest1.phar.php/testit/extfile.php
+phar://%stempmanifest1.phar.php/testit/extfile2.php
Mounting of /testit to another\..\mistake within phar %stempmanifest1.phar.php
failed
Mounting of /notfound to %stests/this/does/not/exist within phar
%stempmanifest1.phar.php failed
Mounting of /testit to %stests within phar %stests/tempmanifest1.phar.php
failed
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_dir_iterate.phpt?r1=1.4&r2=1.4.2.1&diff_format=u
Index: php-src/ext/phar/tests/phar_dir_iterate.phpt
diff -u php-src/ext/phar/tests/phar_dir_iterate.phpt:1.4
php-src/ext/phar/tests/phar_dir_iterate.phpt:1.4.2.1
--- php-src/ext/phar/tests/phar_dir_iterate.phpt:1.4 Mon Apr 14 17:18:57 2008
+++ php-src/ext/phar/tests/phar_dir_iterate.phpt Thu Jul 24 09:22:35 2008
@@ -26,7 +26,7 @@
__halt_compiler();
?>
--EXPECTF--
-string(%d) "phar://%sphar_dir_iterate.phar.php%canother.file.txt"
-string(%d) "phar://%sphar_dir_iterate.phar.php%csub%ctop.txt"
-string(%d) "phar://%sphar_dir_iterate.phar.php%ctop.txt"
+string(%d) "phar://%sphar_dir_iterate.phar.php/another.file.txt"
+string(%d) "phar://%sphar_dir_iterate.phar.php/sub/top.txt"
+string(%d) "phar://%sphar_dir_iterate.phar.php/top.txt"
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_extract.phpt?r1=1.7.2.1&r2=1.7.2.2&diff_format=u
Index: php-src/ext/phar/tests/phar_extract.phpt
diff -u php-src/ext/phar/tests/phar_extract.phpt:1.7.2.1
php-src/ext/phar/tests/phar_extract.phpt:1.7.2.2
--- php-src/ext/phar/tests/phar_extract.phpt:1.7.2.1 Tue Jun 24 01:11:27 2008
+++ php-src/ext/phar/tests/phar_extract.phpt Thu Jul 24 09:22:35 2008
@@ -19,7 +19,7 @@
$a->extractTo(dirname(__FILE__) . '/extract', 'mount');
$a->extractTo(dirname(__FILE__) . '/extract');
$out = array();
-foreach (new RecursiveIteratorIterator(new
RecursiveDirectoryIterator(dirname(__FILE__) . '/extract', 0x00001000),
RecursiveIteratorIterator::CHILD_FIRST) as $p => $b) {
+foreach (new RecursiveIteratorIterator(new
RecursiveDirectoryIterator(dirname(__FILE__) . '/extract', 0x00003000),
RecursiveIteratorIterator::CHILD_FIRST) as $p => $b) {
$out[] = $p;
}
sort($out);
@@ -107,12 +107,12 @@
@rmdir($e);
?>
--EXPECTF--
-%sextract%cfile1.txt
-%sextract%cfile2.txt
-%sextract%cone
-%sextract%csubdir
-%sextract%csubdir%cectory
-%sextract%csubdir%cectory%cfile.txt
+%sextract/file1.txt
+%sextract/file2.txt
+%sextract/one
+%sextract/subdir
+%sextract/subdir/ectory
+%sextract/subdir/ectory/file.txt
string(2) "hi"
string(3) "hi3"
string(3) "hi2"
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_extract2.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/phar/tests/phar_extract2.phpt
diff -u php-src/ext/phar/tests/phar_extract2.phpt:1.1.2.4
php-src/ext/phar/tests/phar_extract2.phpt:1.1.2.5
--- php-src/ext/phar/tests/phar_extract2.phpt:1.1.2.4 Tue Jun 24 01:11:27 2008
+++ php-src/ext/phar/tests/phar_extract2.phpt Thu Jul 24 09:22:35 2008
@@ -23,7 +23,7 @@
$phar->extractTo(dirname(__FILE__) . '/extract');
$out = array();
-foreach (new RecursiveIteratorIterator(new
RecursiveDirectoryIterator(dirname(__FILE__) . '/extract', 0x00001000),
RecursiveIteratorIterator::CHILD_FIRST) as $path => $file) {
+foreach (new RecursiveIteratorIterator(new
RecursiveDirectoryIterator(dirname(__FILE__) . '/extract', 0x00003000),
RecursiveIteratorIterator::CHILD_FIRST) as $path => $file) {
$extracted[] = $path;
}
@@ -51,10 +51,10 @@
@rmdir($dir);
?>
--EXPECTF--
-%sextract%cfile1.txt
-%sextract%cfile2.txt
-%sextract%cone
-%sextract%csubdir
-%sextract%csubdir%cectory
-%sextract%csubdir%cectory%cfile.txt
+%sextract/file1.txt
+%sextract/file2.txt
+%sextract/one
+%sextract/subdir
+%sextract/subdir/ectory
+%sextract/subdir/ectory/file.txt
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_extract3.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/phar/tests/phar_extract3.phpt
diff -u php-src/ext/phar/tests/phar_extract3.phpt:1.1.2.1
php-src/ext/phar/tests/phar_extract3.phpt:1.1.2.2
--- php-src/ext/phar/tests/phar_extract3.phpt:1.1.2.1 Mon Jul 7 01:09:21 2008
+++ php-src/ext/phar/tests/phar_extract3.phpt Thu Jul 24 09:22:35 2008
@@ -41,6 +41,6 @@
?>
--EXPECTF--
Invalid argument, %sfiles/bogus.zip cannot be found
-phar://%sfiles/notbogus.zip%cnonsense.txt
-phar://%sfiles/notbogus.zip%cstuff.txt
+phar://%sfiles/notbogus.zip/nonsense.txt
+phar://%sfiles/notbogus.zip/stuff.txt
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_002.phpt?r1=1.9.2.1&r2=1.9.2.2&diff_format=u
Index: php-src/ext/phar/tests/phar_oo_002.phpt
diff -u php-src/ext/phar/tests/phar_oo_002.phpt:1.9.2.1
php-src/ext/phar/tests/phar_oo_002.phpt:1.9.2.2
--- php-src/ext/phar/tests/phar_oo_002.phpt:1.9.2.1 Tue May 13 18:06:34 2008
+++ php-src/ext/phar/tests/phar_oo_002.phpt Thu Jul 24 09:22:35 2008
@@ -51,7 +51,7 @@
__halt_compiler();
?>
--EXPECTF--
-string(42) "phar://*/files/phar_oo_test.phar.php%ca.php"
+string(42) "phar://*/files/phar_oo_test.phar.php/a.php"
string(5) "a.php"
int(32)
string(4) "file"
@@ -64,7 +64,7 @@
int(%d)
int(%d)
int(%d)
-string(38) "phar://*/files/phar_oo_test.phar.php%cb"
+string(38) "phar://*/files/phar_oo_test.phar.php/b"
string(1) "b"
int(0)
string(3) "dir"
@@ -77,7 +77,7 @@
int(%d)
int(%d)
int(%d)
-string(42) "phar://*/files/phar_oo_test.phar.php%cb.php"
+string(42) "phar://*/files/phar_oo_test.phar.php/b.php"
string(5) "b.php"
int(32)
string(4) "file"
@@ -90,7 +90,7 @@
int(%d)
int(%d)
int(%d)
-string(42) "phar://*/files/phar_oo_test.phar.php%ce.php"
+string(42) "phar://*/files/phar_oo_test.phar.php/e.php"
string(5) "e.php"
int(32)
string(4) "file"
@@ -104,31 +104,31 @@
int(%d)
int(%d)
==RECURSIVE==
-string(42) "phar://*/files/phar_oo_test.phar.php%ca.php"
+string(42) "phar://*/files/phar_oo_test.phar.php/a.php"
string(5) "a.php"
int(32)
bool(false)
NULL
int(0)
-string(44) "phar://*/files/phar_oo_test.phar.php%cb%cc.php"
+string(44) "phar://*/files/phar_oo_test.phar.php/b/c.php"
string(5) "c.php"
int(34)
bool(false)
NULL
int(0)
-string(44) "phar://*/files/phar_oo_test.phar.php%cb%cd.php"
+string(44) "phar://*/files/phar_oo_test.phar.php/b/d.php"
string(5) "d.php"
int(34)
bool(false)
NULL
int(0)
-string(42) "phar://*/files/phar_oo_test.phar.php%cb.php"
+string(42) "phar://*/files/phar_oo_test.phar.php/b.php"
string(5) "b.php"
int(32)
bool(false)
NULL
int(0)
-string(42) "phar://*/files/phar_oo_test.phar.php%ce.php"
+string(42) "phar://*/files/phar_oo_test.phar.php/e.php"
string(5) "e.php"
int(32)
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/odt.phpt?r1=1.2.2.1&r2=1.2.2.2&diff_format=u
Index: php-src/ext/phar/tests/zip/odt.phpt
diff -u php-src/ext/phar/tests/zip/odt.phpt:1.2.2.1
php-src/ext/phar/tests/zip/odt.phpt:1.2.2.2
--- php-src/ext/phar/tests/zip/odt.phpt:1.2.2.1 Tue May 13 14:49:06 2008
+++ php-src/ext/phar/tests/zip/odt.phpt Thu Jul 24 09:22:35 2008
@@ -23,13 +23,13 @@
?>
===DONE===
--EXPECTF--
-phar://%sodt.odt%cConfigurations2%caccelerator%ccurrent.xml
-phar://%sodt.odt%cMETA-INF%cmanifest.xml
-phar://%sodt.odt%cThumbnails%cthumbnail.png
-phar://%sodt.odt%ccontent.xml
-phar://%sodt.odt%cmeta.xml
-phar://%sodt.odt%cmimetype
-phar://%sodt.odt%csettings.xml
-phar://%sodt.odt%cstyles.xml
+phar://%sodt.odt/Configurations2/accelerator/current.xml
+phar://%sodt.odt/META-INF/manifest.xml
+phar://%sodt.odt/Thumbnails/thumbnail.png
+phar://%sodt.odt/content.xml
+phar://%sodt.odt/meta.xml
+phar://%sodt.odt/mimetype
+phar://%sodt.odt/settings.xml
+phar://%sodt.odt/styles.xml
Cannot create phar '%sodt.odt', file extension (or combination) not recognised
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/unixzip.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/phar/tests/zip/unixzip.phpt
diff -u php-src/ext/phar/tests/zip/unixzip.phpt:1.2.2.3
php-src/ext/phar/tests/zip/unixzip.phpt:1.2.2.4
--- php-src/ext/phar/tests/zip/unixzip.phpt:1.2.2.3 Wed Jun 18 16:48:18 2008
+++ php-src/ext/phar/tests/zip/unixzip.phpt Thu Jul 24 09:22:35 2008
@@ -20,10 +20,10 @@
?>
===DONE===
--EXPECTF--
-dir phar://%s/zip.zip%cempty
-phar://%s/zip.zip%chi.txt
+dir phar://%s/zip.zip/empty
+phar://%s/zip.zip/hi.txt
hi there
-dir phar://%s/zip.zip%cnotempty
+dir phar://%s/zip.zip/notempty
phar://%s/zip.zip/notempty/hi.txt
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
