- fix tests

diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt
index 3025fb2bde1b1cfbd39f6425fefeb18c85193a2b..266070474603374ec7e417ddfefc8210337ba3f0 100644 (file)
--- a/ext/phar/tests/refcount1.phpt
+++ b/ext/phar/tests/refcount1.phpt
@@ -3,6 +3,7 @@ Phar: test that refcounting avoids problems with deleting a file
 --SKIPIF--
 <?php if (!extension_loaded("phar")) print "skip"; ?>
 <?php if (!extension_loaded("spl")) print "skip SPL not available"; ?>
+<?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or later"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
@@ -40,13 +41,21 @@ include $pname . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 ===CLOSE===
-object(PharFileInfo)#%d (0) {
+object(PharFileInfo)#%d (2) {
+  ["pathName":"SplFileInfo":private]=>
+  string(59) "phar://%srefcount1.phar.php/b"
+  ["fileName":"SplFileInfo":private]=>
+  string(65) "phar://%srefcount1.phar.php/b/c.php"
 }
 string(5) "extra"
 ===UNLINK===
 
-Warning: unlink(): phar error: "b/c.php" in phar "%sefcount1.phar.php", has open file pointers, cannot unlink in %sefcount1.php on line %d
-object(PharFileInfo)#%d (0) {
+Warning: unlink(): phar error: "b/c.php" in phar "%srefcount1.phar.php", has open file pointers, cannot unlink in %srefcount1.php on line %d
+object(PharFileInfo)#%d (2) {
+  ["pathName":"SplFileInfo":private]=>
+  string(59) "phar:///usr/src/PHP_5_3/ext/phar/tests/refcount1.phar.php/b"
+  ["fileName":"SplFileInfo":private]=>
+  string(65) "phar:///usr/src/PHP_5_3/ext/phar/tests/refcount1.phar.php/b/c.php"
 }
 string(5) "extra"
 extra

diff --git a/ext/phar/tests/refcount1_5_2.phpt b/ext/phar/tests/refcount1_5_2.phpt
new file mode 100755 (executable)
index 0000000..6f58cdb
--- /dev/null
+++ b/ext/phar/tests/refcount1_5_2.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Phar: test that refcounting avoids problems with deleting a file
+--SKIPIF--
+<?php if (!extension_loaded("phar")) print "skip"; ?>
+<?php if (!extension_loaded("spl")) print "skip SPL not available"; ?>
+<?php if (version_compare(PHP_VERSION, "5.2", ">")) die("skip requires 5.2 or earlier"); ?>
+--INI--
+phar.readonly=0
+phar.require_hash=0
+--FILE--
+<?php
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
+$pname = 'phar://' . $fname;
+$file = "<?php __HALT_COMPILER(); ?>";
+
+$files = array();
+$files['a.php'] = '<?php echo "This is a\n"; ?>';
+$files['b.php'] = '<?php echo "This is b\n"; ?>';
+$files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
+include 'phar_test.inc';
+
+$fp = fopen($pname . '/b/c.php', 'wb');
+fwrite($fp, "extra");
+fclose($fp);
+echo "===CLOSE===\n";
+$p = new Phar($fname);
+$b = fopen($pname . '/b/c.php', 'rb');
+$a = $p['b/c.php'];
+var_dump($a);
+var_dump(fread($b, 20));
+rewind($b);
+echo "===UNLINK===\n";
+unlink($pname . '/b/c.php');
+var_dump($a);
+var_dump(fread($b, 20));
+include $pname . '/b/c.php';
+?>
+
+===DONE===
+--CLEAN--
+<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
+--EXPECTF--
+===CLOSE===
+object(PharFileInfo)#%d (0) {
+}
+string(5) "extra"
+===UNLINK===
+
+Warning: unlink(): phar error: "b/c.php" in phar "%sefcount1.phar.php", has open file pointers, cannot unlink in %sefcount1.php on line %d
+object(PharFileInfo)#%d (0) {
+}
+string(5) "extra"
+extra
+===DONE===