minor re-factoring of phar_open_url to remove one nested brackets, put fopen edge cases in its own test, tweak test phar file names

1 files changed, 7 insertions, 6 deletions

diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt
index 1ca8639eae..2ee2cb5529 100644
--- a/ext/phar/tests/phar_dir_iterate.phpt
+++ b/ext/phar/tests/phar_dir_iterate.phpt
@@ -8,12 +8,13 @@ phar.readonly=0
 phar.require_hash=0
 --FILE--
 <?php
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 
-$phar = new Phar(dirname(__FILE__) . '/test.phar');
+$phar = new Phar($fname);
 $phar['top.txt'] = 'hi';
 $phar['sub/top.txt'] = 'there';
 $phar['another.file.txt'] = 'wowee';
-$newphar = new Phar(dirname(__FILE__) . '/test.phar');
+$newphar = new Phar($fname);
 foreach (new RecursiveIteratorIterator($newphar) as $path => $obj) {
 	var_dump($obj->getPathName());
 }
@@ -21,11 +22,11 @@ foreach (new RecursiveIteratorIterator($newphar) as $path => $obj) {
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/test.phar');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
-string(%d) "phar://%stest.phar%canother.file.txt"
-string(%d) "phar://%stest.phar%csub%ctop.txt"
-string(%d) "phar://%stest.phar%ctop.txt"
+string(%d) "phar://%sphar_dir_iterate.phar.php%canother.file.txt"
+string(%d) "phar://%sphar_dir_iterate.phar.php%csub%ctop.txt"
+string(%d) "phar://%sphar_dir_iterate.phar.php%ctop.txt"
 ===DONE===