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 234d49111c3a8b3635ef124ee4630c428fcfb644..01325152b96874dac596186e0ac2a05a1f44d6d0 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) {
   ["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

diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt
index c6808afb63b8b498b98e3c5a321ba4a3c107bac7..bb87ad730914ce2437094f2214dad66d13436013 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) {
   ["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

diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt
index 6d7b7420c6eeb9f4ed75ee1074371e25f4f7b2b8..4fbe7ee1e100fed34884a00fb2f7981549a0fa99 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) {
   ["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