new test, exposes some memleaks, but not yet sure where they are (done for today)

diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt
new file mode 100644 (file)
index 0000000..d4a9843
--- /dev/null
+++ b/ext/phar/tests/tar/tar_003.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Phar: tar-based phar, valid 1
+--SKIPIF--
+<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
+--INI--
+phar.readonly=0
+--FILE--
+<?php
+include dirname(__FILE__) . '/tarmaker.php.inc';
+$fname = dirname(__FILE__) . '/tar_003.phar';
+$pname = 'phar://' . $fname;
+
+$a = new tarmaker($fname, 'none');
+$a->init();
+$a->addFile('tar_003.phpt', $g = fopen(__FILE__, 'r'));
+$a->addFile('internal/file/here', "hi there!\n");
+$a->mkDir('internal/dir');
+$a->mkDir('dir');
+$a->close();
+fclose($g);
+
+echo file_get_contents($pname . '/internal/file/here');
+$a = opendir($pname . '/');
+while (false !== ($v = readdir($a))) {
+       echo (is_file($pname . $v) ? "file\n" : "dir\n");
+       echo $v . "\n";
+}
+closedir($a);
+
+?>
+===DONE===
+--CLEAN--
+<?php
+@unlink(dirname(__FILE__) . '/tar_003.phar');
+?>
+--EXPECT--
+hi there!
+dir
+dir
+dir
+internal
+file
+tar_003.phpt
+===DONE===
\ No newline at end of file

diff --git a/ext/phar/tests/tar/tarmaker.php.inc b/ext/phar/tests/tar/tarmaker.php.inc
index 9b75d9be123d7daefb4e9a21c65d11b49d33229a..566f3bdcc122d82c186229d900a2a87459898481 100644 (file)
--- a/ext/phar/tests/tar/tarmaker.php.inc
+++ b/ext/phar/tests/tar/tarmaker.php.inc
@@ -38,19 +38,21 @@ class tarmaker
      * @param string relative path within the package
      * @param string|resource file contents or open file handle
      */
-    function addFile($path, $fileOrStream)
+    function addFile($path, $fileOrStream, $stat = null)
     {
         clearstatcache();
-        if (is_resource($fileOrStream)) {
-            $stat = fstat($fileOrStream);
-        } else {
-            $stat = array(
-                'mode' => 0x8000 + 0644,
-                'uid' => 0,
-                'gid' => 0,
-                'size' => strlen($fileOrStream),
-                'mtime' => time(),
-            );
+        if ($stat === null) {
+            if (is_resource($fileOrStream)) {
+                $stat = fstat($fileOrStream);
+            } else {
+                $stat = array(
+                    'mode' => 0x8000 + 0644,
+                    'uid' => 0,
+                    'gid' => 0,
+                    'size' => strlen($fileOrStream),
+                    'mtime' => time(),
+                );
+            }
         }
 
         $link = null;
@@ -143,11 +145,17 @@ class tarmaker
     /**
      * Create an internal directory, creating parent directories as needed
      * 
-     * This is a no-op for the tar creator
      * @param string $dir
      */
     function mkdir($dir)
     {
+        $this->addFile($dir, "", array(
+                    'mode' => 0x4000 + 0644,
+                    'uid' => 0,
+                    'gid' => 0,
+                    'size' => 0,
+                    'mtime' => time(),
+                ));
     }
 
     /**