Index: ext/phar/tests/phar_oo_005.phpt
===================================================================
RCS file: /repository/php-src/ext/phar/tests/phar_oo_005.phpt,v
retrieving revision 1.9
diff -u -p -r1.9 phar_oo_005.phpt
--- ext/phar/tests/phar_oo_005.phpt	20 Feb 2008 13:32:59 -0000	1.9
+++ ext/phar/tests/phar_oo_005.phpt	9 Jul 2008 08:38:33 -0000
@@ -36,25 +36,25 @@ string(14) "phar://*/a.php"
 string(14) "phar://*/a.php"
 string(0) ""
 string(5) "a.php"
-string(21) "phar_oo_test.phar.php"
+string(5) "a.php"
 string(16) "phar://*/b/c.php"
 string(16) "phar://*/b/c.php"
 string(1) "b"
 string(7) "b/c.php"
-string(1) "b"
+string(5) "c.php"
 string(16) "phar://*/b/d.php"
 string(16) "phar://*/b/d.php"
 string(1) "b"
 string(7) "b/d.php"
-string(1) "b"
+string(5) "d.php"
 string(14) "phar://*/b.php"
 string(14) "phar://*/b.php"
 string(0) ""
 string(5) "b.php"
-string(21) "phar_oo_test.phar.php"
+string(5) "b.php"
 string(14) "phar://*/e.php"
 string(14) "phar://*/e.php"
 string(0) ""
 string(5) "e.php"
-string(21) "phar_oo_test.phar.php"
+string(5) "e.php"
 ===DONE===
Index: ext/phar/tests/refcount1.phpt
===================================================================
RCS file: /repository/php-src/ext/phar/tests/refcount1.phpt,v
retrieving revision 1.10
diff -u -p -r1.10 refcount1.phpt
--- ext/phar/tests/refcount1.phpt	20 Feb 2008 13:11:38 -0000	1.10
+++ ext/phar/tests/refcount1.phpt	9 Jul 2008 08:38:33 -0000
@@ -43,9 +43,9 @@ include $pname . '/b/c.php';
 ===CLOSE===
 object(PharFileInfo)#%d (2) {
   ["pathName":"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.php/b"
-  ["fileName":"SplFileInfo":private]=>
   string(%d) "phar://%srefcount1.phar.php/b/c.php"
+  ["fileName":"SplFileInfo":private]=>
+  string(%d) "c.php"
 }
 string(5) "extra"
 ===UNLINK===
@@ -53,9 +53,9 @@ string(5) "extra"
 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(%d) "phar://%srefcount1.phar.php/b"
+  string(%d) "phar://%srefcount1.phar.php/b/c.php"
   ["fileName":"SplFileInfo":private]=>
-  string(%s) "phar://%srefcount1.phar.php/b/c.php"
+  string(%s) "c.php"
 }
 string(5) "extra"
 extra
Index: ext/phar/tests/tar/refcount1.phpt
===================================================================
RCS file: /repository/php-src/ext/phar/tests/tar/refcount1.phpt,v
retrieving revision 1.2
diff -u -p -r1.2 refcount1.phpt
--- ext/phar/tests/tar/refcount1.phpt	12 Feb 2008 16:39:58 -0000	1.2
+++ ext/phar/tests/tar/refcount1.phpt	9 Jul 2008 08:38:34 -0000
@@ -55,9 +55,9 @@ include $alias . '/b/c.php';
 ===CLOSE===
 object(PharFileInfo)#%d (2) {
   ["pathName":"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.tar/b"
-  ["fileName":"SplFileInfo":private]=>
   string(%d) "phar://%srefcount1.phar.tar/b/c.php"
+  ["fileName":"SplFileInfo":private]=>
+  string(%d) "c.php"
 }
 string(5) "extra"
 ===UNLINK===
@@ -65,9 +65,9 @@ string(5) "extra"
 Warning: unlink(): phar error: "b/c.php" in phar "%srefcount1.phar.tar", has open file pointers, cannot unlink in %srefcount1.php on line %d
 object(PharFileInfo)#%d (2) {
   ["pathName":"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.tar/b"
+  string(%d) "phar://%srefcount1.phar.tar/b/c.php"
   ["fileName":"SplFileInfo":private]=>
-  string(%s) "phar://%srefcount1.phar.tar/b/c.php"
+  string(%s) "c.php"
 }
 string(5) "extra"
 extra
Index: ext/phar/tests/zip/refcount1.phpt
===================================================================
RCS file: /repository/php-src/ext/phar/tests/zip/refcount1.phpt,v
retrieving revision 1.3
diff -u -p -r1.3 refcount1.phpt
--- ext/phar/tests/zip/refcount1.phpt	11 Feb 2008 20:55:42 -0000	1.3
+++ ext/phar/tests/zip/refcount1.phpt	9 Jul 2008 08:38:34 -0000
@@ -51,9 +51,9 @@ include $alias . '/b/c.php';
 ===CLOSE===
 object(PharFileInfo)#%d (2) {
   ["pathName":"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.zip/b"
-  ["fileName":"SplFileInfo":private]=>
   string(%d) "phar://%srefcount1.phar.zip/b/c.php"
+  ["fileName":"SplFileInfo":private]=>
+  string(%d) "c.php"
 }
 string(5) "extra"
 ===UNLINK===
@@ -61,9 +61,9 @@ string(5) "extra"
 Warning: unlink(): phar error: "b/c.php" in phar "%srefcount1.phar.zip", has open file pointers, cannot unlink in %srefcount1.php on line %d
 object(PharFileInfo)#%d (2) {
   ["pathName":"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.zip/b"
+  string(%d) "phar://%srefcount1.phar.zip/b/c.php"
   ["fileName":"SplFileInfo":private]=>
-  string(%s) "phar://%srefcount1.phar.zip/b/c.php"
+  string(%s) "c.php"
 }
 string(5) "extra"
 extra