Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
This commit is contained in:
Anatoliy Belsky 2012-03-28 12:56:17 +02:00
commit d406f2b034

View File

@ -40,25 +40,25 @@ string(14) "phar://*/a.php"
string(14) "phar://*/a.php"
string(0) ""
string(5) "a.php"
string(5) "a.php"
string(21) "phar_oo_test.phar.php"
string(16) "phar://*/b/c.php"
string(16) "phar://*/b/c.php"
string(1) "b"
string(7) "b/c.php"
string(5) "c.php"
string(1) "b"
string(16) "phar://*/b/d.php"
string(16) "phar://*/b/d.php"
string(1) "b"
string(7) "b/d.php"
string(5) "d.php"
string(1) "b"
string(14) "phar://*/b.php"
string(14) "phar://*/b.php"
string(0) ""
string(5) "b.php"
string(5) "b.php"
string(21) "phar_oo_test.phar.php"
string(14) "phar://*/e.php"
string(14) "phar://*/e.php"
string(0) ""
string(5) "e.php"
string(5) "e.php"
string(21) "phar_oo_test.phar.php"
===DONE===