diff options
Diffstat (limited to 'ext/phar/tests/tar')
68 files changed, 230 insertions, 230 deletions
diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt index b1cbef2acd..f07dd7f48a 100644 --- a/ext/phar/tests/tar/033.phpt +++ b/ext/phar/tests/tar/033.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://hio'; $phar = new Phar($fname); @@ -37,7 +37,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECT-- bool(false) diff --git a/ext/phar/tests/tar/033a.phpt b/ext/phar/tests/tar/033a.phpt index 09c2f3add1..4bb8757314 100644 --- a/ext/phar/tests/tar/033a.phpt +++ b/ext/phar/tests/tar/033a.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://hio'; $phar = new Phar($fname); @@ -37,7 +37,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- bool(false) diff --git a/ext/phar/tests/tar/alias_acrobatics.phpt b/ext/phar/tests/tar/alias_acrobatics.phpt index d08dc0467c..7146d054f1 100644 --- a/ext/phar/tests/tar/alias_acrobatics.phpt +++ b/ext/phar/tests/tar/alias_acrobatics.phpt @@ -7,8 +7,8 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; $p = new Phar($fname); @@ -35,8 +35,8 @@ echo $e->getMessage(),"\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); ?> --EXPECTF-- alias "foo" is already used for archive "%salias_acrobatics.phar.tar" cannot be overloaded with "%salias_acrobatics.2.phar.tar" diff --git a/ext/phar/tests/tar/all.phpt b/ext/phar/tests/tar/all.phpt index 848f50502d..215043e2da 100644 --- a/ext/phar/tests/tar/all.phpt +++ b/ext/phar/tests/tar/all.phpt @@ -11,9 +11,9 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.tar.php'; $pname2 = 'phar://' . $fname2; $phar = new Phar($fname); @@ -41,7 +41,7 @@ var_dump($phar['a']->getMetadata()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar.php'); ?> --EXPECT-- bool(false) bool(false) diff --git a/ext/phar/tests/tar/badalias.phpt b/ext/phar/tests/tar/badalias.phpt index 441fc03ae7..532aba8c3c 100644 --- a/ext/phar/tests/tar/badalias.phpt +++ b/ext/phar/tests/tar/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.tar"); diff --git a/ext/phar/tests/tar/badchecksum.phpt b/ext/phar/tests/tar/badchecksum.phpt index fae19b153d..35b5fc5836 100644 --- a/ext/phar/tests/tar/badchecksum.phpt +++ b/ext/phar/tests/tar/badchecksum.phpt @@ -4,10 +4,10 @@ Phar: tar with bad checksum <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; $pname = 'phar://' . $fname; -include dirname(__FILE__) . '/files/corrupt_tarmaker.php.inc'; +include __DIR__ . '/files/corrupt_tarmaker.php.inc'; $a = new corrupt_tarmaker($fname, 'none'); $a->init(); $a->addFile('hithere', 'contents', null, 'checksum'); @@ -23,7 +23,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECTF-- phar error: "%sbadchecksum.tar" is a corrupted tar file (checksum mismatch of file "hithere") diff --git a/ext/phar/tests/tar/bignames.phpt b/ext/phar/tests/tar/bignames.phpt index c10b1cea2f..3a10ac7547 100644 --- a/ext/phar/tests/tar/bignames.phpt +++ b/ext/phar/tests/tar/bignames.phpt @@ -6,10 +6,10 @@ Phar: tar with huge filenames phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.tar'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.tar'; -$fname4 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.4.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.tar'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.3.tar'; +$fname4 = __DIR__ . '/' . basename(__FILE__, '.php') . '.4.tar'; $pname = 'phar://' . $fname; $p1 = new PharData($fname); @@ -43,10 +43,10 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar'); -@unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.tar'); -@unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.4.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.tar'); +@unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.tar'); +@unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.4.tar'); ?> --EXPECTF-- hi diff --git a/ext/phar/tests/tar/bignames_overflow.phpt b/ext/phar/tests/tar/bignames_overflow.phpt index 359e9c6341..1d3f9071da 100644 --- a/ext/phar/tests/tar/bignames_overflow.phpt +++ b/ext/phar/tests/tar/bignames_overflow.phpt @@ -6,11 +6,11 @@ Phar: tar with huge filenames, buffer overflow phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.tar'; $pname = 'phar://' . $fname; -include dirname(__FILE__) . '/files/make.dangerous.tar.php.inc'; +include __DIR__ . '/files/make.dangerous.tar.php.inc'; $tar = new danger_tarmaker($fname, 'none'); $tar->init(); @@ -29,8 +29,8 @@ echo $p1[str_repeat('a', 155) . '/' . str_repeat('a', 100)]->getContent() . "\n" ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.tar'); ?> --EXPECT-- a diff --git a/ext/phar/tests/tar/bug49910.phpt b/ext/phar/tests/tar/bug49910.phpt index 6fb66a50a0..e03998bc28 100644 --- a/ext/phar/tests/tar/bug49910.phpt +++ b/ext/phar/tests/tar/bug49910.phpt @@ -5,7 +5,7 @@ Bug #49910: no support for ././@LongLink for long filenames in phar tar support <?php if (!extension_loaded("zlib")) die("skip"); ?> --FILE-- <?php -$fname = str_replace('\\', '/', dirname(__FILE__) . '/files/Structures_Graph-1.0.3.tgz'); +$fname = str_replace('\\', '/', __DIR__ . '/files/Structures_Graph-1.0.3.tgz'); $tar = new PharData($fname); $files = array(); foreach (new RecursiveIteratorIterator($tar) as $file) { diff --git a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt index b8004138bc..ee3219c1db 100644 --- a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt +++ b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt @@ -5,7 +5,7 @@ Bug #71317: regression in opening tar based phar files <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; +include __DIR__ . '/files/tarmaker.php.inc'; $testDirectory = __DIR__ . '/files/test_bug71317'; $testTarFilename = __DIR__ . '/files/test_bug71317.tar'; diff --git a/ext/phar/tests/tar/bug71504.phpt b/ext/phar/tests/tar/bug71504.phpt index 178d4ed750..fde572beea 100644 --- a/ext/phar/tests/tar/bug71504.phpt +++ b/ext/phar/tests/tar/bug71504.phpt @@ -5,7 +5,7 @@ Bug #71504: Parsing of tar file with duplicate filenames causes memory leak <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php -$fname = str_replace('\\', '/', dirname(__FILE__) . '/files/HTML_CSS-1.5.4.tgz'); +$fname = str_replace('\\', '/', __DIR__ . '/files/HTML_CSS-1.5.4.tgz'); try { $tar = new PharData($fname); } catch(Exception $e) { diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt index 8620ca0520..cccc57d8f5 100644 --- a/ext/phar/tests/tar/create_new_and_modify.phpt +++ b/ext/phar/tests/tar/create_new_and_modify.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.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.tar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); ?> --EXPECT-- bool(true) brand new! diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt index 48738a4313..1b41db6134 100644 --- a/ext/phar/tests/tar/create_new_phar_b.phpt +++ b/ext/phar/tests/tar/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.tar/a.php', +file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php', 'brand new!'); -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/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/tar/delete.phpt b/ext/phar/tests/tar/delete.phpt index 3395fa54d1..c34c720d31 100644 --- a/ext/phar/tests/tar/delete.phpt +++ b/ext/phar/tests/tar/delete.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $stub = "<?php Phar::mapPhar('hio'); @@ -25,7 +25,7 @@ echo file_get_contents($alias . '/a') . "\n"; ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- a diff --git a/ext/phar/tests/tar/delete_in_phar.phpt b/ext/phar/tests/tar/delete_in_phar.phpt index 1982b6bda9..871f2fe6f4 100644 --- a/ext/phar/tests/tar/delete_in_phar.phpt +++ b/ext/phar/tests/tar/delete_in_phar.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -41,7 +41,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/tar/delete_in_phar_b.phpt b/ext/phar/tests/tar/delete_in_phar_b.phpt index a67bf7a160..466ffcdf07 100644 --- a/ext/phar/tests/tar/delete_in_phar_b.phpt +++ b/ext/phar/tests/tar/delete_in_phar_b.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $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.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/tar/delete_in_phar_confirm.phpt b/ext/phar/tests/tar/delete_in_phar_confirm.phpt index 7593ebc1fb..b66656b8c1 100644 --- a/ext/phar/tests/tar/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/tar/delete_in_phar_confirm.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -37,14 +37,14 @@ if ($md5 == $md52) echo 'file was not modified'; ?> ===AFTER=== <?php -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php'; -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar/b.php'; -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar/b/c.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/b.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/tar/dir.phpt b/ext/phar/tests/tar/dir.phpt index 64d5d12761..4a83058282 100644 --- a/ext/phar/tests/tar/dir.phpt +++ b/ext/phar/tests/tar/dir.phpt @@ -7,11 +7,11 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.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::TAR)); @@ -31,9 +31,9 @@ var_dump(file_exists($pname2 . '/test/')); var_dump(file_exists($pname3 . '/another/dir/')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.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.tar.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(false) diff --git a/ext/phar/tests/tar/exists_as_phar.phpt b/ext/phar/tests/tar/exists_as_phar.phpt index 9a8cfc81f0..66842cbd33 100644 --- a/ext/phar/tests/tar/exists_as_phar.phpt +++ b/ext/phar/tests/tar/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.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$tname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://hio'; $phar = new Phar($fname); @@ -30,8 +30,8 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- phar tar error: "%sexists_as_phar.phar.tar" already exists as a regular phar and must be deleted from disk prior to creating as a tar-based phar diff --git a/ext/phar/tests/tar/links.phpt b/ext/phar/tests/tar/links.phpt index d702cacc45..0964cd7fab 100644 --- a/ext/phar/tests/tar/links.phpt +++ b/ext/phar/tests/tar/links.phpt @@ -6,8 +6,8 @@ Phar: tar with hard link and symbolic link phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; -copy(dirname(__FILE__) . '/files/links.tar', $fname); +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; +copy(__DIR__ . '/files/links.tar', $fname); try { $p = new PharData($fname); } catch (Exception $e) { @@ -22,7 +22,7 @@ var_dump($p['testit/link']->getContent()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECT-- string(3) "hi diff --git a/ext/phar/tests/tar/links2.phpt b/ext/phar/tests/tar/links2.phpt index 1939e002bd..ebeb27732d 100644 --- a/ext/phar/tests/tar/links2.phpt +++ b/ext/phar/tests/tar/links2.phpt @@ -4,10 +4,10 @@ Phar: tar with hard link to nowhere <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; $pname = 'phar://' . $fname; -include dirname(__FILE__) . '/files/corrupt_tarmaker.php.inc'; +include __DIR__ . '/files/corrupt_tarmaker.php.inc'; $a = new corrupt_tarmaker($fname, 'none'); $a->init(); $a->addFile('hardlink', 'internal/file.txt', array( @@ -28,7 +28,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECTF-- phar error: "%slinks2.tar" is a corrupted tar file - hard link to non-existent file "internal/file.txt" diff --git a/ext/phar/tests/tar/links3.phpt b/ext/phar/tests/tar/links3.phpt index def399e260..5c41a00ace 100644 --- a/ext/phar/tests/tar/links3.phpt +++ b/ext/phar/tests/tar/links3.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 --FILE-- <?php try { - $p = new PharData(dirname(__FILE__) . '/files/biglink.tar'); + $p = new PharData(__DIR__ . '/files/biglink.tar'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/tar/links4.phpt b/ext/phar/tests/tar/links4.phpt index 1d658a72e9..638c47f69c 100644 --- a/ext/phar/tests/tar/links4.phpt +++ b/ext/phar/tests/tar/links4.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 --FILE-- <?php try { - $p = new PharData(dirname(__FILE__) . '/files/tinylink.tar'); + $p = new PharData(__DIR__ . '/files/tinylink.tar'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/tar/links5.phpt b/ext/phar/tests/tar/links5.phpt index 6d11d3eb85..0639b9b415 100644 --- a/ext/phar/tests/tar/links5.phpt +++ b/ext/phar/tests/tar/links5.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 --FILE-- <?php try { - $p = new PharData(dirname(__FILE__) . '/files/subdirlink.tar'); + $p = new PharData(__DIR__ . '/files/subdirlink.tar'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/phar/tests/tar/links6.phpt b/ext/phar/tests/tar/links6.phpt index e26b8379f7..811272c57a 100644 --- a/ext/phar/tests/tar/links6.phpt +++ b/ext/phar/tests/tar/links6.phpt @@ -8,11 +8,11 @@ if (!extension_loaded("phar")) die("skip"); phar.require_hash=0 --FILE-- <?php -echo file_get_contents('phar://' . dirname(__FILE__) . '/files/links.phar.tar/link2'); -echo file_get_contents('phar://' . dirname(__FILE__) . '/files/links.phar.tar/link1'); -echo file_get_contents('phar://' . dirname(__FILE__) . '/files/links.phar.tar/testit.txt'); +echo file_get_contents('phar://' . __DIR__ . '/files/links.phar.tar/link2'); +echo file_get_contents('phar://' . __DIR__ . '/files/links.phar.tar/link1'); +echo file_get_contents('phar://' . __DIR__ . '/files/links.phar.tar/testit.txt'); -$a = fopen('phar://' . dirname(__FILE__) . '/files/links.phar.tar/link2', 'r'); +$a = fopen('phar://' . __DIR__ . '/files/links.phar.tar/link2', 'r'); fseek($a, 3); echo fread($a, 10); ?> diff --git a/ext/phar/tests/tar/open_for_write_existing.phpt b/ext/phar/tests/tar/open_for_write_existing.phpt index 641e5ce21d..67b59d4ad7 100644 --- a/ext/phar/tests/tar/open_for_write_existing.phpt +++ b/ext/phar/tests/tar/open_for_write_existing.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -36,7 +36,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECT-- extra ===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt index 4c67def631..fda72c36e8 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -39,7 +39,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/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 diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt index 9e73f1e899..03ebf35912 100644 --- a/ext/phar/tests/tar/open_for_write_existing_c.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -39,7 +39,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/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 diff --git a/ext/phar/tests/tar/open_for_write_newfile.phpt b/ext/phar/tests/tar/open_for_write_newfile.phpt index 31e9d4a7e9..f2f5d945d7 100644 --- a/ext/phar/tests/tar/open_for_write_newfile.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $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.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECT-- This is b/c extra diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt index 5c57587234..cc4333150a 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -40,7 +40,7 @@ include $alias . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/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 diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt index b5078426fe..36b5a423d1 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt @@ -10,7 +10,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $phar = new Phar($fname); @@ -39,7 +39,7 @@ include $alias . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/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 diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt index b7e9c708ca..9be6f2cf7b 100644 --- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/tar/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.tar', 0, 'phar_begin_setstub_commit.phar'); +$p = new Phar(__DIR__ . '/phar_begin_setstub_commit.phar.tar', 0, 'phar_begin_setstub_commit.phar'); var_dump($p->isFileFormat(Phar::TAR)); //var_dump($p->getStub()); var_dump($p->isBuffering()); @@ -32,7 +32,7 @@ var_dump($p->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_begin_setstub_commit.phar.tar'); +unlink(__DIR__ . '/phar_begin_setstub_commit.phar.tar'); ?> --EXPECTF-- bool(true) diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt index 051b3c2978..5e82d88550 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.tar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar'); var_dump($phar->buildFromIterator(new myIterator(array('a' => basename(__FILE__, 'php') . 'phpt')))); var_dump($phar->isFileFormat(Phar::TAR)); } catch (Exception $e) { @@ -48,7 +48,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); +unlink(__DIR__ . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_buildfromiterator5.phpt b/ext/phar/tests/tar/phar_buildfromiterator5.phpt index dcb610fb1e..5467165973 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator5.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.tar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar'); 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.tar'); +unlink(__DIR__ . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_buildfromiterator6.phpt b/ext/phar/tests/tar/phar_buildfromiterator6.phpt index 927ebec738..981310f15e 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator6.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.tar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar'); 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.tar'); +unlink(__DIR__ . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_buildfromiterator7.phpt b/ext/phar/tests/tar/phar_buildfromiterator7.phpt index f123c10e81..9f145cdbc8 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator7.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.tar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar'); 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.tar'); +unlink(__DIR__ . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_buildfromiterator8.phpt b/ext/phar/tests/tar/phar_buildfromiterator8.phpt index c2fcd1d264..27b480da6f 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator8.phpt @@ -7,9 +7,9 @@ phar.readonly=0 --FILE-- <?php try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.tar'); - $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.tar'); + $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::TAR)); @@ -21,7 +21,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); +unlink(__DIR__ . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_buildfromiterator9.phpt b/ext/phar/tests/tar/phar_buildfromiterator9.phpt index d6be8fd9bc..998d6653da 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator9.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.tar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar'); 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.tar'); +unlink(__DIR__ . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt index 1f6d744917..391be219cc 100644 --- a/ext/phar/tests/tar/phar_commitwrite.phpt +++ b/ext/phar/tests/tar/phar_commitwrite.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$p = new Phar(dirname(__FILE__) . '/phar_commitwrite.phar.tar', 0, 'phar_commitwrite.phar'); +$p = new Phar(__DIR__ . '/phar_commitwrite.phar.tar', 0, 'phar_commitwrite.phar'); $p['file1.txt'] = 'hi'; $p->stopBuffering(); var_dump($p->getStub()); @@ -26,7 +26,7 @@ var_dump($p->isFileFormat(Phar::TAR)); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_commitwrite.phar.tar'); +unlink(__DIR__ . '/phar_commitwrite.phar.tar'); ?> --EXPECTF-- string(60) "<?php // tar-based phar archive stub file diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt index df13006d79..e121cf6f7b 100644 --- a/ext/phar/tests/tar/phar_convert_phar.phpt +++ b/ext/phar/tests/tar/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,11 +38,11 @@ var_dump(strlen($phar->getStub())); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); -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.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); +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/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt index 1117a75260..d8ca717296 100644 --- a/ext/phar/tests/tar/phar_convert_phar2.phpt +++ b/ext/phar/tests/tar/phar_convert_phar2.phpt @@ -9,8 +9,8 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar'; $phar = new Phar($fname); $phar['a.txt'] = 'some text'; @@ -40,11 +40,11 @@ var_dump(strlen($phar->getStub())); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt index 762473f961..443ac26525 100644 --- a/ext/phar/tests/tar/phar_convert_phar3.phpt +++ b/ext/phar/tests/tar/phar_convert_phar3.phpt @@ -9,8 +9,8 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar'; $phar = new Phar($fname); $phar['a.txt'] = 'some text'; @@ -40,11 +40,11 @@ var_dump(strlen($phar->getStub())); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.bz2'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.bz2'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_convert_phar4.phpt b/ext/phar/tests/tar/phar_convert_phar4.phpt index 7c4c9ace2a..2188debbea 100644 --- a/ext/phar/tests/tar/phar_convert_phar4.phpt +++ b/ext/phar/tests/tar/phar_convert_phar4.phpt @@ -9,8 +9,8 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar'; $phar = new Phar($fname); $phar['a.txt'] = 'some text'; @@ -45,11 +45,11 @@ var_dump($phar->getMetadata()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_copy.phpt b/ext/phar/tests/tar/phar_copy.phpt index 782bb4fb5d..61938bf0b5 100644 --- a/ext/phar/tests/tar/phar_copy.phpt +++ b/ext/phar/tests/tar/phar_copy.phpt @@ -9,8 +9,8 @@ phar.require_hash=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar.php'; $pname = 'phar://'.$fname; $iname = '/file.txt'; @@ -45,8 +45,8 @@ echo 'c: ' ,file_get_contents($p2['c']->getPathName()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.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/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt index 19579dd614..0b1f6bcac1 100644 --- a/ext/phar/tests/tar/phar_magic.phpt +++ b/ext/phar/tests/tar/phar_magic.phpt @@ -7,11 +7,11 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; $p = new Phar($fname); var_dump($p->isFileFormat(Phar::TAR)); $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 set_include_path("phar://" . __FILE__); @@ -22,7 +22,7 @@ include $fname; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_setalias.phpt b/ext/phar/tests/tar/phar_setalias.phpt index ffdd508c31..59da7bb984 100644 --- a/ext/phar/tests/tar/phar_setalias.phpt +++ b/ext/phar/tests/tar/phar_setalias.phpt @@ -8,8 +8,8 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar.tar'; $phar = new Phar($fname); $phar->setStub('<?php echo "first stub\n"; __HALT_COMPILER(); ?>'); @@ -40,8 +40,8 @@ echo $a->getAlias() . "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_setalias2.phpt b/ext/phar/tests/tar/phar_setalias2.phpt index 115b986617..8179cf2cd5 100644 --- a/ext/phar/tests/tar/phar_setalias2.phpt +++ b/ext/phar/tests/tar/phar_setalias2.phpt @@ -8,7 +8,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $phar = new Phar($fname); $phar->setStub('<?php echo "first stub\n"; __HALT_COMPILER(); ?>'); @@ -30,7 +30,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'); @@ -42,8 +42,8 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_setdefaultstub.phpt b/ext/phar/tests/tar/phar_setdefaultstub.phpt index f0db276722..bea53cdce3 100644 --- a/ext/phar/tests/tar/phar_setdefaultstub.phpt +++ b/ext/phar/tests/tar/phar_setdefaultstub.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $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.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- string(51) "<?php echo "Hello World\n"; __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt index c16e7523f8..4fb558bd72 100644 --- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt @@ -11,7 +11,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $p = new Phar($fname); $p['file1.txt'] = 'hi'; var_dump($p->getSignature()); @@ -32,9 +32,9 @@ var_dump($p->getSignature()); echo $e->getMessage(); } try { -$config = dirname(__FILE__) . '/../files/openssl.cnf'; +$config = __DIR__ . '/../files/openssl.cnf'; $config_arg = array('config' => $config); -$private = openssl_get_privatekey(file_get_contents(dirname(dirname(__FILE__)) . '/files/private.pem')); +$private = openssl_get_privatekey(file_get_contents(dirname(__DIR__) . '/files/private.pem')); $pkey = ''; openssl_pkey_export($private, $pkey, NULL, $config_arg); $p->setSignatureAlgorithm(Phar::OPENSSL, $pkey); @@ -46,7 +46,7 @@ echo $e->getMessage(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- array(2) { diff --git a/ext/phar/tests/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt index 3d8e2874ef..f6709280bd 100644 --- a/ext/phar/tests/tar/phar_stub.phpt +++ b/ext/phar/tests/tar/phar_stub.phpt @@ -7,8 +7,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar.php'; -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.tar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.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.tar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_stub_error.phpt b/ext/phar/tests/tar/phar_stub_error.phpt index fc22bcb16b..b1dc49f927 100644 --- a/ext/phar/tests/tar/phar_stub_error.phpt +++ b/ext/phar/tests/tar/phar_stub_error.phpt @@ -8,7 +8,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $phar = new Phar($fname); $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.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt index 7b4f05417a..9351b566a6 100644 --- a/ext/phar/tests/tar/refcount1.phpt +++ b/ext/phar/tests/tar/refcount1.phpt @@ -7,8 +7,8 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +include __DIR__ . '/files/tarmaker.php.inc'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $tar = new tarmaker($fname, 'none'); @@ -48,7 +48,7 @@ include $alias . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- ===CLOSE=== object(PharFileInfo)#%d (2) { diff --git a/ext/phar/tests/tar/rename.phpt b/ext/phar/tests/tar/rename.phpt index 96588a6596..8774fb2581 100644 --- a/ext/phar/tests/tar/rename.phpt +++ b/ext/phar/tests/tar/rename.phpt @@ -7,8 +7,8 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +include __DIR__ . '/files/tarmaker.php.inc'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $tar = new tarmaker($fname, 'none'); @@ -34,7 +34,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.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- a a diff --git a/ext/phar/tests/tar/rename_dir.phpt b/ext/phar/tests/tar/rename_dir.phpt index 0b9578945a..f0b8a9b00e 100644 --- a/ext/phar/tests/tar/rename_dir.phpt +++ b/ext/phar/tests/tar/rename_dir.phpt @@ -7,8 +7,8 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +include __DIR__ . '/files/tarmaker.php.inc'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $tar = new tarmaker($fname, 'none'); @@ -34,7 +34,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.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- a a diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt index aefbdb9c27..a8bf6eb575 100644 --- a/ext/phar/tests/tar/require_hash.phpt +++ b/ext/phar/tests/tar/require_hash.phpt @@ -8,10 +8,10 @@ phar.require_hash=0 --FILE-- <?php ini_set('phar.require_hash', 1); -include dirname(__FILE__) . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/require_hash.phar.tar'; +include __DIR__ . '/files/tarmaker.php.inc'; +$fname = __DIR__ . '/require_hash.phar.tar'; $alias = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/require_hash.tar'; +$fname2 = __DIR__ . '/require_hash.tar'; $tar = new tarmaker($fname, 'none'); $tar->init(); @@ -41,8 +41,8 @@ try { ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/require_hash.phar.tar'); -@unlink(dirname(__FILE__) . '/require_hash.tar'); +@unlink(__DIR__ . '/require_hash.phar.tar'); +@unlink(__DIR__ . '/require_hash.tar'); ?> --EXPECTF-- tar-based phar "%srequire_hash.phar.tar" does not have a signature diff --git a/ext/phar/tests/tar/rmdir.phpt b/ext/phar/tests/tar/rmdir.phpt index be037823d6..8e7b30b0f3 100644 --- a/ext/phar/tests/tar/rmdir.phpt +++ b/ext/phar/tests/tar/rmdir.phpt @@ -7,8 +7,8 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +include __DIR__ . '/files/tarmaker.php.inc'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $alias = 'phar://' . $fname; $tar = new tarmaker($fname, 'none'); @@ -36,7 +36,7 @@ unlink($alias . '/a/x'); var_dump(rmdir($alias . '/a')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- a diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index a2c4f36fa3..5eabc301a9 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -4,16 +4,16 @@ Phar: tar-based phar corrupted <?php if (!extension_loaded('phar')) die('skip'); ?> --FILE-- <?php -include dirname(__FILE__) . '/files/make_invalid_tar.php.inc'; +include __DIR__ . '/files/make_invalid_tar.php.inc'; -$tar = new corrupter(dirname(__FILE__) . '/tar_001.phar.tar', 'none'); +$tar = new corrupter(__DIR__ . '/tar_001.phar.tar', 'none'); $tar->init(); $tar->addFile('tar_001.phpt', __FILE__); $tar->close(); -$tar = fopen('phar://' . dirname(__FILE__) . '/tar_001.phar.tar/tar_001.phpt', 'rb'); +$tar = fopen('phar://' . __DIR__ . '/tar_001.phar.tar/tar_001.phpt', 'rb'); try { - $phar = new Phar(dirname(__FILE__) . '/tar_001.phar.tar'); + $phar = new Phar(__DIR__ . '/tar_001.phar.tar'); echo "should not execute\n"; } catch (Exception $e) { echo $e->getMessage() . "\n"; @@ -22,7 +22,7 @@ try { ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_001.phar.tar'); +@unlink(__DIR__ . '/tar_001.phar.tar'); ?> --EXPECTF-- Warning: fopen(phar://%star_001.phar.tar/tar_001.phpt): failed to open stream: phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) in %star_001.php on line 9 diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt index 7fc09c806f..38623a4030 100644 --- a/ext/phar/tests/tar/tar_002.phpt +++ b/ext/phar/tests/tar/tar_002.phpt @@ -6,17 +6,17 @@ Phar: tar-based phar corrupted 2 phar.readonly=0 --FILE-- <?php -include dirname(__FILE__) . '/files/make_invalid_tar.php.inc'; +include __DIR__ . '/files/make_invalid_tar.php.inc'; -$tar = new corrupter(dirname(__FILE__) . '/tar_002.phar.tar', 'none'); +$tar = new corrupter(__DIR__ . '/tar_002.phar.tar', 'none'); $tar->init(); $tar->addFile('tar_002.phpt', __FILE__); $tar->close(); -$tar = fopen('phar://' . dirname(__FILE__) . '/tar_002.phar.tar/tar_002.phpt', 'rb'); +$tar = fopen('phar://' . __DIR__ . '/tar_002.phar.tar/tar_002.phpt', 'rb'); try { - $phar = new Phar(dirname(__FILE__) . '/tar_002.phar.tar'); + $phar = new Phar(__DIR__ . '/tar_002.phar.tar'); echo "should not execute\n"; } catch (Exception $e) { echo $e->getMessage() . "\n"; @@ -25,7 +25,7 @@ try { ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_002.phar.tar'); +@unlink(__DIR__ . '/tar_002.phar.tar'); ?> --EXPECTF-- Warning: fopen(phar://%star_002.phar.tar/tar_002.phpt): failed to open stream: phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) in %star_002.php on line 9 diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt index fe7e1d854e..9cec9451e1 100644 --- a/ext/phar/tests/tar/tar_003.phpt +++ b/ext/phar/tests/tar/tar_003.phpt @@ -7,9 +7,9 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; +include __DIR__ . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/tar_003.phar.tar'; +$fname = __DIR__ . '/tar_003.phar.tar'; $alias = 'phar://' . $fname; $tar = new tarmaker($fname, 'none'); @@ -50,7 +50,7 @@ closedir($tar); ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_003.phar.tar'); +@unlink(__DIR__ . '/tar_003.phar.tar'); ?> --EXPECT-- hi there! diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt index d142857388..42473d5818 100644 --- a/ext/phar/tests/tar/tar_004.phpt +++ b/ext/phar/tests/tar/tar_004.phpt @@ -9,9 +9,9 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; +include __DIR__ . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/tar_004.phar.tar'; +$fname = __DIR__ . '/tar_004.phar.tar'; $alias = 'phar://' . $fname; $tar = new tarmaker($fname, 'none'); @@ -32,7 +32,7 @@ include $fname; ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_004.phar.tar'); +@unlink(__DIR__ . '/tar_004.phar.tar'); ?> --EXPECTF-- string(9) "it worked" diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt index d7e6dc0e26..28fd25aa52 100644 --- a/ext/phar/tests/tar/tar_bz2.phpt +++ b/ext/phar/tests/tar/tar_bz2.phpt @@ -10,11 +10,11 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; +include __DIR__ . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/tar_bz2.phar'; +$fname = __DIR__ . '/tar_bz2.phar'; $alias = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/tar_bz2.phar.tar'; +$fname2 = __DIR__ . '/tar_bz2.phar.tar'; $alias2 = 'phar://' . $fname2; $tar = new tarmaker($fname, 'bz2'); @@ -48,8 +48,8 @@ var_dump($phar2->isCompressed() == Phar::BZ2); ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_bz2.phar'); -@unlink(dirname(__FILE__) . '/tar_bz2.phar.tar'); +@unlink(__DIR__ . '/tar_bz2.phar'); +@unlink(__DIR__ . '/tar_bz2.phar.tar'); ?> --EXPECTF-- string(%d) "%star_bz2.phar" diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt index f64962c8c8..66ab150cb7 100644 --- a/ext/phar/tests/tar/tar_gzip.phpt +++ b/ext/phar/tests/tar/tar_gzip.phpt @@ -10,10 +10,10 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/tar_gzip.phar'; +include __DIR__ . '/files/tarmaker.php.inc'; +$fname = __DIR__ . '/tar_gzip.phar'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/tar_gzip.phar.tar'; +$fname2 = __DIR__ . '/tar_gzip.phar.tar'; $pname2 = 'phar://' . $fname2; $a = new tarmaker($fname, 'zlib'); @@ -41,8 +41,8 @@ var_dump($b->isCompressed() == Phar::GZ); ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_gzip.phar'); -@unlink(dirname(__FILE__) . '/tar_gzip.phar.tar'); +@unlink(__DIR__ . '/tar_gzip.phar'); +@unlink(__DIR__ . '/tar_gzip.phar.tar'); ?> --EXPECTF-- string(9) "it worked" diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt index 91b0da7c72..7eccb3f7c3 100644 --- a/ext/phar/tests/tar/tar_makebz2.phpt +++ b/ext/phar/tests/tar/tar_makebz2.phpt @@ -8,9 +8,9 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/tar_makebz2.phar.tar'; -$fname2 = dirname(__FILE__) . '/tar_makebz2.phar.tar.bz2'; -$fname3 = dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2'; +$fname = __DIR__ . '/tar_makebz2.phar.tar'; +$fname2 = __DIR__ . '/tar_makebz2.phar.tar.bz2'; +$fname3 = __DIR__ . '/tar_makebz2_b.phar.tar.bz2'; $phar = new Phar($fname); $phar['test'] = 'hi'; @@ -27,10 +27,10 @@ var_dump($phar2->isCompressed() == Phar::BZ2); ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_makebz2.phar.bz2'); -@unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar'); -@unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar.bz2'); -@unlink(dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2'); +@unlink(__DIR__ . '/tar_makebz2.phar.bz2'); +@unlink(__DIR__ . '/tar_makebz2.phar.tar'); +@unlink(__DIR__ . '/tar_makebz2.phar.tar.bz2'); +@unlink(__DIR__ . '/tar_makebz2_b.phar.tar.bz2'); ?> --EXPECT-- bool(true) diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt index 93d515280a..244e465722 100644 --- a/ext/phar/tests/tar/tar_makegz.phpt +++ b/ext/phar/tests/tar/tar_makegz.phpt @@ -8,9 +8,9 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/tar_makegz.phar.tar'; -$fname2 = dirname(__FILE__) . '/tar_makegz.phar.tar.gz'; -$fname3 = dirname(__FILE__) . '/tar_makegz_b.phar.tar.gz'; +$fname = __DIR__ . '/tar_makegz.phar.tar'; +$fname2 = __DIR__ . '/tar_makegz.phar.tar.gz'; +$fname3 = __DIR__ . '/tar_makegz_b.phar.tar.gz'; $phar = new Phar($fname); $phar['test'] = 'hi'; @@ -28,10 +28,10 @@ var_dump($phar2->isCompressed() == Phar::GZ); ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_makegz.phar.gz'); -@unlink(dirname(__FILE__) . '/tar_makegz.phar.tar'); -@unlink(dirname(__FILE__) . '/tar_makegz.phar.tar.gz'); -@unlink(dirname(__FILE__) . '/tar_makegz_b.phar.tar.gz'); +@unlink(__DIR__ . '/tar_makegz.phar.gz'); +@unlink(__DIR__ . '/tar_makegz.phar.tar'); +@unlink(__DIR__ . '/tar_makegz.phar.tar.gz'); +@unlink(__DIR__ . '/tar_makegz_b.phar.tar.gz'); ?> --EXPECT-- bool(true) diff --git a/ext/phar/tests/tar/tar_nohash.phpt b/ext/phar/tests/tar/tar_nohash.phpt index 3d1d0010a0..a97f347b3c 100644 --- a/ext/phar/tests/tar/tar_nohash.phpt +++ b/ext/phar/tests/tar/tar_nohash.phpt @@ -9,7 +9,7 @@ phar.require_hash=1 --FILE-- <?php try { - $phar = new PharData(dirname(__FILE__) . '/files/Net_URL-1.0.15.tgz'); + $phar = new PharData(__DIR__ . '/files/Net_URL-1.0.15.tgz'); var_dump($phar->getStub()); } catch (Exception $e) { echo $e->getMessage()."\n"; diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt index 8f91c74d59..d71f834280 100644 --- a/ext/phar/tests/tar/tar_nostub.phpt +++ b/ext/phar/tests/tar/tar_nostub.phpt @@ -7,10 +7,10 @@ phar.readonly=1 phar.require_hash=0 --FILE-- <?php -include dirname(__FILE__) . '/files/tarmaker.php.inc'; -$fname = dirname(__FILE__) . '/tar_nostub.phar.tar'; +include __DIR__ . '/files/tarmaker.php.inc'; +$fname = __DIR__ . '/tar_nostub.phar.tar'; $alias = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/tar_nostub.tar'; +$fname2 = __DIR__ . '/tar_nostub.tar'; $tar = new tarmaker($fname, 'none'); $tar->init(); @@ -38,8 +38,8 @@ try { ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tar_nostub.phar.tar'); -@unlink(dirname(__FILE__) . '/tar_nostub.tar'); +@unlink(__DIR__ . '/tar_nostub.phar.tar'); +@unlink(__DIR__ . '/tar_nostub.tar'); ?> --EXPECTF-- RecursiveDirectoryIterator::__construct(phar://%star_nostub.phar.tar/): failed to open dir: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive diff --git a/ext/phar/tests/tar/tar_openssl_hash.phpt b/ext/phar/tests/tar/tar_openssl_hash.phpt index 075136f687..030ee79db4 100644 --- a/ext/phar/tests/tar/tar_openssl_hash.phpt +++ b/ext/phar/tests/tar/tar_openssl_hash.phpt @@ -10,7 +10,7 @@ phar.require_hash=1 --FILE-- <?php try { - $phar = new PharData(dirname(__FILE__) . '/files/P1-1.0.0.tgz'); + $phar = new PharData(__DIR__ . '/files/P1-1.0.0.tgz'); } catch (Exception $e) { echo $e->getMessage()."\n"; } diff --git a/ext/phar/tests/tar/truncated.phpt b/ext/phar/tests/tar/truncated.phpt index fbcabb7986..66148a7d28 100644 --- a/ext/phar/tests/tar/truncated.phpt +++ b/ext/phar/tests/tar/truncated.phpt @@ -5,7 +5,7 @@ Phar: truncated tar --FILE-- <?php try { - $p = new PharData(dirname(__FILE__) . '/files/trunc.tar'); + $p = new PharData(__DIR__ . '/files/trunc.tar'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } @@ -14,8 +14,8 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- phar error: "%strunc.tar" is a corrupted tar file (truncated) |