more test coverage and fixes from increased coverage to opendir(). dir.phpt fails...

diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c
index aaca07a7cd2f27a7a3d83cd7652f5ac5fda42590..5da223ade1372bf9c41135bded9caf5ae8de6d16 100644 (file)
--- a/ext/phar/dirstream.c
+++ b/ext/phar/dirstream.c
@@ -297,6 +297,7 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, char *path, char
        uint host_len;
 
        if ((resource = phar_open_url(wrapper, path, mode, options TSRMLS_CC)) == NULL) {
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar url \"%s\" is unknown", path);
                return NULL;
        }
 
@@ -336,6 +337,8 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, char *path, char
                if (error) {
                        php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, error);
                        efree(error);
+               } else {
+                       php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar file \"%s\" is unknown", resource->host);
                }
                php_url_free(resource);
                return NULL;
@@ -510,7 +513,6 @@ int phar_wrapper_mkdir(php_stream_wrapper *wrapper, char *url_from, int mode, in
                php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot create directory \"%s\" in phar \"%s\", %s", entry.filename, phar->fname, error);
                zend_hash_del(&phar->manifest, entry.filename, entry.filename_len);
                efree(error);
-               efree(entry.filename);
                return FAILURE;
        }
        return SUCCESS;

diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index ca279ac87c291c687b259332d3e56b904f7097f2..be28f4d52968175f30b54002e23c72dd5ca366c8 100755 (executable)
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -50,6 +50,9 @@ echo "fwrite on dir handle\n";
 var_dump(fwrite($a, 'hi'));
 var_dump(fstat($a));
 closedir($a);
+echo "opendir edge cases\n";
+var_dump(opendir("phar://"));
+var_dump(opendir("phar://foo.phar/hi"));
 ?>
 ===DONE===
 --CLEAN--
@@ -79,4 +82,11 @@ int(1)
 fwrite on dir handle
 int(0)
 bool(false)
+opendir edge cases
+
+Warning: opendir(phar://): failed to open dir: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) in %s027.php on line %d
+bool(false)
+
+Warning: opendir(phar://foo.phar/hi): failed to open dir: phar url "phar://foo.phar/hi" is unknown in %s027.php on line %d
+bool(false)
 ===DONE===

diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt
index 7071fcb5d823c443920f05f304739e694ebfb912..233e28c6820d640a291874f773dafc54112313a7 100644 (file)
--- a/ext/phar/tests/dir.phpt
+++ b/ext/phar/tests/dir.phpt
@@ -28,12 +28,17 @@ clearstatcache();
 var_dump(file_exists($pname . '/another/dir/'));
 var_dump(file_exists($pname2 . '/test/'));
 var_dump(file_exists($pname3 . '/another/dir/'));
+ini_set('phar.readonly', 1);
+mkdir($pname . '/fails');
+ini_set('phar.readonly', 0);
+mkdir('phar://oops.phar/fails');
 ?>
+===DONE===
 --CLEAN--
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?>
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
@@ -41,3 +46,6 @@ bool(true)
 bool(false)
 bool(true)
 bool(false)
+
+Warning: mkdir(): phar error: cannot create directory "phar://%sdir.phar.php/fails", write operations disabled in %sdir.php on line %d
+===DONE===
\ No newline at end of file