colder Wed Jul 9 09:01:08 2008 UTC
Modified files:
/php-src/ext/phar/tests phar_oo_005.phpt refcount1.phpt
/php-src/ext/phar/tests/tar refcount1.phpt
/php-src/ext/phar/tests/zip refcount1.phpt
Log:
MFB: Fix filename/pathname/getpathinfo tests according to SPL fix
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_005.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/phar/tests/phar_oo_005.phpt
diff -u php-src/ext/phar/tests/phar_oo_005.phpt:1.9
php-src/ext/phar/tests/phar_oo_005.phpt:1.10
--- php-src/ext/phar/tests/phar_oo_005.phpt:1.9 Wed Feb 20 13:32:59 2008
+++ php-src/ext/phar/tests/phar_oo_005.phpt Wed Jul 9 09:01:07 2008
@@ -36,25 +36,25 @@
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===
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/refcount1.phpt?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/phar/tests/refcount1.phpt
diff -u php-src/ext/phar/tests/refcount1.phpt:1.11
php-src/ext/phar/tests/refcount1.phpt:1.12
--- php-src/ext/phar/tests/refcount1.phpt:1.11 Mon May 19 19:05:42 2008
+++ php-src/ext/phar/tests/refcount1.phpt Wed Jul 9 09:01:07 2008
@@ -43,9 +43,9 @@
===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 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/refcount1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/phar/tests/tar/refcount1.phpt
diff -u php-src/ext/phar/tests/tar/refcount1.phpt:1.3
php-src/ext/phar/tests/tar/refcount1.phpt:1.4
--- php-src/ext/phar/tests/tar/refcount1.phpt:1.3 Mon May 19 19:05:42 2008
+++ php-src/ext/phar/tests/tar/refcount1.phpt Wed Jul 9 09:01:08 2008
@@ -55,9 +55,9 @@
===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 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/refcount1.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/phar/tests/zip/refcount1.phpt
diff -u php-src/ext/phar/tests/zip/refcount1.phpt:1.7
php-src/ext/phar/tests/zip/refcount1.phpt:1.8
--- php-src/ext/phar/tests/zip/refcount1.phpt:1.7 Tue May 27 13:16:27 2008
+++ php-src/ext/phar/tests/zip/refcount1.phpt Wed Jul 9 09:01:08 2008
@@ -51,9 +51,9 @@
===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 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
