diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-03-28 12:56:17 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-03-28 12:56:17 +0200 |
| commit | d406f2b034a3b41e94aaf7bea0535aca196853d7 (patch) | |
| tree | a299d7ff788b8a352da2a15495c003ef7a184c2d /ext/phar/tests | |
| parent | 4f23ee8f5ea03eb19ae8b79e044a9621e3e65bd4 (diff) | |
| parent | 0b20329aaf4228e071ab03f4e96adeafa6c48f52 (diff) | |
| download | php-git-d406f2b034a3b41e94aaf7bea0535aca196853d7.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
Diffstat (limited to 'ext/phar/tests')
| -rwxr-xr-x | ext/phar/tests/phar_oo_005.phpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt index 2d4cbd082c..cb3f298728 100755 --- a/ext/phar/tests/phar_oo_005.phpt +++ b/ext/phar/tests/phar_oo_005.phpt @@ -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=== |