diff options
Diffstat (limited to 'ext/phar/tests/zip')
60 files changed, 185 insertions, 185 deletions
diff --git a/ext/phar/tests/zip/033.phpt b/ext/phar/tests/zip/033.phpt index c980758a83..2935531987 100644 --- a/ext/phar/tests/zip/033.phpt +++ b/ext/phar/tests/zip/033.phpt @@ -8,8 +8,8 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; $alias = 'phar://hio'; $phar = new Phar($fname); @@ -41,8 +41,8 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); ?> --EXPECT-- bool(false) diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt index dc61148532..e9744b0e3c 100644 --- a/ext/phar/tests/zip/033a.phpt +++ b/ext/phar/tests/zip/033a.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://hio'; $phar = new Phar($fname); @@ -37,7 +37,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- bool(false) diff --git a/ext/phar/tests/zip/alias_acrobatics.phpt b/ext/phar/tests/zip/alias_acrobatics.phpt index 2a58e39efc..36fb9058a5 100644 --- a/ext/phar/tests/zip/alias_acrobatics.phpt +++ b/ext/phar/tests/zip/alias_acrobatics.phpt @@ -7,8 +7,8 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; $p = new Phar($fname); @@ -35,8 +35,8 @@ echo $e->getMessage(),"\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); ?> --EXPECTF-- alias "foo" is already used for archive "%salias_acrobatics.phar.zip" cannot be overloaded with "%salias_acrobatics.2.phar.zip" diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt index 1b9f832fb5..cd410be6c7 100644 --- a/ext/phar/tests/zip/all.phpt +++ b/ext/phar/tests/zip/all.phpt @@ -11,9 +11,9 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip.php'; $pname2 = 'phar://' . $fname2; $phar = new Phar($fname); @@ -44,8 +44,8 @@ var_dump($phar['a']->getMetadata()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); ?> --EXPECT-- bool(false) bool(false) diff --git a/ext/phar/tests/zip/badalias.phpt b/ext/phar/tests/zip/badalias.phpt index 0291c4b089..1ca964d1d6 100644 --- a/ext/phar/tests/zip/badalias.phpt +++ b/ext/phar/tests/zip/badalias.phpt @@ -6,7 +6,7 @@ Phar: invalid aliases <?php if (!extension_loaded("bz2")) die("skip no bz2"); ?> --FILE-- <?php -$e = dirname(__FILE__) . '/files/'; +$e = __DIR__ . '/files/'; for ($i = 1; $i <= 5; $i++) { try { new Phar($e . "badalias$i.phar.zip"); diff --git a/ext/phar/tests/zip/bug48791.phpt b/ext/phar/tests/zip/bug48791.phpt index 5ad1344bd7..b888838fe4 100644 --- a/ext/phar/tests/zip/bug48791.phpt +++ b/ext/phar/tests/zip/bug48791.phpt @@ -5,7 +5,7 @@ Phar: Bug #48791: open office documents always reported as corrupted by phar ext <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php -echo file_get_contents('phar://' . dirname(__FILE__) . '/files/test.odt/content.xml'), "\n"; +echo file_get_contents('phar://' . __DIR__ . '/files/test.odt/content.xml'), "\n"; ?> ===DONE=== --EXPECT-- diff --git a/ext/phar/tests/zip/corrupt_001.phpt b/ext/phar/tests/zip/corrupt_001.phpt index 000018aab6..66d1d62ec9 100644 --- a/ext/phar/tests/zip/corrupt_001.phpt +++ b/ext/phar/tests/zip/corrupt_001.phpt @@ -5,12 +5,12 @@ Phar: corrupted zip (count mismatch) --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/count1.zip'); + new PharData(__DIR__ . '/files/count1.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/count2.zip'); + new PharData(__DIR__ . '/files/count2.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_002.phpt b/ext/phar/tests/zip/corrupt_002.phpt index 345d1d81db..7aad946fa8 100644 --- a/ext/phar/tests/zip/corrupt_002.phpt +++ b/ext/phar/tests/zip/corrupt_002.phpt @@ -5,7 +5,7 @@ Phar: corrupted zip (no end of zip record) --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/nozipend.zip'); + new PharData(__DIR__ . '/files/nozipend.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_003.phpt b/ext/phar/tests/zip/corrupt_003.phpt index 40c5ff1877..e076a4eb8f 100644 --- a/ext/phar/tests/zip/corrupt_003.phpt +++ b/ext/phar/tests/zip/corrupt_003.phpt @@ -5,7 +5,7 @@ Phar: corrupted zip (truncated file comment) --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/filecomment.zip'); + new PharData(__DIR__ . '/files/filecomment.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_004.phpt b/ext/phar/tests/zip/corrupt_004.phpt index a36281151d..516fe31e5a 100644 --- a/ext/phar/tests/zip/corrupt_004.phpt +++ b/ext/phar/tests/zip/corrupt_004.phpt @@ -5,7 +5,7 @@ Phar: corrupted zip (central directory offset incorrect) --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/cdir_offset.zip'); + new PharData(__DIR__ . '/files/cdir_offset.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_005.phpt b/ext/phar/tests/zip/corrupt_005.phpt index e3e0d88849..00ac1f6b4e 100644 --- a/ext/phar/tests/zip/corrupt_005.phpt +++ b/ext/phar/tests/zip/corrupt_005.phpt @@ -5,7 +5,7 @@ Phar: encrypted zip --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/encrypted.zip'); + new PharData(__DIR__ . '/files/encrypted.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_006.phpt b/ext/phar/tests/zip/corrupt_006.phpt index dd7937850f..aca7bc572b 100644 --- a/ext/phar/tests/zip/corrupt_006.phpt +++ b/ext/phar/tests/zip/corrupt_006.phpt @@ -5,7 +5,7 @@ Phar: zip with file created from stdin --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/stdin.zip'); + new PharData(__DIR__ . '/files/stdin.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_007.phpt b/ext/phar/tests/zip/corrupt_007.phpt index 52a6c1e792..35efd5b489 100644 --- a/ext/phar/tests/zip/corrupt_007.phpt +++ b/ext/phar/tests/zip/corrupt_007.phpt @@ -5,7 +5,7 @@ Phar: corrupted zip (truncated filename record) --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/truncfilename.zip'); + new PharData(__DIR__ . '/files/truncfilename.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_008.phpt b/ext/phar/tests/zip/corrupt_008.phpt index eb706b7e55..7385b03183 100644 --- a/ext/phar/tests/zip/corrupt_008.phpt +++ b/ext/phar/tests/zip/corrupt_008.phpt @@ -5,77 +5,77 @@ Phar: unsupported compression methods --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/compress_unsup1.zip'); + new PharData(__DIR__ . '/files/compress_unsup1.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup2.zip'); + new PharData(__DIR__ . '/files/compress_unsup2.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup3.zip'); + new PharData(__DIR__ . '/files/compress_unsup3.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup4.zip'); + new PharData(__DIR__ . '/files/compress_unsup4.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup5.zip'); + new PharData(__DIR__ . '/files/compress_unsup5.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup6.zip'); + new PharData(__DIR__ . '/files/compress_unsup6.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup7.zip'); + new PharData(__DIR__ . '/files/compress_unsup7.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup9.zip'); + new PharData(__DIR__ . '/files/compress_unsup9.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup10.zip'); + new PharData(__DIR__ . '/files/compress_unsup10.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup14.zip'); + new PharData(__DIR__ . '/files/compress_unsup14.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup18.zip'); + new PharData(__DIR__ . '/files/compress_unsup18.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup19.zip'); + new PharData(__DIR__ . '/files/compress_unsup19.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup97.zip'); + new PharData(__DIR__ . '/files/compress_unsup97.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsup98.zip'); + new PharData(__DIR__ . '/files/compress_unsup98.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } try { - new PharData(dirname(__FILE__) . '/files/compress_unsupunknown.zip'); + new PharData(__DIR__ . '/files/compress_unsupunknown.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_009.phpt b/ext/phar/tests/zip/corrupt_009.phpt index 0ca80c00c1..ab7594ac30 100644 --- a/ext/phar/tests/zip/corrupt_009.phpt +++ b/ext/phar/tests/zip/corrupt_009.phpt @@ -5,7 +5,7 @@ Phar: corrupted zip (extra field way too long) --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/extralen_toolong.zip'); + new PharData(__DIR__ . '/files/extralen_toolong.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/corrupt_010.phpt b/ext/phar/tests/zip/corrupt_010.phpt index b95a03272a..4643cae070 100644 --- a/ext/phar/tests/zip/corrupt_010.phpt +++ b/ext/phar/tests/zip/corrupt_010.phpt @@ -5,7 +5,7 @@ Phar: unable to process zip (zip spanning multiple archives) --FILE-- <?php try { - new PharData(dirname(__FILE__) . '/files/disknumber.zip'); + new PharData(__DIR__ . '/files/disknumber.zip'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt index 3ff2346f67..302355794e 100644 --- a/ext/phar/tests/zip/create_new_and_modify.phpt +++ b/ext/phar/tests/zip/create_new_and_modify.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; $pname = 'phar://' . $fname; @unlink($fname); @@ -42,7 +42,7 @@ include $pname . '/b.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> --EXPECT-- bool(true) brand new! diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt index c0cb256925..d8a72c9d42 100644 --- a/ext/phar/tests/zip/create_new_phar_b.phpt +++ b/ext/phar/tests/zip/create_new_phar_b.phpt @@ -8,14 +8,14 @@ phar.require_hash=1 --FILE-- <?php -file_put_contents('phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php', +file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php', 'brand new!'); -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt index bd2ce5fffa..87536c9666 100644 --- a/ext/phar/tests/zip/delete.phpt +++ b/ext/phar/tests/zip/delete.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -24,7 +24,7 @@ $phar->delete('a'); echo file_get_contents($alias . '/a') . "\n"; ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- a diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt index b6f2dbb515..5c83202509 100644 --- a/ext/phar/tests/zip/delete_in_phar.phpt +++ b/ext/phar/tests/zip/delete_in_phar.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -40,7 +40,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/zip/delete_in_phar_b.phpt b/ext/phar/tests/zip/delete_in_phar_b.phpt index eb1a6cca6a..65f47e55ba 100644 --- a/ext/phar/tests/zip/delete_in_phar_b.phpt +++ b/ext/phar/tests/zip/delete_in_phar_b.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -33,7 +33,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt index 0080499177..262dabdbb3 100644 --- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -38,14 +38,14 @@ if ($md5 == $md52) echo 'file was not modified'; ?> ===AFTER=== <?php -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php'; -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip/b.php'; -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip/b/c.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/b.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/zip/dir.phpt b/ext/phar/tests/zip/dir.phpt index 3cbeacd1c1..eb252d27f6 100644 --- a/ext/phar/tests/zip/dir.phpt +++ b/ext/phar/tests/zip/dir.phpt @@ -7,11 +7,11 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php'; $pname2 = 'phar://' . $fname2; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.php'; $pname3 = 'phar://' . $fname3; $phar = new Phar($fname); var_dump($phar->isFileFormat(Phar::ZIP)); @@ -30,9 +30,9 @@ var_dump(file_exists($pname2 . '/test/')); var_dump(file_exists($pname3 . '/another/dir/')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> --EXPECT-- bool(true) bool(true) diff --git a/ext/phar/tests/zip/exists_as_phar.phpt b/ext/phar/tests/zip/exists_as_phar.phpt index ccb37e8187..2499e82312 100644 --- a/ext/phar/tests/zip/exists_as_phar.phpt +++ b/ext/phar/tests/zip/exists_as_phar.phpt @@ -8,8 +8,8 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$tname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$tname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://hio'; $phar = new Phar($fname); @@ -30,8 +30,8 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- phar zip error: phar "%sexists_as_phar.phar.zip" already exists as a regular phar and must be deleted from disk prior to creating as a zip-based phar diff --git a/ext/phar/tests/zip/getalias.phpt b/ext/phar/tests/zip/getalias.phpt index 4094e0cd99..2a2f5c19e6 100644 --- a/ext/phar/tests/zip/getalias.phpt +++ b/ext/phar/tests/zip/getalias.phpt @@ -7,14 +7,14 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; // sanity check with a virgin phar.zip $phar = new Phar($fname); var_dump($phar->getAlias()); unset($phar); -copy(dirname(__FILE__) . '/files/metadata.phar.zip', $fname); +copy(__DIR__ . '/files/metadata.phar.zip', $fname); // existing phar.zip, no alias set $phar = new Phar($fname); @@ -45,7 +45,7 @@ var_dump($phar->getAlias()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/largezip.phpt b/ext/phar/tests/zip/largezip.phpt index a8438eb7b7..78ee3d388e 100644 --- a/ext/phar/tests/zip/largezip.phpt +++ b/ext/phar/tests/zip/largezip.phpt @@ -7,8 +7,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip.php'; $pname = 'phar://' . $fname; $pname2 = 'phar://' . $fname2; @@ -22,8 +22,8 @@ var_dump(strlen($p2['big']->getContent())); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); ?> --EXPECT-- int(200000) ===DONE=== diff --git a/ext/phar/tests/zip/metadata_write_commit.phpt b/ext/phar/tests/zip/metadata_write_commit.phpt index 0de63401ce..d179b17a5c 100644 --- a/ext/phar/tests/zip/metadata_write_commit.phpt +++ b/ext/phar/tests/zip/metadata_write_commit.phpt @@ -9,8 +9,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; -$f2name = dirname(__FILE__) . '/files/metadata.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$f2name = __DIR__ . '/files/metadata.phar.zip'; $pname = 'phar://' . $fname; $p2name = 'phar://' . $f2name; @@ -55,7 +55,7 @@ var_dump($phar->getMetadata()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> --EXPECT-- string(1) "a" string(1) "b" diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt index d7b79b0cb4..ff30a0c162 100644 --- a/ext/phar/tests/zip/notphar.phpt +++ b/ext/phar/tests/zip/notphar.phpt @@ -8,16 +8,16 @@ detect_unicode=0 zend.multibyte=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $pname = 'phar://' . $fname; -copy(dirname(__FILE__) . '/files/zip.zip', $fname); +copy(__DIR__ . '/files/zip.zip', $fname); include $fname; ?> ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt index 20f9f112df..5ca6ac8df0 100644 --- a/ext/phar/tests/zip/odt.phpt +++ b/ext/phar/tests/zip/odt.phpt @@ -5,7 +5,7 @@ Phar: test a zip archive created by openoffice <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php -$a = new PharData(dirname(__FILE__) . '/files/odt.odt'); +$a = new PharData(__DIR__ . '/files/odt.odt'); foreach (new RecursiveIteratorIterator($a, RecursiveIteratorIterator::LEAVES_ONLY) as $b) { if ($b->isDir()) { echo "dir " . $b->getPathName() . "\n"; @@ -15,7 +15,7 @@ foreach (new RecursiveIteratorIterator($a, RecursiveIteratorIterator::LEAVES_ONL } // this next line is for increased code coverage try { - $b = new Phar(dirname(__FILE__) . '/files/odt.odt'); + $b = new Phar(__DIR__ . '/files/odt.odt'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/zip/open_for_write_existing.phpt b/ext/phar/tests/zip/open_for_write_existing.phpt index 94f85b4e3f..fd76d4174e 100644 --- a/ext/phar/tests/zip/open_for_write_existing.phpt +++ b/ext/phar/tests/zip/open_for_write_existing.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -33,7 +33,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECT-- extra ===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt index 9527583b19..9559b1740d 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -34,7 +34,7 @@ include $alias . '/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d bool(false) diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt index a115985ca3..2071aaeeef 100644 --- a/ext/phar/tests/zip/open_for_write_existing_c.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -34,7 +34,7 @@ include $alias . '/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d bool(false) diff --git a/ext/phar/tests/zip/open_for_write_newfile.phpt b/ext/phar/tests/zip/open_for_write_newfile.phpt index c3782d4fd3..10a69f0dde 100644 --- a/ext/phar/tests/zip/open_for_write_newfile.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -35,7 +35,7 @@ include $alias . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECT-- This is b/c extra diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt index 30e33293af..9e851be30a 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -37,7 +37,7 @@ include $alias . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d bool(false) diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt index 415547d5a1..bb46affc07 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -37,7 +37,7 @@ include $alias . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d bool(false) diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt index b9da14cd75..3adcc9c234 100644 --- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.readonly=0 --FILE-- <?php -$p = new Phar(dirname(__FILE__) . '/phar_begin_setstub_commit.phar.zip', 0, 'phar_begin_setstub_commit.phar'); +$p = new Phar(__DIR__ . '/phar_begin_setstub_commit.phar.zip', 0, 'phar_begin_setstub_commit.phar'); var_dump($p->isFileFormat(Phar::ZIP)); //var_dump($p->getStub()); var_dump($p->isBuffering()); @@ -30,12 +30,12 @@ include 'phar://phar_begin_setstub_commit.phar/b.php'; var_dump($p->getStub()); // add portion to test setting stub from resource -file_put_contents(dirname(__FILE__) . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>'); -$a = fopen(dirname(__FILE__) . '/myfakestub.php', 'rb'); +file_put_contents(__DIR__ . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>'); +$a = fopen(__DIR__ . '/myfakestub.php', 'rb'); $p->setStub($a); var_dump($p->getStub()); $c = strlen('<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>'); -file_put_contents(dirname(__FILE__) . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>' . 'extra stuff'); +file_put_contents(__DIR__ . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>' . 'extra stuff'); fseek($a, 0); $p->setStub($a, $c); var_dump($p->getStub()); @@ -44,8 +44,8 @@ fclose($a); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_begin_setstub_commit.phar.zip'); -unlink(dirname(__FILE__) . '/myfakestub.php'); +unlink(__DIR__ . '/phar_begin_setstub_commit.phar.zip'); +unlink(__DIR__ . '/myfakestub.php'); ?> --EXPECTF-- bool(true) diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt index 27cf41fc11..3f2b9f8355 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.zip'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.zip'); var_dump($phar->buildFromIterator(new myIterator(array('a' => basename(__FILE__, 'php') . 'phpt')))); var_dump($phar->isFileFormat(Phar::ZIP)); } catch (Exception $e) { @@ -48,7 +48,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); +unlink(__DIR__ . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt index 4aca17e6a3..abc9295ad2 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator5.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.zip'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.zip'); var_dump($phar->buildFromIterator(new myIterator(array('a' => new stdClass)))); } catch (Exception $e) { var_dump(get_class($e)); @@ -47,7 +47,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); +unlink(__DIR__ . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_buildfromiterator6.phpt b/ext/phar/tests/zip/phar_buildfromiterator6.phpt index 5eea92dd70..d478c92f07 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator6.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.zip'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.zip'); var_dump($phar->buildFromIterator(new myIterator(array(basename(__FILE__, 'php') . 'phpt')))); } catch (Exception $e) { var_dump(get_class($e)); @@ -47,7 +47,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); +unlink(__DIR__ . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_buildfromiterator7.phpt b/ext/phar/tests/zip/phar_buildfromiterator7.phpt index 85a801002d..06c039bb79 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator7.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.zip'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.zip'); var_dump($phar->buildFromIterator(new myIterator(array('a' => basename(__FILE__, 'php') . '/oopsie/there.phpt')))); } catch (Exception $e) { var_dump(get_class($e)); @@ -47,7 +47,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); +unlink(__DIR__ . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_buildfromiterator8.phpt b/ext/phar/tests/zip/phar_buildfromiterator8.phpt index 8c92edf1d7..17c23afa2e 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator8.phpt @@ -7,9 +7,9 @@ phar.readonly=0 --FILE-- <?php try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.zip'); - $a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^frontcontroller\d{0,2}\.phar\.phpt\\z|^\.\\z|^\.\.\\z/'), dirname(__FILE__) . DIRECTORY_SEPARATOR); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.zip'); + $a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^frontcontroller\d{0,2}\.phar\.phpt\\z|^\.\\z|^\.\.\\z/'), __DIR__ . DIRECTORY_SEPARATOR); asort($a); var_dump($a); var_dump($phar->isFileFormat(Phar::ZIP)); @@ -21,7 +21,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); +unlink(__DIR__ . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_buildfromiterator9.phpt b/ext/phar/tests/zip/phar_buildfromiterator9.phpt index f676783f7c..01bbb150fb 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator9.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar'); var_dump($phar->buildFromIterator(new myIterator(array('a' => $a = fopen(basename(__FILE__, 'php') . 'phpt', 'r'))))); fclose($a); } catch (Exception $e) { @@ -48,7 +48,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar'); +unlink(__DIR__ . '/buildfromiterator.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt index 163622e4dd..04fe255869 100644 --- a/ext/phar/tests/zip/phar_commitwrite.phpt +++ b/ext/phar/tests/zip/phar_commitwrite.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$p = new Phar(dirname(__FILE__) . '/phar_commitwrite.phar.zip', 0, 'phar_commitwrite.phar'); +$p = new Phar(__DIR__ . '/phar_commitwrite.phar.zip', 0, 'phar_commitwrite.phar'); $p['file1.txt'] = 'hi'; $p->stopBuffering(); var_dump($p->getStub()); @@ -25,7 +25,7 @@ var_dump($p->isFileFormat(Phar::ZIP)); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_commitwrite.phar.zip'); +unlink(__DIR__ . '/phar_commitwrite.phar.zip'); ?> --EXPECTF-- string(60) "<?php // zip-based phar archive stub file diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt index 5ae1aae222..494afd9583 100644 --- a/ext/phar/tests/zip/phar_convert_phar.phpt +++ b/ext/phar/tests/zip/phar_convert_phar.phpt @@ -8,9 +8,9 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.3.phar'; $phar = new Phar($fname); $phar['a.txt'] = 'some text'; @@ -38,10 +38,10 @@ var_dump(strlen($phar->getStub())); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/zip/phar_copy.phpt b/ext/phar/tests/zip/phar_copy.phpt index d4d00a1259..f6424936b7 100644 --- a/ext/phar/tests/zip/phar_copy.phpt +++ b/ext/phar/tests/zip/phar_copy.phpt @@ -8,8 +8,8 @@ phar.require_hash=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar.php'; $pname = 'phar://'.$fname; $iname = '/file.txt'; @@ -44,8 +44,8 @@ echo 'c: ' ,file_get_contents($p2['c']->getPathName()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.php'); ?> --EXPECTF-- hihibool(true) file "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s diff --git a/ext/phar/tests/zip/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt index 05b30fb74a..fd29f06347 100644 --- a/ext/phar/tests/zip/phar_magic.phpt +++ b/ext/phar/tests/zip/phar_magic.phpt @@ -9,12 +9,12 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; -$pname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$pname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; $p = new Phar($fname); var_dump($p->isFileFormat(Phar::ZIP)); $p['a'] = '<?php include "b/c.php";' . "\n"; -$p['b/c.php'] = '<?php echo "in b\n";$a = fopen("a", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";'; +$p['b/c.php'] = '<?php echo "in b\n";$a = fopen("a", "r", true);echo stream_get_contents($a);fclose($a);include __DIR__ . "/../d";'; $p['d'] = "in d\n"; $p->setStub('<?php var_dump(__FILE__); @@ -27,7 +27,7 @@ include $pname; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt index e66c2945a8..b2306bca61 100644 --- a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt @@ -7,8 +7,8 @@ Phar::compressFiles(Phar::BZ2) zip format phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $pname = 'phar://' . $fname; $pname2 = 'phar://' . $fname2; @@ -45,8 +45,8 @@ var_dump($c['a']->isCompressed(Phar::BZ2)); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/zip/phar_oo_compressallgz.phpt b/ext/phar/tests/zip/phar_oo_compressallgz.phpt index 1d995553ea..5daaed48ad 100644 --- a/ext/phar/tests/zip/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallgz.phpt @@ -7,7 +7,7 @@ Phar::compressFiles(Phar::GZ) zip format phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; $pname = 'phar://' . $fname; $phar = new Phar($fname); @@ -37,7 +37,7 @@ var_dump($phar['c']->isCompressed(Phar::GZ)); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/zip/phar_setalias.phpt b/ext/phar/tests/zip/phar_setalias.phpt index 1a39633863..cb60a068d6 100644 --- a/ext/phar/tests/zip/phar_setalias.phpt +++ b/ext/phar/tests/zip/phar_setalias.phpt @@ -10,9 +10,9 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar.zip'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '3.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar.zip'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '3.phar.zip'; $phar = new Phar($fname); $phar->setStub('<?php echo "first stub\n"; __HALT_COMPILER(); ?>'); @@ -49,9 +49,9 @@ echo $p3->getAlias(), "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '3.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '3.phar.zip'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/zip/phar_setalias2.phpt b/ext/phar/tests/zip/phar_setalias2.phpt index 255f069c2c..8b63551b04 100644 --- a/ext/phar/tests/zip/phar_setalias2.phpt +++ b/ext/phar/tests/zip/phar_setalias2.phpt @@ -8,7 +8,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $phar = new Phar($fname); $phar->setStub('<?php echo "first stub\n"; __HALT_COMPILER(); ?>'); @@ -29,7 +29,7 @@ echo $phar->getAlias() . "\n"; $phar->setAlias('test'); echo $phar->getAlias() . "\n"; $b = $phar; -$phar = new Phar(dirname(__FILE__) . '/notphar.phar'); +$phar = new Phar(__DIR__ . '/notphar.phar'); try { $phar->setAlias('test'); } catch (Exception $e) { @@ -39,7 +39,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_setdefaultstub.phpt b/ext/phar/tests/zip/phar_setdefaultstub.phpt index 28127e42a5..4851a90cae 100644 --- a/ext/phar/tests/zip/phar_setdefaultstub.phpt +++ b/ext/phar/tests/zip/phar_setdefaultstub.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $phar = new Phar($fname); $phar['a.php'] = '<php echo "this is a\n"; ?>'; @@ -56,7 +56,7 @@ var_dump($phar->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- string(51) "<?php echo "Hello World\n"; __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt index 7d3730c416..c3a5955c3f 100644 --- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt @@ -11,12 +11,12 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar.zip'; -$fname4 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.4.phar.zip'; -$fname5 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.5.phar.zip'; -$fname6 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.6.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.3.phar.zip'; +$fname4 = __DIR__ . '/' . basename(__FILE__, '.php') . '.4.phar.zip'; +$fname5 = __DIR__ . '/' . basename(__FILE__, '.php') . '.5.phar.zip'; +$fname6 = __DIR__ . '/' . basename(__FILE__, '.php') . '.6.phar.zip'; $p = new Phar($fname); $p['file1.txt'] = 'hi'; var_dump($p->getSignature()); @@ -49,7 +49,7 @@ var_dump($p->getSignature()); echo $e->getMessage(); } try { -$config = dirname(__FILE__) . '/../files/openssl.cnf'; +$config = __DIR__ . '/../files/openssl.cnf'; $config_arg = array('config' => $config); $keys=openssl_pkey_new($config_arg); openssl_pkey_export($keys, $privkey, NULL, $config_arg); @@ -67,13 +67,13 @@ echo $e->getMessage(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.4.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.5.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip.pubkey'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.4.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.5.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.6.phar.zip.pubkey'); ?> --EXPECTF-- array(2) { diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt index 49b97f24f0..197cf409a9 100644 --- a/ext/phar/tests/zip/phar_stub.phpt +++ b/ext/phar/tests/zip/phar_stub.phpt @@ -7,8 +7,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip.php'; -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip.php'; $pname = 'phar://' . $fname; $pname2 = 'phar://' . $fname2; @@ -28,7 +28,7 @@ $file = '<?php echo "second stub\n"; __HALT_COMPILER(); ?>'; $phar->setStub($file); echo $phar->getStub(); -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phartmp.php'; $file = '<?php echo "third stub\n"; __HALT_COMPILER(); ?>'; $fp = fopen($fname3, 'wb'); fwrite($fp, $file); @@ -60,9 +60,9 @@ echo $phar->getStub(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/zip/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt index ad168d6e82..4bab4c2870 100644 --- a/ext/phar/tests/zip/phar_stub_error.phpt +++ b/ext/phar/tests/zip/phar_stub_error.phpt @@ -8,7 +8,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $phar = new Phar($fname); $phar->setStub($stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>' . "\r\n"); @@ -38,7 +38,7 @@ var_dump($phar->getStub() == $stub); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt index 82a6f5218f..14fb3b228a 100644 --- a/ext/phar/tests/zip/refcount1.phpt +++ b/ext/phar/tests/zip/refcount1.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -44,7 +44,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- ===CLOSE=== object(PharFileInfo)#%d (2) { diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt index 10d73fd3d8..82e2850927 100644 --- a/ext/phar/tests/zip/rename.phpt +++ b/ext/phar/tests/zip/rename.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -26,7 +26,7 @@ echo file_get_contents($alias . '/b') . "\n"; echo file_get_contents($alias . '/a') . "\n"; ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- a a diff --git a/ext/phar/tests/zip/rename_dir.phpt b/ext/phar/tests/zip/rename_dir.phpt index 1885a7ce75..a65113c3cf 100644 --- a/ext/phar/tests/zip/rename_dir.phpt +++ b/ext/phar/tests/zip/rename_dir.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -26,7 +26,7 @@ echo file_get_contents($alias . '/b/x') . "\n"; echo file_get_contents($alias . '/a/x') . "\n"; ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- a a diff --git a/ext/phar/tests/zip/rmdir.phpt b/ext/phar/tests/zip/rmdir.phpt index c7ef9dacac..37cad748a3 100644 --- a/ext/phar/tests/zip/rmdir.phpt +++ b/ext/phar/tests/zip/rmdir.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -28,7 +28,7 @@ unlink($alias . '/a/x'); var_dump(rmdir($alias . '/a')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- a diff --git a/ext/phar/tests/zip/unixzip.phpt b/ext/phar/tests/zip/unixzip.phpt index d6cbe47898..371c34e0c7 100644 --- a/ext/phar/tests/zip/unixzip.phpt +++ b/ext/phar/tests/zip/unixzip.phpt @@ -4,7 +4,7 @@ Phar: test a zip archive created by unix "zip" command <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php -$a = new PharData(dirname(__FILE__) . '/files/zip.zip'); +$a = new PharData(__DIR__ . '/files/zip.zip'); foreach ($a as $b) { if ($b->isDir()) { echo "dir " . $b->getPathName() . "\n"; diff --git a/ext/phar/tests/zip/zlib.phpt b/ext/phar/tests/zip/zlib.phpt index bb3e012be2..1e66e99937 100644 --- a/ext/phar/tests/zip/zlib.phpt +++ b/ext/phar/tests/zip/zlib.phpt @@ -6,7 +6,7 @@ Phar: process zlib-compressed zip alias --FILE-- <?php try { - $a = new Phar(dirname(__FILE__) . '/files/zlib_alias.phar.zip'); + $a = new Phar(__DIR__ . '/files/zlib_alias.phar.zip'); var_dump($a->getAlias()); } catch (Exception $e) { echo $e->getMessage() . "\n"; |