MFB: Fix filename/pathname/getpathinfo tests according to SPL fix

diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index 687cf59d070925f0ef79b625a4afb91fc0b51bd8..bdcee36d58d139be4a88e416f948a4fbb0fbbcd2 100755 (executable)
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -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===

diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt
index e147a3ee0df14be4f264e204a2289eb214deafcf..53ee567ca9f6e58c0c583bc97052c3ac69b6bbaa 100644 (file)
--- a/ext/phar/tests/refcount1.phpt
+++ b/ext/phar/tests/refcount1.phpt
@@ -43,9 +43,9 @@ include $pname . '/b/c.php';
 ===CLOSE===
 object(PharFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.php/b"
-  [u"fileName":u"SplFileInfo":private]=>
   string(%d) "phar://%srefcount1.phar.php/b/c.php"
+  [u"fileName":u"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) {
   [u"pathName":u"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.php/b"
+  string(%d) "phar://%srefcount1.phar.php/b/c.php"
   [u"fileName":u"SplFileInfo":private]=>
-  string(%s) "phar://%srefcount1.phar.php/b/c.php"
+  string(%s) "c.php"
 }
 string(5) "extra"
 extra

diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt
index 1c2c574c69ca9c92c8d86909ed12d7f546ea0221..235365b65bfc2d4a22b83c51fa7041ea80ef9268 100644 (file)
--- a/ext/phar/tests/tar/refcount1.phpt
+++ b/ext/phar/tests/tar/refcount1.phpt
@@ -55,9 +55,9 @@ include $alias . '/b/c.php';
 ===CLOSE===
 object(PharFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.tar/b"
-  [u"fileName":u"SplFileInfo":private]=>
   string(%d) "phar://%srefcount1.phar.tar/b/c.php"
+  [u"fileName":u"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) {
   [u"pathName":u"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.tar/b"
+  string(%d) "phar://%srefcount1.phar.tar/b/c.php"
   [u"fileName":u"SplFileInfo":private]=>
-  string(%s) "phar://%srefcount1.phar.tar/b/c.php"
+  string(%s) "c.php"
 }
 string(5) "extra"
 extra

diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt
index 6f2db37d5a78e2cdcfd8e0e5b9428e0b13dac205..6f05a328fe556b05860ef6cf4136df117b8e9fe0 100644 (file)
--- a/ext/phar/tests/zip/refcount1.phpt
+++ b/ext/phar/tests/zip/refcount1.phpt
@@ -51,9 +51,9 @@ include $alias . '/b/c.php';
 ===CLOSE===
 object(PharFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.zip/b"
-  [u"fileName":u"SplFileInfo":private]=>
   string(%d) "phar://%srefcount1.phar.zip/b/c.php"
+  [u"fileName":u"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) {
   [u"pathName":u"SplFileInfo":private]=>
-  string(%d) "phar://%srefcount1.phar.zip/b"
+  string(%d) "phar://%srefcount1.phar.zip/b/c.php"
   [u"fileName":u"SplFileInfo":private]=>
-  string(%s) "phar://%srefcount1.phar.zip/b/c.php"
+  string(%s) "c.php"
 }
 string(5) "extra"
 extra