diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
| commit | 6426420f61de0df32a6085924d25b347c8788363 (patch) | |
| tree | ef32814ffbea0ad3c3c38a942f9751302606c736 /ext/phar/tests | |
| parent | f26c8644bb340e9e7abb6d1cedb091e9d87dd1d4 (diff) | |
| parent | 26dfce7f36d1c6f737ac241df1315a1b42b932c7 (diff) | |
| download | php-git-6426420f61de0df32a6085924d25b347c8788363.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace dirname(__FILE__) by __DIR__ in tests
Diffstat (limited to 'ext/phar/tests')
312 files changed, 1015 insertions, 1015 deletions
diff --git a/ext/phar/tests/008.phpt b/ext/phar/tests/008.phpt index 664ffea5cb..27d16cfd33 100644 --- a/ext/phar/tests/008.phpt +++ b/ext/phar/tests/008.phpt @@ -8,14 +8,14 @@ $file = "<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; $file .= pack('V', 500) . 'notenough'; -file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); +file_put_contents(__DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { -include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +include __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; } catch (Exception $e) { echo $e->getMessage(); } ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- internal corruption of phar "%s" (truncated manifest header) diff --git a/ext/phar/tests/009.phpt b/ext/phar/tests/009.phpt index d2570fb881..fe20d92dcd 100644 --- a/ext/phar/tests/009.phpt +++ b/ext/phar/tests/009.phpt @@ -10,14 +10,14 @@ $file = "<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; $file .= pack('VVnVVV', 500, 500, 0x1000, 0x00000000, 0, 0) . str_repeat('A', 500); -file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); +file_put_contents(__DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { -include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +include __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; } catch (Exception $e) { echo $e->getMessage(); } ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- internal corruption of phar "%s009.phar.php" (too many manifest entries for size of manifest) diff --git a/ext/phar/tests/010.phpt b/ext/phar/tests/010.phpt index 3dce5f8f4c..f424e17680 100644 --- a/ext/phar/tests/010.phpt +++ b/ext/phar/tests/010.phpt @@ -15,15 +15,15 @@ __HALT_COMPILER(); ?>"; $manifest = pack('V', 1) . 'a' . pack('VVVVVV', 0, time(), 0, crc32(''), 0x00000000, 0); $file .= pack('VVnVV', strlen($manifest), 1, 0x1000, 0x00000000, 3) . 'hio' . pack('V', 0) . $manifest; -file_put_contents(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php', $file); +file_put_contents(__DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php', $file); try { -include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +include __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; echo file_get_contents('phar://hio/a'); } catch (Exception $e) { echo $e->getMessage(); } ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- internal corruption of phar "%s" (too many manifest entries for size of manifest) diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt index 83bae148e0..481086474c 100644 --- a/ext/phar/tests/011.phpt +++ b/ext/phar/tests/011.phpt @@ -6,7 +6,7 @@ Phar::mapPhar filesize too small in manifest phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -25,6 +25,6 @@ echo $e->getMessage(); } ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- internal corruption of phar "%s" (compressed and uncompressed size does not match for uncompressed entry) diff --git a/ext/phar/tests/012.phpt b/ext/phar/tests/012.phpt index 3246eff468..9e35bbbeb5 100644 --- a/ext/phar/tests/012.phpt +++ b/ext/phar/tests/012.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -23,6 +23,6 @@ echo file_get_contents('phar://hio/a'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- a diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt index ae3ae72936..7667a98db9 100644 --- a/ext/phar/tests/013.phpt +++ b/ext/phar/tests/013.phpt @@ -6,7 +6,7 @@ Phar::mapPhar filesize mismatch phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; // filesize should be 1, and is 2 @@ -18,6 +18,6 @@ include 'files/phar_test.inc'; echo file_get_contents($pname.'/a'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt index d08e6550b6..08247d1743 100644 --- a/ext/phar/tests/014.phpt +++ b/ext/phar/tests/014.phpt @@ -6,7 +6,7 @@ Phar::mapPhar filesize mismatch phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; // wrong crc32 @@ -18,6 +18,6 @@ include 'files/phar_test.inc'; echo file_get_contents($pname.'/a'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d diff --git a/ext/phar/tests/015.phpt b/ext/phar/tests/015.phpt index b93b77e9fb..0916002704 100644 --- a/ext/phar/tests/015.phpt +++ b/ext/phar/tests/015.phpt @@ -7,7 +7,7 @@ Phar::mapPhar valid file (gzipped) phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -18,6 +18,6 @@ include 'files/phar_test.inc'; echo file_get_contents($pname .'/a'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- a diff --git a/ext/phar/tests/015b.phpt b/ext/phar/tests/015b.phpt index 08ead2d9c0..1534467a19 100644 --- a/ext/phar/tests/015b.phpt +++ b/ext/phar/tests/015b.phpt @@ -7,7 +7,7 @@ Phar::mapPhar valid file (bzip2) phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -18,6 +18,6 @@ include 'files/phar_test.inc'; var_dump(file_get_contents($pname . '/a')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(11) "Hello World" diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt index 302d06d3cb..e94a17f059 100644 --- a/ext/phar/tests/016.phpt +++ b/ext/phar/tests/016.phpt @@ -7,7 +7,7 @@ Phar::mapPhar invalid file (gzipped file length is too short) phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; // file length is too short @@ -26,7 +26,7 @@ var_dump(file_get_contents($pname . '/c')); var_dump(file_get_contents($pname . '/d')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d bool(false) diff --git a/ext/phar/tests/016b.phpt b/ext/phar/tests/016b.phpt index 8fe66826d6..fa2727bede 100644 --- a/ext/phar/tests/016b.phpt +++ b/ext/phar/tests/016b.phpt @@ -7,7 +7,7 @@ Phar::mapPhar invalid file (gzipped file length is too short) phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; // file length is too short @@ -19,6 +19,6 @@ include 'files/phar_test.inc'; echo file_get_contents($pname . '/a'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt index c04880604d..69169b7a0b 100644 --- a/ext/phar/tests/017.phpt +++ b/ext/phar/tests/017.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -24,7 +24,7 @@ include $pname; $dir = opendir('phar://hio'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- string(%d) "%s017.phar.php" bool(true) diff --git a/ext/phar/tests/018.phpt b/ext/phar/tests/018.phpt index fb7e0fee95..0f97b361d5 100644 --- a/ext/phar/tests/018.phpt +++ b/ext/phar/tests/018.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -27,7 +27,7 @@ while (false !== ($a = readdir($dir))) { } ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" bool(false) diff --git a/ext/phar/tests/019.phpt b/ext/phar/tests/019.phpt index 860edad236..44e2580f18 100644 --- a/ext/phar/tests/019.phpt +++ b/ext/phar/tests/019.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -33,7 +33,7 @@ if ($dir) { ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- %s(1) "a" bool(false) diff --git a/ext/phar/tests/019b.phpt b/ext/phar/tests/019b.phpt index e594e7c791..99415eaa95 100644 --- a/ext/phar/tests/019b.phpt +++ b/ext/phar/tests/019b.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -45,7 +45,7 @@ dump('phar://hio', '/'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(11) "phar://hio/" string(2) "/a" diff --git a/ext/phar/tests/019c.phpt b/ext/phar/tests/019c.phpt index 9f899d7184..5eaac90ac7 100644 --- a/ext/phar/tests/019c.phpt +++ b/ext/phar/tests/019c.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -49,7 +49,7 @@ dump('phar://hio', '/'); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(11) "phar://hio/" string(2) "/a" diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt index 1c2b4b1abe..6d1bac8a54 100644 --- a/ext/phar/tests/020.phpt +++ b/ext/phar/tests/020.phpt @@ -6,13 +6,13 @@ Phar: url stat phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); __HALT_COMPILER(); ?>"; -$pfile = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$pfile = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $files = array(); $files['a'] = 'a'; $files['b/a'] = 'b'; @@ -24,7 +24,7 @@ include $fname; var_dump(stat('phar://hio/a'), stat('phar://hio/b')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- array(26) { [0]=> diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt index 010136f779..9a87f04fe1 100644 --- a/ext/phar/tests/021.phpt +++ b/ext/phar/tests/021.phpt @@ -6,7 +6,7 @@ Phar: stream stat phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -27,7 +27,7 @@ var_dump(fstat($fp)); fclose($fp); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- array(26) { [0]=> diff --git a/ext/phar/tests/022.phpt b/ext/phar/tests/022.phpt index 20c24a0214..4442f65bc0 100644 --- a/ext/phar/tests/022.phpt +++ b/ext/phar/tests/022.phpt @@ -6,7 +6,7 @@ Phar: stream stat phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -66,7 +66,7 @@ fclose($fp); ?> --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); exit(0); ?> --EXPECT-- diff --git a/ext/phar/tests/023.phpt b/ext/phar/tests/023.phpt index 808f91deae..f6920a48e0 100644 --- a/ext/phar/tests/023.phpt +++ b/ext/phar/tests/023.phpt @@ -6,7 +6,7 @@ Phar: phar:// file_get_contents phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -24,7 +24,7 @@ var_dump(file_get_contents($pname . '/b/c.php')); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(28) "<?php echo "This is a\n"; ?>" string(28) "<?php echo "This is b\n"; ?>" diff --git a/ext/phar/tests/024.phpt b/ext/phar/tests/024.phpt index ad30d2644d..8ec0911e74 100644 --- a/ext/phar/tests/024.phpt +++ b/ext/phar/tests/024.phpt @@ -6,7 +6,7 @@ Phar: phar:// include phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -24,7 +24,7 @@ include $pname . '/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a This is b diff --git a/ext/phar/tests/025.phpt b/ext/phar/tests/025.phpt index bbb5bc4e83..76f2b1eb77 100644 --- a/ext/phar/tests/025.phpt +++ b/ext/phar/tests/025.phpt @@ -6,7 +6,7 @@ Phar: phar:// include (repeated names) phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -24,7 +24,7 @@ include $pname . '/b/b'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a This is b diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt index e59a07239b..d58555343f 100644 --- a/ext/phar/tests/026.phpt +++ b/ext/phar/tests/026.phpt @@ -6,7 +6,7 @@ Phar: phar:// require from within phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -24,7 +24,7 @@ require $pname . '/a.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a This is b diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt index 5cf6661200..935f92c2d2 100644 --- a/ext/phar/tests/027.phpt +++ b/ext/phar/tests/027.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -23,7 +23,7 @@ include 'files/phar_test.inc'; function dump($phar, $base) { - var_dump(str_replace(dirname(__FILE__), '*', $phar) . $base); + var_dump(str_replace(__DIR__, '*', $phar) . $base); $dir = opendir($phar . $base); if ($base == '/') { @@ -58,7 +58,7 @@ var_dump(opendir("phar://foo.phar/hi")); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- string(%d) "phar://*/027.phar.php/" string(6) "/a.php" diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt index b60926e634..19f1d988a3 100644 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -6,7 +6,7 @@ Phar::loadPhar phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://hio'; $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $alias = ''; @@ -31,7 +31,7 @@ include $pname . '/a.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a This is b diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt index 58eddb7273..dc7f3acb63 100644 --- a/ext/phar/tests/029.phpt +++ b/ext/phar/tests/029.phpt @@ -6,8 +6,8 @@ Phar::loadPhar overloading alias names phar.require_hash=0 --FILE-- <?php -$fname1 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php'; +$fname1 = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.php'; $fname = $fname1; $alias = ''; $pname = 'phar://hio'; @@ -40,8 +40,8 @@ catch (Exception $e) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> --EXPECTF-- bool(true) diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt index 343be7f084..7132383d80 100644 --- a/ext/phar/tests/030.phpt +++ b/ext/phar/tests/030.phpt @@ -6,7 +6,7 @@ Phar::loadPhar ignoring alias phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; @@ -35,7 +35,7 @@ echo $e->getMessage(),"\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt index ec44624d3f..03ffb90a6a 100644 --- a/ext/phar/tests/031.phpt +++ b/ext/phar/tests/031.phpt @@ -22,7 +22,7 @@ require $pname; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/031.phar.php'); +unlink(__DIR__ . '/files/031.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt index 0878482d0a..481d26055c 100644 --- a/ext/phar/tests/032.phpt +++ b/ext/phar/tests/032.phpt @@ -21,7 +21,7 @@ echo $e->getMessage(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/032.phar.php'); +unlink(__DIR__ . '/files/032.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/033.phpt b/ext/phar/tests/033.phpt index a0b1f659f5..9beb281912 100644 --- a/ext/phar/tests/033.phpt +++ b/ext/phar/tests/033.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php'; $pname = 'phar://hio'; $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; @@ -33,7 +33,7 @@ var_dump($a['dir']->isReadable()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?> --EXPECT-- bool(false) diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt index 8dcdfc4074..548121f842 100644 --- a/ext/phar/tests/033a.phpt +++ b/ext/phar/tests/033a.phpt @@ -7,7 +7,7 @@ phar.readonly=1 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php'; $pname = 'phar://hio'; $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; @@ -28,7 +28,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?> --EXPECTF-- bool(false) diff --git a/ext/phar/tests/addfuncs.phpt b/ext/phar/tests/addfuncs.phpt index ab10736a8a..a099dc4ed9 100644 --- a/ext/phar/tests/addfuncs.phpt +++ b/ext/phar/tests/addfuncs.phpt @@ -6,7 +6,7 @@ Phar: addFile/addFromString phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $phar = new Phar($fname); $phar->addFromString('a', 'hi'); @@ -24,7 +24,7 @@ $phar->addFile($pname . '/a', 'a'); echo $e->getMessage() . "\n"; } try { -$phar->addFile(dirname(__FILE__) . '/does/not/exist'); +$phar->addFile(__DIR__ . '/does/not/exist'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } @@ -41,7 +41,7 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- hi hi diff --git a/ext/phar/tests/alias_acrobatics.phpt b/ext/phar/tests/alias_acrobatics.phpt index 1bb20a4b3a..56391def63 100644 --- a/ext/phar/tests/alias_acrobatics.phpt +++ b/ext/phar/tests/alias_acrobatics.phpt @@ -7,8 +7,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'; $p = new Phar($fname); @@ -35,8 +35,8 @@ echo $e->getMessage(),"\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar'); ?> --EXPECTF-- alias "foo" is already used for archive "%salias_acrobatics.phar" cannot be overloaded with "%salias_acrobatics.2.phar" diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt index bf9c5d5696..ad3506ace9 100644 --- a/ext/phar/tests/badparameters.phpt +++ b/ext/phar/tests/badparameters.phpt @@ -34,7 +34,7 @@ try { echo $e->getMessage(), "\n"; } try { - $a = new Phar(dirname(__FILE__) . '/files/frontcontroller10.phar'); + $a = new Phar(__DIR__ . '/files/frontcontroller10.phar'); } catch (PharException $e) { echo $e->getMessage(), "\n"; } @@ -49,12 +49,12 @@ try { echo $e->getMessage(), "\n"; } try { - $b = new PharData(dirname(__FILE__) . '/whatever.tar'); + $b = new PharData(__DIR__ . '/whatever.tar'); } catch (PharException $e) { echo $e->getMessage(), "\n"; } try { - $c = new PharData(dirname(__FILE__) . '/whatever.zip'); + $c = new PharData(__DIR__ . '/whatever.zip'); } catch (PharException $e) { echo $e->getMessage(), "\n"; } diff --git a/ext/phar/tests/bug13727.phpt b/ext/phar/tests/bug13727.phpt index 4996c2eb21..2db6637efc 100644 --- a/ext/phar/tests/bug13727.phpt +++ b/ext/phar/tests/bug13727.phpt @@ -8,8 +8,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$dirName = dirname(__FILE__); +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$dirName = __DIR__; $pname = 'phar://' . $fname; $pArchive="DataArchive.phar"; $p = new Phar($fname, 0, $pArchive); @@ -25,7 +25,7 @@ echo("\n Written Files($i)\n"); ===DONE=== --CLEAN-- <?php -$dirName = dirname(__FILE__); +$dirName = __DIR__; $fileDir="$dirName/test_data"; for ($i = 0; $i < 4*1024; $i++){ unlink("$fileDir/$i"); diff --git a/ext/phar/tests/bug13786.phpt b/ext/phar/tests/bug13786.phpt index 8ed0697bff..1fc1cfd502 100644 --- a/ext/phar/tests/bug13786.phpt +++ b/ext/phar/tests/bug13786.phpt @@ -11,7 +11,7 @@ phar.readonly=0 try { for ($i = 0; $i < 2; $i++) { $fname = "DataArchive.phar"; - $path = dirname(__FILE__) . DIRECTORY_SEPARATOR . $fname; + $path = __DIR__ . DIRECTORY_SEPARATOR . $fname; $phar = new Phar($path); $phar->addFromString($i, "file $i in $fname"); var_dump(file_get_contents($phar[$i])); diff --git a/ext/phar/tests/bug45218_SLOWTEST.phpt b/ext/phar/tests/bug45218_SLOWTEST.phpt index 28db3de7b5..c71a2be618 100644 --- a/ext/phar/tests/bug45218_SLOWTEST.phpt +++ b/ext/phar/tests/bug45218_SLOWTEST.phpt @@ -10,8 +10,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.txt'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.txt'; file_put_contents($fname2, 'a'); class myIterator implements Iterator { @@ -39,7 +39,7 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); + chdir(__DIR__); $phar = new Phar($fname); $ret = $phar->buildFromIterator(new myIterator); foreach ($ret as $a => $val) { @@ -54,8 +54,8 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.txt'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.txt'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/bug46032.phpt b/ext/phar/tests/bug46032.phpt index 57f3fc2daf..a20e95d3ed 100644 --- a/ext/phar/tests/bug46032.phpt +++ b/ext/phar/tests/bug46032.phpt @@ -6,7 +6,7 @@ Phar: bug #46032: PharData::__construct wrong memory read --FILE-- <?php -$a = dirname(__FILE__) .'/mytest'; +$a = __DIR__ .'/mytest'; try { new phar($a); diff --git a/ext/phar/tests/bug46060.phpt b/ext/phar/tests/bug46060.phpt index e4ecf9fd6e..02a4a7e867 100644 --- a/ext/phar/tests/bug46060.phpt +++ b/ext/phar/tests/bug46060.phpt @@ -7,8 +7,8 @@ Phar: Bug #46060: addEmptyDir() breaks 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'; $phar = new PharData($fname); $phar->addEmptyDir('blah/'); @@ -22,8 +22,8 @@ var_dump($phar['blah']->isDir(), $phar['test']->isDir()); ===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'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/bug46178.phpt b/ext/phar/tests/bug46178.phpt index 1496ae1c33..0bb8a2df21 100644 --- a/ext/phar/tests/bug46178.phpt +++ b/ext/phar/tests/bug46178.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $phar = new Phar($fname); $phar['long/path/name.txt'] = 'hi'; @@ -15,6 +15,6 @@ $phar->addEmptyDir('long/path'); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');?> --EXPECT-- ===DONE=== diff --git a/ext/phar/tests/bug47085.phpt b/ext/phar/tests/bug47085.phpt index 5c2504f675..d1fcf506f6 100644 --- a/ext/phar/tests/bug47085.phpt +++ b/ext/phar/tests/bug47085.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $phar = new Phar($fname, 0, 'a.phar'); $phar['x'] = 'hi'; @@ -17,7 +17,7 @@ var_dump(rename("phar://a.phar/x", "phar://a.phar/y")); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');?> --EXPECTF-- Warning: rename(): phar error: cannot rename "phar://a.phar/x" to "phar://a.phar/y" from extracted phar archive, source does not exist in %sbug47085.php on line %d bool(false) diff --git a/ext/phar/tests/bug48377.2.phpt b/ext/phar/tests/bug48377.2.phpt index 380f3e381f..130aaa8646 100644 --- a/ext/phar/tests/bug48377.2.phpt +++ b/ext/phar/tests/bug48377.2.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.zip'; $phar = new PharData($fname); $phar['x'] = 'hi'; @@ -19,7 +19,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.zip');?> --EXPECTF-- data phar "%sbug48377.2.phar.zip" has invalid extension phar.zip ===DONE=== diff --git a/ext/phar/tests/bug48377.phpt b/ext/phar/tests/bug48377.phpt index f466ea4532..6c16654ef1 100644 --- a/ext/phar/tests/bug48377.phpt +++ b/ext/phar/tests/bug48377.phpt @@ -7,8 +7,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.zip'; touch($fname2); @@ -22,8 +22,8 @@ try { ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.zip');?> --EXPECTF-- phar "%sbug48377.zip" exists and must be unlinked prior to conversion ===DONE=== diff --git a/ext/phar/tests/bug52013.phpt b/ext/phar/tests/bug52013.phpt index 5ee37e7d4e..12f1ae2500 100644 --- a/ext/phar/tests/bug52013.phpt +++ b/ext/phar/tests/bug52013.phpt @@ -16,11 +16,11 @@ phar.readonly=0 open_basedir= --FILE-- <?php -mkdir(dirname(__FILE__) . '/testdir'); -file_put_contents(dirname(__FILE__) . '/testdir/1.php', str_repeat(' ', 1455)); +mkdir(__DIR__ . '/testdir'); +file_put_contents(__DIR__ . '/testdir/1.php', str_repeat(' ', 1455)); -$phar = new Phar(dirname(__FILE__) . '/compressed.phar'); -$phar->buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.php$/'); +$phar = new Phar(__DIR__ . '/compressed.phar'); +$phar->buildFromDirectory(__DIR__ . '/testdir', '/\.php$/'); $phar->setSignatureAlgorithm(Phar::SHA1); $phar->compressFiles(Phar::GZ); $phar->decompressFiles(); @@ -29,12 +29,12 @@ echo 'ok'; ?> --CLEAN-- <?php -if (is_file(dirname(__FILE__) . '/testdir/1.php')) - unlink(dirname(__FILE__) . '/testdir/1.php'); -if (is_dir(dirname(__FILE__) . '/testdir')) - rmdir(dirname(__FILE__) . '/testdir'); -if (is_file(dirname(__FILE__) . '/compressed.phar')) - unlink(dirname(__FILE__) . '/compressed.phar'); +if (is_file(__DIR__ . '/testdir/1.php')) + unlink(__DIR__ . '/testdir/1.php'); +if (is_dir(__DIR__ . '/testdir')) + rmdir(__DIR__ . '/testdir'); +if (is_file(__DIR__ . '/compressed.phar')) + unlink(__DIR__ . '/compressed.phar'); ?> --EXPECT-- ok diff --git a/ext/phar/tests/bug69324.phpt b/ext/phar/tests/bug69324.phpt index 7768ffbd66..b3311c8651 100644 --- a/ext/phar/tests/bug69324.phpt +++ b/ext/phar/tests/bug69324.phpt @@ -7,7 +7,7 @@ if (!extension_loaded("phar")) die("skip"); --FILE-- <?php try { -$p = new Phar(dirname(__FILE__).'/bug69324.phar', 0); +$p = new Phar(__DIR__.'/bug69324.phar', 0); $meta=$p->getMetadata(); var_dump($meta); } catch(Exception $e) { diff --git a/ext/phar/tests/bug69441.phpt b/ext/phar/tests/bug69441.phpt index 3536c3a835..91e2dcf146 100644 --- a/ext/phar/tests/bug69441.phpt +++ b/ext/phar/tests/bug69441.phpt @@ -4,7 +4,7 @@ Phar: bug #69441: Buffer Overflow when parsing tar/zip/phar in phar_set_inode <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php -$fname = dirname(__FILE__) . '/bug69441.phar'; +$fname = __DIR__ . '/bug69441.phar'; try { $r = new Phar($fname, 0); } catch(UnexpectedValueException $e) { diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt index 6f280a5351..3309d367c6 100644 --- a/ext/phar/tests/bug69453.phpt +++ b/ext/phar/tests/bug69453.phpt @@ -4,7 +4,7 @@ Phar: bug #69453: Memory Corruption in phar_parse_tarfile when entry filename st <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php -$fname = dirname(__FILE__) . '/bug69453.tar.phar'; +$fname = __DIR__ . '/bug69453.tar.phar'; try { $r = new Phar($fname, 0); } catch(UnexpectedValueException $e) { diff --git a/ext/phar/tests/bug74196.phpt b/ext/phar/tests/bug74196.phpt index 4cd238d654..54b9eeb557 100644 --- a/ext/phar/tests/bug74196.phpt +++ b/ext/phar/tests/bug74196.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.2.3.phar.tar.gz'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.2.3.phar.tar.gz'; $decompressed_name = str_replace( ".gz", "", $fname); var_dump(file_exists($fname)); diff --git a/ext/phar/tests/cache_list/copyonwrite4a.phpt b/ext/phar/tests/cache_list/copyonwrite4a.phpt index 039113288b..948edced47 100644 --- a/ext/phar/tests/cache_list/copyonwrite4a.phpt +++ b/ext/phar/tests/cache_list/copyonwrite4a.phpt @@ -8,9 +8,9 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php -var_dump(file_exists('phar://' . dirname(__FILE__) . '/files/write4.phar/testit.txt')); -Phar::mount('phar://' . dirname(__FILE__) . '/files/write4.phar/testit.txt', 'phar://' . dirname(__FILE__) . '/files/write4.phar/tobemounted'); -var_dump(file_exists('phar://' . dirname(__FILE__) . '/files/write4.phar/testit.txt'), file_get_contents('phar://' . dirname(__FILE__) . '/files/write4.phar/testit.txt')); +var_dump(file_exists('phar://' . __DIR__ . '/files/write4.phar/testit.txt')); +Phar::mount('phar://' . __DIR__ . '/files/write4.phar/testit.txt', 'phar://' . __DIR__ . '/files/write4.phar/tobemounted'); +var_dump(file_exists('phar://' . __DIR__ . '/files/write4.phar/testit.txt'), file_get_contents('phar://' . __DIR__ . '/files/write4.phar/testit.txt')); ?> ===DONE=== --EXPECT-- diff --git a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt index 3ca835ae5f..60d42f965c 100644 --- a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt @@ -10,9 +10,9 @@ phar.readonly=0 files/write5.phar --CLEAN-- <?php -unlink(dirname(__FILE__) . '/copyonwrite5/file1'); -unlink(dirname(__FILE__) . '/copyonwrite5/file2'); -rmdir(dirname(__FILE__) . '/copyonwrite5'); +unlink(__DIR__ . '/copyonwrite5/file1'); +unlink(__DIR__ . '/copyonwrite5/file2'); +rmdir(__DIR__ . '/copyonwrite5'); ?> --EXPECTF-- array(2) { diff --git a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt index 6d6d56187e..3b9708341f 100644 --- a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt @@ -11,9 +11,9 @@ open_basedir= files/write6.phar --CLEAN-- <?php -unlink(dirname(__FILE__) . '/copyonwrite6/file1'); -unlink(dirname(__FILE__) . '/copyonwrite6/file2'); -rmdir(dirname(__FILE__) . '/copyonwrite6'); +unlink(__DIR__ . '/copyonwrite6/file1'); +unlink(__DIR__ . '/copyonwrite6/file2'); +rmdir(__DIR__ . '/copyonwrite6'); ?> --EXPECTF-- array(2) { diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt index 029ea7a53f..f363eb8ba3 100644 --- a/ext/phar/tests/create_new_and_modify.phpt +++ b/ext/phar/tests/create_new_and_modify.phpt @@ -8,7 +8,7 @@ phar.require_hash=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; @unlink($fname); @@ -44,7 +44,7 @@ include $pname . '/b.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- brand new! string(40) "%s" diff --git a/ext/phar/tests/create_new_phar.phpt b/ext/phar/tests/create_new_phar.phpt index 26794095e1..79724b9b74 100644 --- a/ext/phar/tests/create_new_phar.phpt +++ b/ext/phar/tests/create_new_phar.phpt @@ -8,19 +8,19 @@ phar.require_hash=1 --FILE-- <?php -file_put_contents('phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/a.php', +file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php', "brand new!\n"); -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; $fileName = "ChineseFile\xE5\x84\xB7\xE9\xBB\x91.php"; -file_put_contents('phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/$fileName.php', +file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/$fileName.php', 'Text in utf8 file.'); -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/$fileName.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/$fileName.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- brand new! Text in utf8 file. diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt index 91e22270c6..8b0d6e26dc 100644 --- a/ext/phar/tests/create_new_phar_b.phpt +++ b/ext/phar/tests/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.php/a.php', +file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php', 'brand new!'); -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/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/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt index d32f758f93..19a4c81751 100644 --- a/ext/phar/tests/create_new_phar_c.phpt +++ b/ext/phar/tests/create_new_phar_c.phpt @@ -8,16 +8,16 @@ phar.require_hash=1 --FILE-- <?php -file_put_contents('phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/a.php', +file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php', 'brand new!'); -$phar = new Phar(dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'); +$phar = new Phar(__DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'); var_dump($phar->getSignature()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- array(2) { ["hash"]=> diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index c10d19c711..4987c19b17 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -8,7 +8,7 @@ phar.require_hash=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; @unlink($fname); @@ -62,7 +62,7 @@ foreach($checks as $check) ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- string(5) "query" string(5) "query" diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt index 46a4e23817..56559777d7 100644 --- a/ext/phar/tests/delete.phpt +++ b/ext/phar/tests/delete.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -24,7 +24,7 @@ $phar->delete('a'); echo file_get_contents($pname . '/a') . "\n"; ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- a diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt index c7f8e82403..6644030936 100644 --- a/ext/phar/tests/delete_in_phar.phpt +++ b/ext/phar/tests/delete_in_phar.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -40,7 +40,7 @@ include $pname . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/delete_in_phar_b.phpt b/ext/phar/tests/delete_in_phar_b.phpt index a6d5b3a35e..8d5d78debc 100644 --- a/ext/phar/tests/delete_in_phar_b.phpt +++ b/ext/phar/tests/delete_in_phar_b.phpt @@ -7,7 +7,7 @@ phar.readonly=1 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -31,7 +31,7 @@ include $pname . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt index 0d4eb1e2aa..2596e06462 100644 --- a/ext/phar/tests/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/delete_in_phar_confirm.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -37,14 +37,14 @@ if ($md5 == $md52) echo 'file was not modified'; ?> ===AFTER=== <?php -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/b.php'; -include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php/b/c.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/b.php'; +include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- This is a This is b diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt index 5740d60f87..c34f01a7f1 100644 --- a/ext/phar/tests/dir.phpt +++ b/ext/phar/tests/dir.phpt @@ -7,11 +7,11 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.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::PHAR)); @@ -32,17 +32,17 @@ ini_set('phar.readonly', 1); mkdir($pname . '/fails'); ini_set('phar.readonly', 0); // create new phar by mkdir -mkdir('phar://' . dirname(__FILE__) . '/ok.phar/fails'); -mkdir('phar://' . dirname(__FILE__) . '/ok.phar/fails'); -file_put_contents('phar://' . dirname(__FILE__) . '/ok.phar/sub/directory.txt', 'hi'); -mkdir('phar://' . dirname(__FILE__) . '/ok.phar/sub'); -mkdir('phar://' . dirname(__FILE__) . '/ok.phar/sub/directory.txt'); -file_put_contents(dirname(__FILE__) . '/oops.phar', '<?php this should screw em up __HALT_COMPILER();'); -mkdir('phar://' . dirname(__FILE__) . '/oops.phar/fails'); +mkdir('phar://' . __DIR__ . '/ok.phar/fails'); +mkdir('phar://' . __DIR__ . '/ok.phar/fails'); +file_put_contents('phar://' . __DIR__ . '/ok.phar/sub/directory.txt', 'hi'); +mkdir('phar://' . __DIR__ . '/ok.phar/sub'); +mkdir('phar://' . __DIR__ . '/ok.phar/sub/directory.txt'); +file_put_contents(__DIR__ . '/oops.phar', '<?php this should screw em up __HALT_COMPILER();'); +mkdir('phar://' . __DIR__ . '/oops.phar/fails'); mkdir('phar://'); rmdir('phar://'); -rmdir('phar://' . dirname(__FILE__) . '/unknown.phar/hi'); +rmdir('phar://' . __DIR__ . '/unknown.phar/hi'); ini_set('phar.readonly', 1); rmdir($pname . '/another/dir'); ini_set('phar.readonly', 0); @@ -52,11 +52,11 @@ mkdir($pname . '/'); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/ok.phar'); ?> -<?php unlink(dirname(__FILE__) . '/oops.phar'); ?> -<?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.php'); ?> +<?php unlink(__DIR__ . '/ok.phar'); ?> +<?php unlink(__DIR__ . '/oops.phar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> --EXPECTF-- bool(true) bool(true) diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index d061cf3c91..426b5f434d 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -11,7 +11,7 @@ phar.readonly=0 Phar::interceptFileFuncs(); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; try { @@ -19,7 +19,7 @@ try { } catch (TypeError $e) { echo $e->getMessage(), "\n"; } -chdir(dirname(__FILE__)); +chdir(__DIR__); file_put_contents($fname, "blah\n"); file_put_contents("foob", "test\n"); echo file_get_contents($fname); @@ -31,7 +31,7 @@ echo file_get_contents("foo/" . basename(__FILE__)); $context = stream_context_create(); file_get_contents("./hi", 0, $context, 0, -1); echo file_get_contents("foob"); -set_include_path("' . addslashes(dirname(__FILE__)) . '"); +set_include_path("' . addslashes(__DIR__) . '"); echo file_get_contents("foob", true); echo file_get_contents("./hi", 0, $context); echo file_get_contents("../oops"); @@ -46,9 +46,9 @@ include $pname . '/foo/hi'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php rmdir(dirname(__FILE__) . '/poo'); ?> -<?php unlink(dirname(__FILE__) . '/foob'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php rmdir(__DIR__ . '/poo'); ?> +<?php unlink(__DIR__ . '/foob'); ?> --EXPECTF-- file_get_contents() expects parameter 1 to be a valid path, array given blah diff --git a/ext/phar/tests/file_get_contents.phpt b/ext/phar/tests/file_get_contents.phpt index 24d6e48723..2ac211abc3 100644 --- a/ext/phar/tests/file_get_contents.phpt +++ b/ext/phar/tests/file_get_contents.phpt @@ -7,7 +7,7 @@ phar.require_hash=1 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $a = new Phar($fname); $a['index.php'] = '<?php echo file_get_contents("dir/file1.txt"); @@ -25,6 +25,6 @@ include $fname; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- hihi===DONE=== diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt index 9f9022cc8d..42175bc037 100644 --- a/ext/phar/tests/fopen.phpt +++ b/ext/phar/tests/fopen.phpt @@ -11,7 +11,7 @@ Phar::interceptFileFuncs(); $a = fopen(__FILE__, 'rb'); // this satisfies 1 line of code coverage fclose($a); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $a = new Phar($fname); $a['index.php'] = '<?php $a = fopen("dir/file1.txt", "r"); @@ -33,7 +33,7 @@ include $fname; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- hihi Warning: fopen(notfound.txt): failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt index 7af8451f8f..5dce0384ff 100644 --- a/ext/phar/tests/fopen_edgecases.phpt +++ b/ext/phar/tests/fopen_edgecases.phpt @@ -7,15 +7,15 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.php'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.3.phar.php'; $pname = 'phar://' . $fname; $pname2 = 'phar://' . $fname2; $pname3 = 'phar://' . $fname3; // create in cwd -chdir(dirname(__FILE__)); +chdir(__DIR__); file_put_contents('phar://fopen_edgetest.phar/hi', 'hi'); // append $a = fopen($pname . '/b/c.php', 'a'); @@ -68,9 +68,9 @@ include $pname . '/test.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/fopen_edgetest.phar'); +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> +<?php unlink(__DIR__ . '/fopen_edgetest.phar'); --EXPECTF-- Warning: fopen(phar://%sfopen_edgecases.phar.php/b/c.php): failed to open stream: phar error: open mode append not supported in %sfopen_edgecases.php on line %d diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index 2c70e17352..c71b90b84c 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php Phar::interceptFileFuncs(); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; try { @@ -15,7 +15,7 @@ try { } catch (TypeError $e) { echo $e->getMessage(), "\n"; } -chdir(dirname(__FILE__)); +chdir(__DIR__); file_put_contents($fname, "blah\n"); file_put_contents("foob", "test\n"); $a = fopen($fname, 'rb'); @@ -35,9 +35,9 @@ include $pname . '/foo/hi'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php rmdir(dirname(__FILE__) . '/poo'); ?> -<?php unlink(dirname(__FILE__) . '/foob'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php rmdir(__DIR__ . '/poo'); ?> +<?php unlink(__DIR__ . '/foob'); ?> --EXPECTF-- fopen() expects parameter 1 to be a valid path, array given blah diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt index 4041ae2c20..1ee1ec77d5 100644 --- a/ext/phar/tests/include_path.phpt +++ b/ext/phar/tests/include_path.phpt @@ -6,7 +6,7 @@ Phar: include_path with phar:// wrapper phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/tempmanifest1.phar.php'; +$fname = __DIR__ . '/tempmanifest1.phar.php'; $a = new Phar($fname); $a['file1.php'] = 'file1.php '; @@ -22,7 +22,7 @@ include 'file2.php'; ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tempmanifest1.phar.php'); +@unlink(__DIR__ . '/tempmanifest1.phar.php'); ?> --EXPECTF-- file1.php diff --git a/ext/phar/tests/invalid_alias.phpt b/ext/phar/tests/invalid_alias.phpt index 97ebe0fe1a..7a3cb31575 100644 --- a/ext/phar/tests/invalid_alias.phpt +++ b/ext/phar/tests/invalid_alias.phpt @@ -6,7 +6,7 @@ Phar: set alias with invalid alias containing / \ : or ; phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $p = new Phar($fname); try { @@ -35,7 +35,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- Invalid alias "hi/" specified for phar "%sinvalid_alias.phar" diff --git a/ext/phar/tests/invalid_setstubalias.phpt b/ext/phar/tests/invalid_setstubalias.phpt index 86fa6e7f78..6234df1bff 100644 --- a/ext/phar/tests/invalid_setstubalias.phpt +++ b/ext/phar/tests/invalid_setstubalias.phpt @@ -6,8 +6,8 @@ Phar: invalid set alias or stub via array access phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; $p = new Phar($fname); try { @@ -36,8 +36,8 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.tar", use setStub diff --git a/ext/phar/tests/metadata_read.phpt b/ext/phar/tests/metadata_read.phpt index 638653ecca..2e23af2a4a 100644 --- a/ext/phar/tests/metadata_read.phpt +++ b/ext/phar/tests/metadata_read.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -36,7 +36,7 @@ foreach($files as $name => $cont) { ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" string(1) "b" diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt index 23986fbd36..1dea6dfac2 100644 --- a/ext/phar/tests/metadata_write.phpt +++ b/ext/phar/tests/metadata_write.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -42,7 +42,7 @@ foreach($files as $name => $cont) { ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" string(1) "b" diff --git a/ext/phar/tests/metadata_write_commit.phpt b/ext/phar/tests/metadata_write_commit.phpt index 35e1bd72dd..def84b06f9 100644 --- a/ext/phar/tests/metadata_write_commit.phpt +++ b/ext/phar/tests/metadata_write_commit.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -50,7 +50,7 @@ foreach($files as $name => $cont) { ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" string(1) "b" diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt index ca8de30860..32081b145d 100644 --- a/ext/phar/tests/mkdir.phpt +++ b/ext/phar/tests/mkdir.phpt @@ -6,7 +6,7 @@ phar: mkdir/rmdir edge cases phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; Phar::interceptFileFuncs(); mkdir('phar://'); @@ -28,7 +28,7 @@ echo $e->getMessage(),"\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt index 3620f1ee66..80c8f7d0ee 100644 --- a/ext/phar/tests/mounteddir.phpt +++ b/ext/phar/tests/mounteddir.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("phar")) die("skip"); phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/tempmanifest1.phar.php'; +$fname = __DIR__ . '/tempmanifest1.phar.php'; $pname = 'phar://' . $fname; $a = new Phar($fname); @@ -31,15 +31,15 @@ set_include_path("phar://" . __FILE__); include "index.php"; __HALT_COMPILER();'); unset($a); -mkdir(dirname(__FILE__) . '/testit'); -mkdir(dirname(__FILE__) . '/testit/directory'); -file_put_contents(dirname(__FILE__) . '/testit/extfile.php', '<?php +mkdir(__DIR__ . '/testit'); +mkdir(__DIR__ . '/testit/directory'); +file_put_contents(__DIR__ . '/testit/extfile.php', '<?php var_dump(__FILE__); ?>'); -file_put_contents(dirname(__FILE__) . '/testit/extfile2.php', '<?php +file_put_contents(__DIR__ . '/testit/extfile2.php', '<?php var_dump(__FILE__); ?>'); -include dirname(__FILE__) . '/testit/extfile.php'; +include __DIR__ . '/testit/extfile.php'; include $fname; $a = opendir($pname . '/testit'); @@ -65,17 +65,17 @@ Phar::mount($pname . '/testit', 'another\\..\\mistake'); echo $e->getMessage(), "\n"; } try { -Phar::mount($pname . '/notfound', dirname(__FILE__) . '/this/does/not/exist'); +Phar::mount($pname . '/notfound', __DIR__ . '/this/does/not/exist'); } catch (Exception $e) { echo $e->getMessage(), "\n"; } try { -Phar::mount($pname . '/testit', dirname(__FILE__)); +Phar::mount($pname . '/testit', __DIR__); } catch (Exception $e) { echo $e->getMessage(), "\n"; } try { -Phar::mount($pname . '/testit/extfile.php', dirname(__FILE__)); +Phar::mount($pname . '/testit/extfile.php', __DIR__); } catch (Exception $e) { echo $e->getMessage(), "\n"; } @@ -83,11 +83,11 @@ echo $e->getMessage(), "\n"; ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tempmanifest1.phar.php'); -@unlink(dirname(__FILE__) . '/testit/extfile.php'); -@unlink(dirname(__FILE__) . '/testit/extfile2.php'); -@rmdir(dirname(__FILE__) . '/testit/directory'); -@rmdir(dirname(__FILE__) . '/testit'); +@unlink(__DIR__ . '/tempmanifest1.phar.php'); +@unlink(__DIR__ . '/testit/extfile.php'); +@unlink(__DIR__ . '/testit/extfile2.php'); +@rmdir(__DIR__ . '/testit/directory'); +@rmdir(__DIR__ . '/testit'); ?> --EXPECTF-- diff --git a/ext/phar/tests/nophar.phpt b/ext/phar/tests/nophar.phpt index 0534c17cd9..e9cff950f4 100644 --- a/ext/phar/tests/nophar.phpt +++ b/ext/phar/tests/nophar.phpt @@ -4,7 +4,7 @@ Phar: phar run without ext/phar with default stub <?php if (extension_loaded("phar")) die("skip Phar extension must be disabled for this test"); ?> --FILE-- <?php -include dirname(__FILE__) . '/files/nophar.phar'; +include __DIR__ . '/files/nophar.phar'; ?> ===DONE=== --EXPECT-- diff --git a/ext/phar/tests/open_for_write_existing.phpt b/ext/phar/tests/open_for_write_existing.phpt index e9e2c05b9e..e1648568e0 100644 --- a/ext/phar/tests/open_for_write_existing.phpt +++ b/ext/phar/tests/open_for_write_existing.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -25,7 +25,7 @@ include $pname . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- extra ===DONE=== diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt index edd5a65048..16b9d0cbbe 100644 --- a/ext/phar/tests/open_for_write_existing_b.phpt +++ b/ext/phar/tests/open_for_write_existing_b.phpt @@ -9,7 +9,7 @@ phar.readonly=1 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -24,7 +24,7 @@ include $pname . '/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/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/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt index 5c389956fa..4eee2ea25f 100644 --- a/ext/phar/tests/open_for_write_existing_c.phpt +++ b/ext/phar/tests/open_for_write_existing_c.phpt @@ -9,7 +9,7 @@ phar.readonly=1 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -24,7 +24,7 @@ include $pname . '/b/c.php'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/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/open_for_write_newfile.phpt b/ext/phar/tests/open_for_write_newfile.phpt index 13114072da..bd54a13397 100644 --- a/ext/phar/tests/open_for_write_newfile.phpt +++ b/ext/phar/tests/open_for_write_newfile.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -26,7 +26,7 @@ include $pname . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is b/c extra diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt index 775b90b1bb..576388eb2d 100644 --- a/ext/phar/tests/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/open_for_write_newfile_b.phpt @@ -9,7 +9,7 @@ phar.readonly=1 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -26,7 +26,7 @@ include $pname . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/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/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt index 2b313ebf90..0eb70d63e5 100644 --- a/ext/phar/tests/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/open_for_write_newfile_c.phpt @@ -9,7 +9,7 @@ phar.readonly=1 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -26,7 +26,7 @@ include $pname . '/b/new.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/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/opendir.phpt b/ext/phar/tests/opendir.phpt index 0bde7dbff7..2f5f6635d7 100644 --- a/ext/phar/tests/opendir.phpt +++ b/ext/phar/tests/opendir.phpt @@ -7,7 +7,7 @@ phar.require_hash=1 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $a = new Phar($fname); $a['index.php'] = '<?php $a = opendir("dir"); @@ -32,7 +32,7 @@ opendir('phar://hi.phar'); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- file1.txtfile2.txtfile3.txt diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index 68ea62d3c3..6270eac224 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -9,7 +9,7 @@ phar.readonly=0 Phar::interceptFileFuncs(); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; try { @@ -18,8 +18,8 @@ try { echo $e->getMessage(), "\n"; } -mkdir(dirname(__FILE__) . '/poo'); -chdir(dirname(__FILE__)); +mkdir(__DIR__ . '/poo'); +chdir(__DIR__); $a = opendir('poo'); @@ -53,8 +53,8 @@ include $pname . '/foo'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php rmdir(dirname(__FILE__) . '/poo'); +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php rmdir(__DIR__ . '/poo'); --EXPECTF-- opendir() expects parameter 1 to be a valid path, array given . diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt index ed257f2c52..fffef0bdbf 100644 --- a/ext/phar/tests/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/phar_begin_setstub_commit.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$p = new Phar(dirname(__FILE__) . '/phar_begin_setstub_commit.phar', 0, 'phar_begin_setstub_commit.phar'); +$p = new Phar(__DIR__ . '/phar_begin_setstub_commit.phar', 0, 'phar_begin_setstub_commit.phar'); //var_dump($p->getStub()); var_dump($p->isBuffering()); $p->startBuffering(); @@ -32,7 +32,7 @@ var_dump($p->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_begin_setstub_commit.phar'); +unlink(__DIR__ . '/phar_begin_setstub_commit.phar'); ?> --EXPECTF-- bool(false) diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt index 93fdf2922d..b7f7338e23 100644 --- a/ext/phar/tests/phar_buildfromdirectory1.phpt +++ b/ext/phar/tests/phar_buildfromdirectory1.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory1.phar'); +$phar = new Phar(__DIR__ . '/buildfromdirectory1.phar'); try { ini_set('phar.readonly', 1); $phar->buildFromDirectory(1); @@ -19,7 +19,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromdirectory1.phar'); +unlink(__DIR__ . '/buildfromdirectory1.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt index b49b78d7c8..49361bceb0 100644 --- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt @@ -11,7 +11,7 @@ phar.readonly=0 --FILE-- <?php try { - $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory2.phar'); + $phar = new Phar(__DIR__ . '/buildfromdirectory2.phar'); $phar->buildFromDirectory(1); } catch (Exception $e) { var_dump(get_class($e)); @@ -21,7 +21,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromdirectory2.phar'); +unlink(__DIR__ . '/buildfromdirectory2.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt index c98e8c2ffe..0105d1967c 100644 --- a/ext/phar/tests/phar_buildfromdirectory2.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2.phpt @@ -11,7 +11,7 @@ phar.readonly=0 --FILE-- <?php try { - $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory2.phar'); + $phar = new Phar(__DIR__ . '/buildfromdirectory2.phar'); $phar->buildFromDirectory(1); } catch (Exception $e) { var_dump(get_class($e)); @@ -21,7 +21,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromdirectory2.phar'); +unlink(__DIR__ . '/buildfromdirectory2.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromdirectory4.phpt b/ext/phar/tests/phar_buildfromdirectory4.phpt index 16072ef8f7..610e67719a 100644 --- a/ext/phar/tests/phar_buildfromdirectory4.phpt +++ b/ext/phar/tests/phar_buildfromdirectory4.phpt @@ -9,14 +9,14 @@ open_basedir= --FILE-- <?php -mkdir(dirname(__FILE__).'/testdir4'); +mkdir(__DIR__.'/testdir4'); foreach(range(1, 4) as $i) { - file_put_contents(dirname(__FILE__)."/testdir4/file$i.txt", "some content for file $i"); + file_put_contents(__DIR__."/testdir4/file$i.txt", "some content for file $i"); } try { - $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory4.phar'); - $a = $phar->buildFromDirectory(dirname(__FILE__) . '/testdir4'); + $phar = new Phar(__DIR__ . '/buildfromdirectory4.phar'); + $a = $phar->buildFromDirectory(__DIR__ . '/testdir4'); asort($a); var_dump($a); } catch (Exception $e) { @@ -24,17 +24,17 @@ try { echo $e->getMessage() . "\n"; } -var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory4.phar')); +var_dump(file_exists(__DIR__ . '/buildfromdirectory4.phar')); ?> ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromdirectory4.phar'); +unlink(__DIR__ . '/buildfromdirectory4.phar'); foreach(range(1, 4) as $i) { - unlink(dirname(__FILE__) . "/testdir4/file$i.txt"); + unlink(__DIR__ . "/testdir4/file$i.txt"); } -rmdir(dirname(__FILE__) . '/testdir4'); +rmdir(__DIR__ . '/testdir4'); ?> --EXPECTF-- array(4) { diff --git a/ext/phar/tests/phar_buildfromdirectory5.phpt b/ext/phar/tests/phar_buildfromdirectory5.phpt index 6056750669..b7434968a4 100644 --- a/ext/phar/tests/phar_buildfromdirectory5.phpt +++ b/ext/phar/tests/phar_buildfromdirectory5.phpt @@ -8,14 +8,14 @@ phar.readonly=0 --FILE-- <?php -mkdir(dirname(__FILE__).'/testdir5'); +mkdir(__DIR__.'/testdir5'); foreach(range(1, 4) as $i) { - file_put_contents(dirname(__FILE__)."/testdir5/file$i.txt", "some content for file $i"); + file_put_contents(__DIR__."/testdir5/file$i.txt", "some content for file $i"); } try { - $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory5.phar'); - $a = $phar->buildFromDirectory(dirname(__FILE__) . '/testdir5', '/\.txt/'); + $phar = new Phar(__DIR__ . '/buildfromdirectory5.phar'); + $a = $phar->buildFromDirectory(__DIR__ . '/testdir5', '/\.txt/'); asort($a); var_dump($a); } catch (Exception $e) { @@ -23,17 +23,17 @@ try { echo $e->getMessage() . "\n"; } -var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory5.phar')); +var_dump(file_exists(__DIR__ . '/buildfromdirectory5.phar')); ?> ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromdirectory5.phar'); +unlink(__DIR__ . '/buildfromdirectory5.phar'); foreach(range(1, 4) as $i) { - unlink(dirname(__FILE__) . "/testdir5/file$i.txt"); + unlink(__DIR__ . "/testdir5/file$i.txt"); } -rmdir(dirname(__FILE__) . '/testdir5'); +rmdir(__DIR__ . '/testdir5'); ?> --EXPECTF-- array(4) { diff --git a/ext/phar/tests/phar_buildfromdirectory6.phpt b/ext/phar/tests/phar_buildfromdirectory6.phpt index 5015ce42bd..1d3491e659 100644 --- a/ext/phar/tests/phar_buildfromdirectory6.phpt +++ b/ext/phar/tests/phar_buildfromdirectory6.phpt @@ -8,30 +8,30 @@ phar.readonly=0 --FILE-- <?php -mkdir(dirname(__FILE__).'/testdir6', 0777); +mkdir(__DIR__.'/testdir6', 0777); foreach(range(1, 4) as $i) { - file_put_contents(dirname(__FILE__)."/testdir6/file$i.txt", "some content for file $i"); + file_put_contents(__DIR__."/testdir6/file$i.txt", "some content for file $i"); } try { - $phar = new Phar(dirname(__FILE__) . '/buildfromdirectory6.phar'); - var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir6', '/\.php$/')); + $phar = new Phar(__DIR__ . '/buildfromdirectory6.phar'); + var_dump($phar->buildFromDirectory(__DIR__ . '/testdir6', '/\.php$/')); } catch (Exception $e) { var_dump(get_class($e)); echo $e->getMessage() . "\n"; } -var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory6.phar')); +var_dump(file_exists(__DIR__ . '/buildfromdirectory6.phar')); ?> ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromdirectory6.phar'); +unlink(__DIR__ . '/buildfromdirectory6.phar'); foreach(range(1, 4) as $i) { - unlink(dirname(__FILE__) . "/testdir6/file$i.txt"); + unlink(__DIR__ . "/testdir6/file$i.txt"); } -rmdir(dirname(__FILE__) . '/testdir6'); +rmdir(__DIR__ . '/testdir6'); ?> --EXPECT-- array(0) { diff --git a/ext/phar/tests/phar_buildfromiterator1.phpt b/ext/phar/tests/phar_buildfromiterator1.phpt index 7a67ea7073..774ef658fa 100644 --- a/ext/phar/tests/phar_buildfromiterator1.phpt +++ b/ext/phar/tests/phar_buildfromiterator1.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$phar = new Phar(dirname(__FILE__) . '/buildfromiterator1.phar'); +$phar = new Phar(__DIR__ . '/buildfromiterator1.phar'); try { ini_set('phar.readonly', 1); $phar->buildFromIterator(1); @@ -19,7 +19,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator1.phar'); +unlink(__DIR__ . '/buildfromiterator1.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt index 69c2704c3f..7b7eca0e6f 100644 --- a/ext/phar/tests/phar_buildfromiterator10.phpt +++ b/ext/phar/tests/phar_buildfromiterator10.phpt @@ -10,11 +10,11 @@ phar.readonly=0 --FILE-- <?php try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator10.phar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator10.phar'); $dir = new RecursiveDirectoryIterator('.'); $iter = new RecursiveIteratorIterator($dir); - $a = $phar->buildFromIterator(new RegexIterator($iter, '/_\d{3}\.phpt$/'), dirname(__FILE__) . DIRECTORY_SEPARATOR); + $a = $phar->buildFromIterator(new RegexIterator($iter, '/_\d{3}\.phpt$/'), __DIR__ . DIRECTORY_SEPARATOR); asort($a); var_dump($a); } catch (Exception $e) { @@ -25,7 +25,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator10.phar'); +unlink(__DIR__ . '/buildfromiterator10.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromiterator4.phpt b/ext/phar/tests/phar_buildfromiterator4.phpt index 9268d033f2..fc42d77d4e 100644 --- a/ext/phar/tests/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/phar_buildfromiterator4.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator4.phar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator4.phar'); var_dump($phar->buildFromIterator(new myIterator( array( 'a' => basename(__FILE__, 'php') . 'phpt', @@ -54,7 +54,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator4.phar'); +unlink(__DIR__ . '/buildfromiterator4.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt index 0b9bbde3a9..a83e1c0d38 100644 --- a/ext/phar/tests/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/phar_buildfromiterator5.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator5.phar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator5.phar'); 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__) . '/buildfromiterator5.phar'); +unlink(__DIR__ . '/buildfromiterator5.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromiterator6.phpt b/ext/phar/tests/phar_buildfromiterator6.phpt index 7167e5c743..0b99e54611 100644 --- a/ext/phar/tests/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/phar_buildfromiterator6.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator6.phar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator6.phar'); 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__) . '/buildfromiterator6.phar'); +unlink(__DIR__ . '/buildfromiterator6.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromiterator7.phpt b/ext/phar/tests/phar_buildfromiterator7.phpt index 029204fe6f..bc0fa6ee4a 100644 --- a/ext/phar/tests/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/phar_buildfromiterator7.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator7.phar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator7.phar'); 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__) . '/buildfromiterator7.phar'); +unlink(__DIR__ . '/buildfromiterator7.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromiterator8.phpt b/ext/phar/tests/phar_buildfromiterator8.phpt index 783cad2196..cbee1a536a 100644 --- a/ext/phar/tests/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/phar_buildfromiterator8.phpt @@ -7,9 +7,9 @@ phar.readonly=0 --FILE-- <?php try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator8.phar'); - $a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^\d{0,3}\.phpt\\z|^\.\\z|^\.\.\\z/'), dirname(__FILE__) . DIRECTORY_SEPARATOR); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator8.phar'); + $a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^\d{0,3}\.phpt\\z|^\.\\z|^\.\.\\z/'), __DIR__ . DIRECTORY_SEPARATOR); asort($a); var_dump($a); } catch (Exception $e) { @@ -20,7 +20,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/buildfromiterator8.phar'); +unlink(__DIR__ . '/buildfromiterator8.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromiterator9.phpt b/ext/phar/tests/phar_buildfromiterator9.phpt index 04328dca91..28febccf81 100644 --- a/ext/phar/tests/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/phar_buildfromiterator9.phpt @@ -36,8 +36,8 @@ class myIterator implements Iterator } } try { - chdir(dirname(__FILE__)); - $phar = new Phar(dirname(__FILE__) . '/buildfromiterator9.phar'); + chdir(__DIR__); + $phar = new Phar(__DIR__ . '/buildfromiterator9.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__) . '/buildfromiterator9.phar'); +unlink(__DIR__ . '/buildfromiterator9.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt index 7da4c97493..cb8f07ef0b 100644 --- a/ext/phar/tests/phar_bz2.phpt +++ b/ext/phar/tests/phar_bz2.phpt @@ -10,9 +10,9 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/phar_bz2.phar'; +$fname = __DIR__ . '/phar_bz2.phar'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/phar_bz2.2.phar'; +$fname2 = __DIR__ . '/phar_bz2.2.phar'; $pname2 = 'phar://' . $fname2; $file = '<?php @@ -49,8 +49,8 @@ echo $e->getMessage(),"\n"; ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/phar_bz2.phar'); -@unlink(dirname(__FILE__) . '/phar_bz2.2.phar'); +@unlink(__DIR__ . '/phar_bz2.phar'); +@unlink(__DIR__ . '/phar_bz2.2.phar'); ?> --EXPECTF-- string(9) "it worked" diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt index 7a3b5e7b93..9723b2e043 100644 --- a/ext/phar/tests/phar_commitwrite.phpt +++ b/ext/phar/tests/phar_commitwrite.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$p = new Phar(dirname(__FILE__) . '/phar_commitwrite.phar', 0, 'phar_commitwrite.phar'); +$p = new Phar(__DIR__ . '/phar_commitwrite.phar', 0, 'phar_commitwrite.phar'); $p['file1.txt'] = 'hi'; $p->stopBuffering(); var_dump(strlen($p->getStub())); @@ -24,7 +24,7 @@ var_dump($p->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_commitwrite.phar'); +unlink(__DIR__ . '/phar_commitwrite.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_convert_again.phpt b/ext/phar/tests/phar_convert_again.phpt index bbf2c6633a..126e6a64b3 100644 --- a/ext/phar/tests/phar_convert_again.phpt +++ b/ext/phar/tests/phar_convert_again.phpt @@ -10,8 +10,8 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.tbz'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.tbz'; $pname = 'phar://' . $fname; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -155,20 +155,20 @@ echo $e->getMessage() . "\n"; ===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') . '.phar.tar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar.bz2'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.tbz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.tar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar.bz2'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.tbz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.tar.gz'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt index 4ccf84fa6d..94b5bf47ff 100644 --- a/ext/phar/tests/phar_convert_repeated.phpt +++ b/ext/phar/tests/phar_convert_repeated.phpt @@ -8,10 +8,10 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -88,15 +88,15 @@ var_dump($phar->getAlias()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.2.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.2.2.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.2.2.3.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.2.2.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.2.2.3.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar'); ?> --EXPECTF-- =================== new Phar() ======================= diff --git a/ext/phar/tests/phar_convert_repeated_b.phpt b/ext/phar/tests/phar_convert_repeated_b.phpt index 647bb842d7..faa372d071 100644 --- a/ext/phar/tests/phar_convert_repeated_b.phpt +++ b/ext/phar/tests/phar_convert_repeated_b.phpt @@ -8,7 +8,7 @@ phar.readonly=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.zip'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.zip'; echo "=================== new PharData() ==================\n"; $phar = new PharData($fname); @@ -78,14 +78,14 @@ try { ===DONE=== --CLEAN-- <?php -echo dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz' . "\n"; +echo __DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz' . "\n"; -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.2.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.2.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.zip'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt index c3f047d977..5efbe9bed5 100644 --- a/ext/phar/tests/phar_convert_tar.phpt +++ b/ext/phar/tests/phar_convert_tar.phpt @@ -8,10 +8,10 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -40,9 +40,9 @@ var_dump($phar->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt index 7160c52fbb..5b7eb8cc8a 100644 --- a/ext/phar/tests/phar_convert_tar2.phpt +++ b/ext/phar/tests/phar_convert_tar2.phpt @@ -9,10 +9,10 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.gz'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.gz'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -44,10 +44,10 @@ var_dump($phar->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- bool(false) diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt index 7a95805787..bc737d5483 100644 --- a/ext/phar/tests/phar_convert_tar3.phpt +++ b/ext/phar/tests/phar_convert_tar3.phpt @@ -9,10 +9,10 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -44,10 +44,10 @@ var_dump($phar->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt index b17ccaa35e..8f8ef415b1 100644 --- a/ext/phar/tests/phar_convert_zip.phpt +++ b/ext/phar/tests/phar_convert_zip.phpt @@ -8,10 +8,10 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -39,9 +39,9 @@ var_dump($phar->getStub()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_copy.phpt b/ext/phar/tests/phar_copy.phpt index 8b270302ef..2f5c2d5bd2 100644 --- a/ext/phar/tests/phar_copy.phpt +++ b/ext/phar/tests/phar_copy.phpt @@ -9,8 +9,8 @@ phar.require_hash=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar.php'; $pname = 'phar://'.$fname; $iname = '/file.txt'; @@ -69,8 +69,8 @@ echo $e->getMessage(),"\n"; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.php'); ?> --EXPECTF-- hihifile "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt index 4a9bd23a73..f091055596 100644 --- a/ext/phar/tests/phar_create_in_cwd.phpt +++ b/ext/phar/tests/phar_create_in_cwd.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -chdir(dirname(__FILE__)); +chdir(__DIR__); try { $p = new Phar('phar_create_in_cwd.phar'); $p['file1.txt'] = 'hi'; @@ -28,7 +28,7 @@ __HALT_COMPILER(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_create_in_cwd.phar'); +unlink(__DIR__ . '/phar_create_in_cwd.phar'); ?> --EXPECTF-- int(6641) diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt index f8f349a380..8aba1259a1 100644 --- a/ext/phar/tests/phar_ctx_001.phpt +++ b/ext/phar/tests/phar_ctx_001.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -61,7 +61,7 @@ var_dump($phar['b']->getMetaData()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_decompress.phpt b/ext/phar/tests/phar_decompress.phpt index 3a76fb12e8..3b16b78f64 100644 --- a/ext/phar/tests/phar_decompress.phpt +++ b/ext/phar/tests/phar_decompress.phpt @@ -8,8 +8,8 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar.gz'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar.gz'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -48,13 +48,13 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.hooba.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.gz'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.hooba.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.gz'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); ?> --EXPECTF-- int(4096) diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt index 6c04571d86..754ae44600 100644 --- a/ext/phar/tests/phar_dir_iterate.phpt +++ b/ext/phar/tests/phar_dir_iterate.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $phar = new Phar($fname); $phar['top.txt'] = 'hi'; @@ -21,7 +21,7 @@ foreach (new RecursiveIteratorIterator($newphar) as $path => $obj) { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_dotted_path.phpt b/ext/phar/tests/phar_dotted_path.phpt index f6d626e6cf..9f7fb217fc 100644 --- a/ext/phar/tests/phar_dotted_path.phpt +++ b/ext/phar/tests/phar_dotted_path.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 --FILE-- <?php -$dir = dirname(__FILE__) . '/broken.dirname'; +$dir = __DIR__ . '/broken.dirname'; mkdir($dir, 0777); $fname = $dir . '/dotted_path.phar'; @@ -32,8 +32,8 @@ foreach ($phar as $entry) { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/broken.dirname/dotted_path.phar'); -rmdir(dirname(__FILE__) . '/broken.dirname'); +unlink(__DIR__ . '/broken.dirname/dotted_path.phar'); +rmdir(__DIR__ . '/broken.dirname'); ?> --EXPECT-- this is a diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt index 2d1091dbac..5e5e695f96 100644 --- a/ext/phar/tests/phar_extract.phpt +++ b/ext/phar/tests/phar_extract.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/tempmanifest1.phar.php'; +$fname = __DIR__ . '/tempmanifest1.phar.php'; $pname = 'phar://' . $fname; $a = new Phar($fname); @@ -17,12 +17,12 @@ $a['subdir/ectory/file.txt'] = 'hi3'; $a->mount($pname . '/mount', __FILE__); $a->addEmptyDir('one/level'); -$a->extractTo(dirname(__FILE__) . '/extract', 'mount'); -$a->extractTo(dirname(__FILE__) . '/extract'); +$a->extractTo(__DIR__ . '/extract', 'mount'); +$a->extractTo(__DIR__ . '/extract'); $out = array(); -foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__) . '/extract', 0x00003000), RecursiveIteratorIterator::CHILD_FIRST) as $p => $b) { +foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/extract', 0x00003000), RecursiveIteratorIterator::CHILD_FIRST) as $p => $b) { $out[] = $p; } @@ -32,18 +32,18 @@ foreach ($out as $b) { echo "$b\n"; } -$a->extractTo(dirname(__FILE__) . '/extract1', 'file1.txt'); -var_dump(file_get_contents(dirname(__FILE__) . '/extract1/file1.txt')); +$a->extractTo(__DIR__ . '/extract1', 'file1.txt'); +var_dump(file_get_contents(__DIR__ . '/extract1/file1.txt')); -$a->extractTo(dirname(__FILE__) . '/extract1', 'subdir/ectory/file.txt'); -var_dump(file_get_contents(dirname(__FILE__) . '/extract1/subdir/ectory/file.txt')); +$a->extractTo(__DIR__ . '/extract1', 'subdir/ectory/file.txt'); +var_dump(file_get_contents(__DIR__ . '/extract1/subdir/ectory/file.txt')); -$a->extractTo(dirname(__FILE__) . '/extract1-2', array('file2.txt', 'one/level')); -var_dump(file_get_contents(dirname(__FILE__) . '/extract1-2/file2.txt')); -var_dump(is_dir(dirname(__FILE__) . '/extract1-2/one/level')); +$a->extractTo(__DIR__ . '/extract1-2', array('file2.txt', 'one/level')); +var_dump(file_get_contents(__DIR__ . '/extract1-2/file2.txt')); +var_dump(is_dir(__DIR__ . '/extract1-2/one/level')); try { - $a->extractTo(dirname(__FILE__) . '/whatever', 134); + $a->extractTo(__DIR__ . '/whatever', 134); } catch (Exception $e) { echo $e->getMessage(), "\n"; } @@ -60,31 +60,31 @@ try { echo $e->getMessage(), "\n"; } -file_put_contents(dirname(__FILE__) . '/oops', 'I is file'); +file_put_contents(__DIR__ . '/oops', 'I is file'); try { - $a->extractTo(dirname(__FILE__) . '/oops', 'file1.txt'); + $a->extractTo(__DIR__ . '/oops', 'file1.txt'); } catch (Exception $e) { echo $e->getMessage(), "\n"; } try { - $a->extractTo(dirname(__FILE__) . '/oops1', array(array(), 'file1.txt')); + $a->extractTo(__DIR__ . '/oops1', array(array(), 'file1.txt')); } catch (Exception $e) { echo $e->getMessage(), "\n"; } try { - $a->extractTo(dirname(__FILE__) . '/extract', 'file1.txt'); + $a->extractTo(__DIR__ . '/extract', 'file1.txt'); } catch (Exception $e) { echo $e->getMessage(), "\n"; } -file_put_contents(dirname(__FILE__) . '/extract/file1.txt', 'first'); -var_dump(file_get_contents(dirname(__FILE__) . '/extract/file1.txt')); +file_put_contents(__DIR__ . '/extract/file1.txt', 'first'); +var_dump(file_get_contents(__DIR__ . '/extract/file1.txt')); -$a->extractTo(dirname(__FILE__) . '/extract', 'file1.txt', true); -var_dump(file_get_contents(dirname(__FILE__) . '/extract/file1.txt')); +$a->extractTo(__DIR__ . '/extract', 'file1.txt', true); +var_dump(file_get_contents(__DIR__ . '/extract/file1.txt')); try { $a->extractTo(str_repeat('a', 20000), 'file1.txt'); @@ -95,7 +95,7 @@ try { $a[str_repeat('a', 20000)] = 'long'; try { - $a->extractTo(dirname(__FILE__) . '/extract', str_repeat('a', 20000)); + $a->extractTo(__DIR__ . '/extract', str_repeat('a', 20000)); } catch (Exception $e) { echo $e->getMessage(), "\n"; } @@ -104,11 +104,11 @@ try { ===DONE=== --CLEAN-- <?php -@rmdir(dirname(__FILE__) . '/whatever'); -@unlink(dirname(__FILE__) . '/oops'); -@rmdir(dirname(__FILE__) . '/oops1'); -@unlink(dirname(__FILE__) . '/tempmanifest1.phar.php'); -$e = dirname(__FILE__) . '/extract/'; +@rmdir(__DIR__ . '/whatever'); +@unlink(__DIR__ . '/oops'); +@rmdir(__DIR__ . '/oops1'); +@unlink(__DIR__ . '/tempmanifest1.phar.php'); +$e = __DIR__ . '/extract/'; @unlink($e . 'file1.txt'); @unlink($e . 'file2.txt'); @unlink($e . 'subdir/ectory/file.txt'); @@ -117,13 +117,13 @@ $e = dirname(__FILE__) . '/extract/'; @rmdir($e . 'one/level'); @rmdir($e . 'one'); @rmdir($e); -$e = dirname(__FILE__) . '/extract1/'; +$e = __DIR__ . '/extract1/'; @unlink($e . 'file1.txt'); @unlink($e . 'subdir/ectory/file.txt'); @rmdir($e . 'subdir/ectory'); @rmdir($e . 'subdir'); @rmdir($e); -$e = dirname(__FILE__) . '/extract1-2/'; +$e = __DIR__ . '/extract1-2/'; @unlink($e . 'file2.txt'); @rmdir($e . 'one/level'); @rmdir($e . 'one'); diff --git a/ext/phar/tests/phar_extract2.phpt b/ext/phar/tests/phar_extract2.phpt index 7de8cee5b0..dd41f38660 100644 --- a/ext/phar/tests/phar_extract2.phpt +++ b/ext/phar/tests/phar_extract2.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/tempmanifest2.phar.php'; +$fname = __DIR__ . '/tempmanifest2.phar.php'; $pname = 'phar://' . $fname; $phar = new Phar($fname); @@ -19,11 +19,11 @@ $phar['subdir/ectory/file.txt'] = 'hi3'; $phar->mount($pname . '/mount2', __FILE__); $phar->addEmptyDir('one/level'); -$phar->extractTo(dirname(__FILE__) . '/extract2', 'mount2'); -$phar->extractTo(dirname(__FILE__) . '/extract2'); +$phar->extractTo(__DIR__ . '/extract2', 'mount2'); +$phar->extractTo(__DIR__ . '/extract2'); $out = array(); -foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__) . '/extract2', 0x00003000), RecursiveIteratorIterator::CHILD_FIRST) as $path => $file) { +foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/extract2', 0x00003000), RecursiveIteratorIterator::CHILD_FIRST) as $path => $file) { $extracted[] = $path; } @@ -37,8 +37,8 @@ foreach ($extracted as $out) { ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/tempmanifest2.phar.php'); -$dir = dirname(__FILE__) . '/extract2/'; +@unlink(__DIR__ . '/tempmanifest2.phar.php'); +$dir = __DIR__ . '/extract2/'; @unlink($dir . 'file1.txt'); @unlink($dir . 'file2.txt'); @unlink($dir . 'subdir/ectory/file.txt'); @@ -47,7 +47,7 @@ $dir = dirname(__FILE__) . '/extract2/'; @rmdir($dir . 'one/level'); @rmdir($dir . 'one'); @rmdir($dir); -$dir = dirname(__FILE__) . '/extract1/'; +$dir = __DIR__ . '/extract1/'; @rmdir($dir); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_extract3.phpt b/ext/phar/tests/phar_extract3.phpt index 475583938b..ffd31a4201 100644 --- a/ext/phar/tests/phar_extract3.phpt +++ b/ext/phar/tests/phar_extract3.phpt @@ -7,9 +7,9 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/files/bogus.zip'; -$fname2 = dirname(__FILE__) . '/files/notbogus.zip'; -$extract = dirname(__FILE__) . '/test-extract3'; +$fname = __DIR__ . '/files/bogus.zip'; +$fname2 = __DIR__ . '/files/notbogus.zip'; +$extract = __DIR__ . '/test-extract3'; $phar = new PharData($fname); @@ -34,7 +34,7 @@ try { ===DONE=== --CLEAN-- <?php -$dir = dirname(__FILE__) . '/test-extract3/'; +$dir = __DIR__ . '/test-extract3/'; @unlink($dir . 'stuff.txt'); @unlink($dir . 'nonsense.txt'); @rmdir($dir); diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt index 526a8cbf91..55884917bd 100644 --- a/ext/phar/tests/phar_gobyebye-win32.phpt +++ b/ext/phar/tests/phar_gobyebye-win32.phpt @@ -9,8 +9,8 @@ phar.readonly=0 --FILE-- <?php Phar::interceptFileFuncs(); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.php'; $pname = 'phar://' . $fname; file_put_contents($fname2, '<?php Phar::unlinkArchive("' . addslashes($fname) . '");'); file_put_contents($pname . '/foo/hi', '<?php @@ -26,8 +26,8 @@ include $pname . '/foo/hi'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> --EXPECTF-- Warning: readfile(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt index 93e153bdf2..753562571d 100644 --- a/ext/phar/tests/phar_gobyebye.phpt +++ b/ext/phar/tests/phar_gobyebye.phpt @@ -10,8 +10,8 @@ phar.readonly=0 --FILE-- <?php Phar::interceptFileFuncs(); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.php'; $pname = 'phar://' . $fname; file_put_contents($fname2, '<?php Phar::unlinkArchive("' . addslashes($fname) . '");'); file_put_contents($pname . '/foo/hi', '<?php @@ -27,8 +27,8 @@ include $pname . '/foo/hi'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> --EXPECTF-- Warning: readfile(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt index 3308424fa9..942ca9c3d0 100644 --- a/ext/phar/tests/phar_gzip.phpt +++ b/ext/phar/tests/phar_gzip.phpt @@ -10,9 +10,9 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/phar_gzip.phar'; +$fname = __DIR__ . '/phar_gzip.phar'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/phar_gzip.2.phar'; +$fname2 = __DIR__ . '/phar_gzip.2.phar'; $pname2 = 'phar://' . $fname2; $file = '<?php @@ -48,8 +48,8 @@ if ($a['mtime'] != $b['mtime']) { ===DONE=== --CLEAN-- <?php -@unlink(dirname(__FILE__) . '/phar_gzip.phar'); -@unlink(dirname(__FILE__) . '/phar_gzip.2.phar'); +@unlink(__DIR__ . '/phar_gzip.phar'); +@unlink(__DIR__ . '/phar_gzip.2.phar'); ?> --EXPECTF-- string(9) "it worked" diff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt index 84d2e757e9..6e299d08e0 100644 --- a/ext/phar/tests/phar_isvalidpharfilename.phpt +++ b/ext/phar/tests/phar_isvalidpharfilename.phpt @@ -6,7 +6,7 @@ Phar: Phar::isValidPharFilename() phar.readonly=1 --FILE-- <?php -chdir(dirname(__FILE__)); +chdir(__DIR__); var_dump(Phar::isValidPharFilename('*')); var_dump(Phar::isValidPharFilename('*', true)); var_dump(Phar::isValidPharFilename('*', false)); @@ -26,7 +26,7 @@ var_dump(Phar::isValidPharFilename('boo.phar.tar')); var_dump(Phar::isValidPharFilename('boo.phar.tar', true)); var_dump(Phar::isValidPharFilename('boo.phar.tar', false)); -mkdir(dirname(__FILE__) . '/.phar'); +mkdir(__DIR__ . '/.phar'); echo "\n.phar/boo.tar\n"; var_dump(Phar::isValidPharFilename('.phar/boo.tar')); @@ -72,7 +72,7 @@ var_dump(Phar::isValidPharFilename('dir.phar.php', false)); ===DONE=== --CLEAN-- <?php -rmdir(dirname(__FILE__) . '/.phar'); +rmdir(__DIR__ . '/.phar'); --EXPECTF-- bool(false) bool(false) diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index cbe0ebf133..42ad3d3c71 100644 --- a/ext/phar/tests/phar_magic.phpt +++ b/ext/phar/tests/phar_magic.phpt @@ -7,10 +7,10 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $p = new Phar($fname); $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__); @@ -21,7 +21,7 @@ include $fname; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_metadata_read.phpt b/ext/phar/tests/phar_metadata_read.phpt index da23218196..1c8428adba 100644 --- a/ext/phar/tests/phar_metadata_read.phpt +++ b/ext/phar/tests/phar_metadata_read.phpt @@ -9,7 +9,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -48,7 +48,7 @@ foreach($files as $name => $cont) { ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" string(1) "b" diff --git a/ext/phar/tests/phar_metadata_write.phpt b/ext/phar/tests/phar_metadata_write.phpt index 2aadc7423f..a15d23d4c6 100644 --- a/ext/phar/tests/phar_metadata_write.phpt +++ b/ext/phar/tests/phar_metadata_write.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -46,7 +46,7 @@ foreach($files as $name => $cont) { ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" string(1) "b" diff --git a/ext/phar/tests/phar_offset_check.phpt b/ext/phar/tests/phar_offset_check.phpt index 469dce6c11..493d823a68 100644 --- a/ext/phar/tests/phar_offset_check.phpt +++ b/ext/phar/tests/phar_offset_check.phpt @@ -8,7 +8,7 @@ phar.require_hash=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://'.$fname; $phar = new Phar($fname); @@ -64,7 +64,7 @@ var_dump($phar->getAlias()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- Entry .phar/stub.php does not exist Entry .phar/alias.txt does not exist diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt index 8e96246eef..54dec470c2 100644 --- a/ext/phar/tests/phar_offset_get_error.phpt +++ b/ext/phar/tests/phar_offset_get_error.phpt @@ -8,7 +8,7 @@ phar.require_hash=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://'.$fname; $iname = '/file.txt'; $ename = '/error/..'; @@ -41,7 +41,7 @@ echo $e->getMessage(),"\n"; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- Entry /error/.. does not exist and cannot be created: phar error: invalid path "/error/.." contains upper directory reference foobar diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt index 7ee7ca6fa5..83d52eeabf 100644 --- a/ext/phar/tests/phar_oo_001.phpt +++ b/ext/phar/tests/phar_oo_001.phpt @@ -44,7 +44,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_001.phar.php'); +unlink(__DIR__ . '/files/phar_oo_001.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt index 2787ac8a53..fdc08c3bfc 100644 --- a/ext/phar/tests/phar_oo_002.phpt +++ b/ext/phar/tests/phar_oo_002.phpt @@ -16,7 +16,7 @@ $phar = new Phar($fname); $phar->setInfoClass('SplFileInfo'); foreach($phar as $name => $ent) { - var_dump(str_replace(str_replace('\\', '/', dirname(__FILE__)), '*', $name)); + var_dump(str_replace(str_replace('\\', '/', __DIR__), '*', $name)); var_dump($ent->getFilename()); var_dump($ent->getSize()); var_dump($ent->getType()); @@ -36,7 +36,7 @@ echo "==RECURSIVE==\n"; $phar = new Phar($fname); foreach(new RecursiveIteratorIterator($phar) as $name => $ent) { - var_dump(str_replace(str_replace('\\', '/', dirname(__FILE__)), '*', $name)); + var_dump(str_replace(str_replace('\\', '/', __DIR__), '*', $name)); var_dump(str_replace('\\', '/', $ent->getFilename())); var_dump($ent->getCompressedSize()); var_dump($ent->isCRCChecked()); @@ -48,7 +48,7 @@ foreach(new RecursiveIteratorIterator($phar) as $name => $ent) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_002.phar.php'); +unlink(__DIR__ . '/files/phar_oo_002.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt index 01ca493a2f..4ff8361120 100644 --- a/ext/phar/tests/phar_oo_003.phpt +++ b/ext/phar/tests/phar_oo_003.phpt @@ -26,7 +26,7 @@ foreach($phar as $name => $ent) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_003.phar.php'); +unlink(__DIR__ . '/files/phar_oo_003.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt index 12492e2eef..2191e0082b 100644 --- a/ext/phar/tests/phar_oo_004.phpt +++ b/ext/phar/tests/phar_oo_004.phpt @@ -76,7 +76,7 @@ foreach($it as $name => $ent) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_004.phar.php'); +unlink(__DIR__ . '/files/phar_oo_004.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt index 62887655b1..27279ddbbc 100644 --- a/ext/phar/tests/phar_oo_005.phpt +++ b/ext/phar/tests/phar_oo_005.phpt @@ -29,7 +29,7 @@ foreach($it as $name => $ent) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_005.phar.php'); +unlink(__DIR__ . '/files/phar_oo_005.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt index b71ecda23d..412726908b 100644 --- a/ext/phar/tests/phar_oo_006.phpt +++ b/ext/phar/tests/phar_oo_006.phpt @@ -37,7 +37,7 @@ echo $phar['b.php']->getFilename() . "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_006.phar.php'); +unlink(__DIR__ . '/files/phar_oo_006.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt index ff9c721150..7af8bfa790 100644 --- a/ext/phar/tests/phar_oo_007.phpt +++ b/ext/phar/tests/phar_oo_007.phpt @@ -13,7 +13,7 @@ class MyFile extends SplFileObject { function __construct($name) { - echo __METHOD__ . "(" . str_replace(str_replace('\\', '/', dirname(__FILE__)), '*', $name) . ")\n"; + echo __METHOD__ . "(" . str_replace(str_replace('\\', '/', __DIR__), '*', $name) . ")\n"; parent::__construct($name); } } @@ -58,7 +58,7 @@ var_dump($f->eof()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_007.phar.php'); +unlink(__DIR__ . '/files/phar_oo_007.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt index b0f518d39b..e1107df4ef 100644 --- a/ext/phar/tests/phar_oo_008.phpt +++ b/ext/phar/tests/phar_oo_008.phpt @@ -82,7 +82,7 @@ foreach($v as $k => $d) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_008.phar.php'); +unlink(__DIR__ . '/files/phar_oo_008.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt index 05e1f1efeb..c6898d456d 100644 --- a/ext/phar/tests/phar_oo_009.phpt +++ b/ext/phar/tests/phar_oo_009.phpt @@ -36,7 +36,7 @@ foreach($f as $k => $v) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_009.phar.php'); +unlink(__DIR__ . '/files/phar_oo_009.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt index 0869828f8f..243a11e92f 100644 --- a/ext/phar/tests/phar_oo_010.phpt +++ b/ext/phar/tests/phar_oo_010.phpt @@ -35,7 +35,7 @@ var_dump(isset($phar['b'])); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_010.phar.php'); +unlink(__DIR__ . '/files/phar_oo_010.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt index 5b929363db..223a214fe0 100644 --- a/ext/phar/tests/phar_oo_011.phpt +++ b/ext/phar/tests/phar_oo_011.phpt @@ -25,7 +25,7 @@ echo "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_011.phar.php'); +unlink(__DIR__ . '/files/phar_oo_011.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt index b7a1c420f1..098742ca7f 100644 --- a/ext/phar/tests/phar_oo_011b.phpt +++ b/ext/phar/tests/phar_oo_011b.phpt @@ -30,7 +30,7 @@ catch (BadMethodCallException $e) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_011b.phar.php'); +unlink(__DIR__ . '/files/phar_oo_011b.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt index f5566807fb..44e0eecdfa 100644 --- a/ext/phar/tests/phar_oo_012.phpt +++ b/ext/phar/tests/phar_oo_012.phpt @@ -26,7 +26,7 @@ var_dump(isset($phar['f.php'])); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_012.phar.php'); +unlink(__DIR__ . '/files/phar_oo_012.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt index d2798c3dd4..d69af5d0e6 100644 --- a/ext/phar/tests/phar_oo_012_confirm.phpt +++ b/ext/phar/tests/phar_oo_012_confirm.phpt @@ -29,7 +29,7 @@ var_dump(isset($phar['f.php'])); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_012_confirm.phar.php'); +unlink(__DIR__ . '/files/phar_oo_012_confirm.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt index cb17a601e4..bafd13c489 100644 --- a/ext/phar/tests/phar_oo_012b.phpt +++ b/ext/phar/tests/phar_oo_012b.phpt @@ -33,7 +33,7 @@ catch (BadMethodCallException $e) ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_012b.phar.php'); +unlink(__DIR__ . '/files/phar_oo_012b.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt index d4aadebce6..8a1c5f21b2 100644 --- a/ext/phar/tests/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/phar_oo_compressallbz2.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -44,8 +44,8 @@ var_dump($phar['b']->isCompressed(Phar::BZ2)); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt index 65d018bdbd..a42a92770c 100644 --- a/ext/phar/tests/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/phar_oo_compressallgz.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -48,8 +48,8 @@ echo $e->getMessage() . "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt index 032faa1247..8b6e96419f 100644 --- a/ext/phar/tests/phar_oo_compressed_001.phpt +++ b/ext/phar/tests/phar_oo_compressed_001.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -48,7 +48,7 @@ var_dump($phar['d']->isCompressed()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt index fcf06d4008..bd8404638d 100644 --- a/ext/phar/tests/phar_oo_compressed_001b.phpt +++ b/ext/phar/tests/phar_oo_compressed_001b.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -48,7 +48,7 @@ var_dump($phar['d']->isCompressed()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt index f1ece51617..0f3f6a5d6e 100644 --- a/ext/phar/tests/phar_oo_compressed_002.phpt +++ b/ext/phar/tests/phar_oo_compressed_002.phpt @@ -8,7 +8,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -51,7 +51,7 @@ var_dump($phar['e']->isCompressed()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt index dd935cc5ca..8c4fbc8966 100644 --- a/ext/phar/tests/phar_oo_compressed_002b.phpt +++ b/ext/phar/tests/phar_oo_compressed_002b.phpt @@ -8,7 +8,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -51,7 +51,7 @@ var_dump($phar['e']->isCompressed()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt index e3a0c2dea7..35b9a4a887 100644 --- a/ext/phar/tests/phar_oo_getcontents.phpt +++ b/ext/phar/tests/phar_oo_getcontents.phpt @@ -6,7 +6,7 @@ Phar object: getContent() phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $phar = new Phar($fname); $phar['a/b'] = 'file contents @@ -27,7 +27,7 @@ echo $e->getMessage(), "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __halt_compiler(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt index e77b5cad1a..e15b177316 100644 --- a/ext/phar/tests/phar_oo_getcontentsgz.phpt +++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt @@ -7,8 +7,8 @@ Phar object: getContent() (verify it works with compression) phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.php'; $phar = new Phar($fname); $phar['a'] = 'file contents @@ -22,8 +22,8 @@ echo $phar2['a']->getContent() . "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt index 0df479e860..7a11b8920c 100644 --- a/ext/phar/tests/phar_oo_getmodified.phpt +++ b/ext/phar/tests/phar_oo_getmodified.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -27,8 +27,8 @@ var_dump($phar->getModified()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- bool(false) diff --git a/ext/phar/tests/phar_oo_iswriteable.phpt b/ext/phar/tests/phar_oo_iswriteable.phpt index 8da3ca9e78..b87f58f0da 100644 --- a/ext/phar/tests/phar_oo_iswriteable.phpt +++ b/ext/phar/tests/phar_oo_iswriteable.phpt @@ -7,8 +7,8 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; $pname = 'phar://hio'; $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; @@ -59,8 +59,8 @@ chmod($fname2, 0666); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECT-- bool(true) diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt index 5710f4fca5..acf897490b 100644 --- a/ext/phar/tests/phar_oo_nosig.phpt +++ b/ext/phar/tests/phar_oo_nosig.phpt @@ -15,7 +15,7 @@ var_dump($phar->getSignature()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php'); +unlink(__DIR__ . '/files/phar_oo_test.phar.php'); __halt_compiler(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index d5d392d14d..f669f5e8ca 100644 --- a/ext/phar/tests/phar_oo_uncompressall.phpt +++ b/ext/phar/tests/phar_oo_uncompressall.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php __HALT_COMPILER(); ?>'; @@ -52,8 +52,8 @@ var_dump($phar['a']->isCompressed()); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- string(1) "a" diff --git a/ext/phar/tests/phar_running.phpt b/ext/phar/tests/phar_running.phpt index 194946b498..7b74921a3e 100644 --- a/ext/phar/tests/phar_running.phpt +++ b/ext/phar/tests/phar_running.phpt @@ -6,7 +6,7 @@ Phar: Phar::running() phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $phar = new Phar($fname); @@ -19,7 +19,7 @@ var_dump(Phar::running()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- string(%d) "phar://%sphar_running.phar.php" string(%d) "%sphar_running.phar.php" diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt index 14990d0300..7d67d787c5 100644 --- a/ext/phar/tests/phar_setalias.phpt +++ b/ext/phar/tests/phar_setalias.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; @@ -26,8 +26,8 @@ echo $phar->getAlias() . "\n"; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt index d9c763333f..4a9d9ea638 100644 --- a/ext/phar/tests/phar_setalias2.phpt +++ b/ext/phar/tests/phar_setalias2.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; @@ -23,14 +23,14 @@ 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) { echo $e->getMessage() . "\n"; } try { - $b = new Phar(dirname(__FILE__) . '/nope.phar', 0, 'test'); + $b = new Phar(__DIR__ . '/nope.phar', 0, 'test'); } catch (Exception $e) { echo $e->getMessage() . "\n"; } @@ -38,9 +38,9 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); -unlink(dirname(__FILE__) . '/notphar.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); +unlink(__DIR__ . '/notphar.phar'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_setdefaultstub.phpt b/ext/phar/tests/phar_setdefaultstub.phpt index 1913685313..f834f3543e 100644 --- a/ext/phar/tests/phar_setdefaultstub.phpt +++ b/ext/phar/tests/phar_setdefaultstub.phpt @@ -7,7 +7,7 @@ phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $phar = new Phar($fname); $phar['a.php'] = '<php echo "this is a\n"; ?>'; @@ -51,7 +51,7 @@ try { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECT-- string(6643) "<?php diff --git a/ext/phar/tests/phar_setsignaturealgo1.phpt b/ext/phar/tests/phar_setsignaturealgo1.phpt index 503a659bce..0b8647b64c 100644 --- a/ext/phar/tests/phar_setsignaturealgo1.phpt +++ b/ext/phar/tests/phar_setsignaturealgo1.phpt @@ -9,7 +9,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$p = new Phar(dirname(__FILE__) . '/phar_setsignaturealgo1.phar', 0, 'phar_setsignaturealgo1.phar'); +$p = new Phar(__DIR__ . '/phar_setsignaturealgo1.phar', 0, 'phar_setsignaturealgo1.phar'); $p['file1.txt'] = 'hi'; var_dump($p->getSignature()); $p->setSignatureAlgorithm(Phar::MD5); @@ -38,7 +38,7 @@ echo $e->getMessage(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/phar_setsignaturealgo1.phar'); +unlink(__DIR__ . '/phar_setsignaturealgo1.phar'); ?> --EXPECTF-- array(2) { diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt index 9f548d0803..80aa531138 100644 --- a/ext/phar/tests/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/phar_setsignaturealgo2.phpt @@ -13,7 +13,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $p = new Phar($fname); $p['file1.txt'] = 'hi'; var_dump($p->getSignature()); @@ -34,9 +34,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(__FILE__) . '/files/private.pem')); +$private = openssl_get_privatekey(file_get_contents(__DIR__ . '/files/private.pem')); $pkey = ''; openssl_pkey_export($private, $pkey, NULL, $config_arg); $p->setSignatureAlgorithm(Phar::OPENSSL, $pkey); @@ -48,7 +48,7 @@ echo $e->getMessage(); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- array(2) { diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt index 8dfd50ae6e..e5b2f27f1d 100644 --- a/ext/phar/tests/phar_stub.phpt +++ b/ext/phar/tests/phar_stub.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; @@ -32,7 +32,7 @@ $fp = fopen($fname, 'rb'); echo fread($fp, strlen($file)) . "\n"; fclose($fp); -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phartmp.php'; $file = '<?php echo "third stub\n"; __HALT_COMPILER(); ?>'; $fp = fopen($fname2, 'wb'); fwrite($fp, $file); @@ -78,8 +78,8 @@ fclose($fp); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt index 8e57692ab4..065078d296 100644 --- a/ext/phar/tests/phar_stub_error.phpt +++ b/ext/phar/tests/phar_stub_error.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -41,7 +41,7 @@ var_dump($phar->getStub() == $stub); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt index dd0f35d295..67bea0ddfe 100644 --- a/ext/phar/tests/phar_stub_write.phpt +++ b/ext/phar/tests/phar_stub_write.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -44,7 +44,7 @@ var_dump($phar->getStub() == $sexp); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt index 3c0d72259f..5589033297 100644 --- a/ext/phar/tests/phar_stub_write_file.phpt +++ b/ext/phar/tests/phar_stub_write_file.phpt @@ -8,7 +8,7 @@ phar.readonly=0 allow_url_fopen=1 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -45,7 +45,7 @@ var_dump($phar->getStub() == $sexp); ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_unlinkarchive.phpt b/ext/phar/tests/phar_unlinkarchive.phpt index 9e7d0f2383..4477719c11 100644 --- a/ext/phar/tests/phar_unlinkarchive.phpt +++ b/ext/phar/tests/phar_unlinkarchive.phpt @@ -14,8 +14,8 @@ Phar::unlinkArchive(""); echo $e->getMessage(),"\n"; } -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; -$pdname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; +$pdname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; try { Phar::unlinkArchive($fname); @@ -35,8 +35,8 @@ try { } $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.zip'; $stub = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>'; $file = $stub; @@ -83,10 +83,10 @@ include $pname . '/evil.php'; ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); -unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); +unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt index 6a6b07b4d1..1c9c355689 100644 --- a/ext/phar/tests/pharfileinfo_chmod.phpt +++ b/ext/phar/tests/pharfileinfo_chmod.phpt @@ -6,7 +6,7 @@ Phar: PharFileInfo::chmod extra code coverage phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; $phar = new Phar($fname); @@ -24,7 +24,7 @@ $b->chmod(0666); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod ===DONE=== diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt index dbf9e8fa38..c8f236d166 100644 --- a/ext/phar/tests/pharfileinfo_compression.phpt +++ b/ext/phar/tests/pharfileinfo_compression.phpt @@ -8,7 +8,7 @@ Phar: PharFileInfo compression-related methods phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; $phar = new Phar($fname); @@ -72,8 +72,8 @@ var_dump($b->decompress()); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECTF-- Unknown compression type specified Unknown compression type specified diff --git a/ext/phar/tests/pharfileinfo_construct.phpt b/ext/phar/tests/pharfileinfo_construct.phpt index 53ee5143cf..4802e0fb40 100644 --- a/ext/phar/tests/pharfileinfo_construct.phpt +++ b/ext/phar/tests/pharfileinfo_construct.phpt @@ -6,7 +6,7 @@ Phar: PharFileInfo::__construct phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; try { @@ -47,7 +47,7 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- Cannot open phar file 'phar://%spharfileinfo_construct.phar/oops': internal corruption of phar "%spharfileinfo_construct.phar" (truncated entry) PharFileInfo::__construct() expects parameter 1 to be a valid path, array given diff --git a/ext/phar/tests/pharfileinfo_destruct.phpt b/ext/phar/tests/pharfileinfo_destruct.phpt index dc3917d2df..2de67473aa 100644 --- a/ext/phar/tests/pharfileinfo_destruct.phpt +++ b/ext/phar/tests/pharfileinfo_destruct.phpt @@ -6,7 +6,7 @@ Phar: PharFileInfo::__destruct phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; $a = new Phar($fname); @@ -20,6 +20,6 @@ unset($b); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECT-- ===DONE=== diff --git a/ext/phar/tests/pharfileinfo_getcrc32.phpt b/ext/phar/tests/pharfileinfo_getcrc32.phpt index 436ac7c590..277d96804a 100644 --- a/ext/phar/tests/pharfileinfo_getcrc32.phpt +++ b/ext/phar/tests/pharfileinfo_getcrc32.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -41,7 +41,7 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- Phar entry is a directory, does not have a CRC Phar entry was not CRC checked diff --git a/ext/phar/tests/pharfileinfo_setmetadata.phpt b/ext/phar/tests/pharfileinfo_setmetadata.phpt index 1dc3ab9118..97f3b15ed1 100644 --- a/ext/phar/tests/pharfileinfo_setmetadata.phpt +++ b/ext/phar/tests/pharfileinfo_setmetadata.phpt @@ -6,7 +6,7 @@ Phar: PharFileInfo::setMetadata/delMetadata extra code coverage phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar'; $pname = 'phar://' . $fname; $phar = new Phar($fname); @@ -39,8 +39,8 @@ echo $e->getMessage(), "\n"; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECTF-- Phar entry is a temporary directory (not an actual entry in the archive), cannot set metadata Phar entry is a temporary directory (not an actual entry in the archive), cannot delete metadata diff --git a/ext/phar/tests/readfile.phpt b/ext/phar/tests/readfile.phpt index 63e80eb0e3..fa8611755a 100644 --- a/ext/phar/tests/readfile.phpt +++ b/ext/phar/tests/readfile.phpt @@ -7,7 +7,7 @@ phar.require_hash=1 phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $a = new Phar($fname); $a['index.php'] = '<?php readfile("dir/file1.txt"); @@ -25,6 +25,6 @@ include $fname; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- hihi===DONE=== diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt index 20617c6b28..d351287788 100644 --- a/ext/phar/tests/readfile_edgecases.phpt +++ b/ext/phar/tests/readfile_edgecases.phpt @@ -7,10 +7,10 @@ phar.readonly=0 --FILE-- <?php Phar::interceptFileFuncs(); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -chdir(dirname(__FILE__)); +chdir(__DIR__); file_put_contents($fname, "blah\n"); file_put_contents("foob", "test\n"); readfile($fname); @@ -20,7 +20,7 @@ file_put_contents($pname . '/foo/hi', '<?php readfile("foo/" . basename(__FILE__)); $context = stream_context_create(); readfile("foob"); -set_include_path("' . addslashes(dirname(__FILE__)) . '"); +set_include_path("' . addslashes(__DIR__) . '"); readfile("foob", true); readfile("./hi", 0, $context); readfile("../oops"); @@ -30,9 +30,9 @@ include $pname . '/foo/hi'; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php rmdir(dirname(__FILE__) . '/poo'); ?> -<?php unlink(dirname(__FILE__) . '/foob'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php rmdir(__DIR__ . '/poo'); ?> +<?php unlink(__DIR__ . '/foob'); ?> --EXPECTF-- blah <?php diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt index e2cb3b8cff..8aefc54245 100644 --- a/ext/phar/tests/refcount1.phpt +++ b/ext/phar/tests/refcount1.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; @@ -36,7 +36,7 @@ include $pname . '/b/c.php'; ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- ===CLOSE=== object(PharFileInfo)#%d (2) { diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt index cfcedc7000..9e3824729a 100644 --- a/ext/phar/tests/rename.phpt +++ b/ext/phar/tests/rename.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -24,7 +24,7 @@ echo file_get_contents($pname . '/b') . "\n"; echo file_get_contents($pname . '/a') . "\n"; ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- a a diff --git a/ext/phar/tests/rename_dir.phpt b/ext/phar/tests/rename_dir.phpt index d19a37f70f..7283135632 100644 --- a/ext/phar/tests/rename_dir.phpt +++ b/ext/phar/tests/rename_dir.phpt @@ -8,7 +8,7 @@ phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -25,7 +25,7 @@ echo file_get_contents($pname . '/b/x') . "\n"; echo file_get_contents($pname . '/a/x') . "\n"; ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- a a diff --git a/ext/phar/tests/rename_dir_and_mount.phpt b/ext/phar/tests/rename_dir_and_mount.phpt index b74f47b91d..f70485f1d7 100644 --- a/ext/phar/tests/rename_dir_and_mount.phpt +++ b/ext/phar/tests/rename_dir_and_mount.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -19,7 +19,7 @@ $files['a/b/x'] = 'a'; include 'files/phar_test.inc'; include $fname; -Phar::mount("$pname/a/c", dirname(__FILE__)); +Phar::mount("$pname/a/c", __DIR__); var_dump(file_exists($pname . '/a')); var_dump(file_exists($pname . '/a/x')); @@ -43,7 +43,7 @@ var_dump(file_exists($pname . '/b/c')); var_dump(file_exists($pname . '/b/c/'.basename(__FILE__))); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- bool(true) bool(true) diff --git a/ext/phar/tests/rmdir.phpt b/ext/phar/tests/rmdir.phpt index ef061bf7c2..f7e31c20ff 100644 --- a/ext/phar/tests/rmdir.phpt +++ b/ext/phar/tests/rmdir.phpt @@ -7,7 +7,7 @@ phar.readonly=0 phar.require_hash=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; $file = "<?php Phar::mapPhar('hio'); @@ -25,7 +25,7 @@ unlink($pname . '/a/x'); var_dump(rmdir($pname . '/a')); ?> --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- a diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt index 6d26da0b25..76af2a0e74 100644 --- a/ext/phar/tests/security.phpt +++ b/ext/phar/tests/security.phpt @@ -6,8 +6,8 @@ Phar: test to ensure phar.readonly cannot be circumvented phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.1.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.php'; $a = new Phar($fname); $a->setStub('<?php Phar::mapPhar(); @@ -29,7 +29,7 @@ include $fname2; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.php'); ?> --EXPECT-- bool(false) Write operations disabled by the php.ini setting phar.readonly diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt index f14d0da1a6..e8649da235 100644 --- a/ext/phar/tests/stat.phpt +++ b/ext/phar/tests/stat.phpt @@ -11,9 +11,9 @@ umask(0); Phar::interceptFileFuncs(); var_dump(stat("")); -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; $a = new Phar($fname); $a['my/index.php'] = '<?php echo "stat\n"; @@ -70,7 +70,7 @@ include $fname; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- bool(false) stat diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt index de21dd5c08..d145cdd21d 100644 --- a/ext/phar/tests/stat2_5.3.phpt +++ b/ext/phar/tests/stat2_5.3.phpt @@ -10,9 +10,9 @@ phar.require_hash=0 Phar::interceptFileFuncs(); var_dump(is_file(__FILE__)); -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -copy(dirname(__FILE__) . '/tar/files/links.tar', $fname2); +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar'; +$fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; +copy(__DIR__ . '/tar/files/links.tar', $fname2); $a = new PharData($fname2); $b = $a->convertToExecutable(Phar::TAR, Phar::NONE, '.phar.tar'); unset($a); @@ -34,8 +34,8 @@ include $fname3; ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECTF-- bool(true) is_link 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 0bd97d55ba..93d40845db 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); @@ -37,7 +37,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 bool(false) 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 d3c12b8e05..976c7358b0 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); @@ -37,7 +37,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 bool(false) 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 657782fb38..dd28ff747a 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); @@ -38,7 +38,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 bool(false) 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 0a65086cc7..aae6e424d1 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); @@ -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'); ?> --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 bool(false) 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 23d6800598..ec36a60583 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()); @@ -25,7 +25,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) diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt index de13acc315..fe0ffa970f 100644 --- a/ext/phar/tests/test_alias_unset.phpt +++ b/ext/phar/tests/test_alias_unset.phpt @@ -6,9 +6,9 @@ Phar: test for the odd case where we intend to remove an archive from memory phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.php'; $pname2 = 'phar://' . $fname2; $phar = new Phar($fname); @@ -35,8 +35,8 @@ $a = file_get_contents($pname . '/file1.txt'); // this fails because $fname2 ref ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> --EXPECTF-- Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by existing archive string(5) "first" diff --git a/ext/phar/tests/test_signaturealgos.phpt b/ext/phar/tests/test_signaturealgos.phpt index 7cbf6c0513..e60554bd0c 100644 --- a/ext/phar/tests/test_signaturealgos.phpt +++ b/ext/phar/tests/test_signaturealgos.phpt @@ -13,19 +13,19 @@ phar.require_hash=0 phar.readonly=0 --FILE-- <?php -$a = new Phar(dirname(__FILE__) . '/files/sha1.phar'); +$a = new Phar(__DIR__ . '/files/sha1.phar'); $r = $a->getSignature(); var_dump($r['hash_type']); -$a = new Phar(dirname(__FILE__) . '/files/sha512.phar'); +$a = new Phar(__DIR__ . '/files/sha512.phar'); $r = $a->getSignature(); var_dump($r['hash_type']); -$a = new Phar(dirname(__FILE__) . '/files/sha256.phar'); +$a = new Phar(__DIR__ . '/files/sha256.phar'); $r = $a->getSignature(); var_dump($r['hash_type']); -$a = new Phar(dirname(__FILE__) . '/files/md5.phar'); +$a = new Phar(__DIR__ . '/files/md5.phar'); $r = $a->getSignature(); var_dump($r['hash_type']); -$a = new Phar(dirname(__FILE__) . '/files/openssl.phar'); +$a = new Phar(__DIR__ . '/files/openssl.phar'); $r = $a->getSignature(); var_dump($r['hash_type']); ?> diff --git a/ext/phar/tests/test_unset.phpt b/ext/phar/tests/test_unset.phpt index ae84823bc5..a512d71469 100644 --- a/ext/phar/tests/test_unset.phpt +++ b/ext/phar/tests/test_unset.phpt @@ -6,8 +6,8 @@ Phar: ensure unset() works properly on a non-flushed phar archive phar.readonly=0 --FILE-- <?php -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php'; +$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.php'; if (file_exists($fname)) unlink($fname); if (file_exists($fname2)) unlink($fname2); @@ -33,8 +33,8 @@ var_dump(file_exists($fname)); ?> ===DONE=== --CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> +<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> --EXPECTF-- NULL string(%d) "%stest_unset.phar.php" diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt index 26c86d2f1b..51cfbce01f 100644 --- a/ext/phar/tests/withphar.phpt +++ b/ext/phar/tests/withphar.phpt @@ -4,7 +4,7 @@ Phar: phar run with ext/phar with default stub <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php -include dirname(__FILE__) . '/files/nophar.phar'; +include __DIR__ . '/files/nophar.phar'; ?> ===DONE=== --EXPECT-- diff --git a/ext/phar/tests/zf_test.phpt b/ext/phar/tests/zf_test.phpt index c5d587dc9c..b3d1e4cb9a 100644 --- a/ext/phar/tests/zf_test.phpt +++ b/ext/phar/tests/zf_test.phpt @@ -10,9 +10,9 @@ phar.require_hash=0 <?php $file = "zfapp"; -$orig_file = dirname(__FILE__) . "/files/$file.tgz"; -$tgz_file = dirname(__FILE__) . "/$file.tgz"; -$phar_file = dirname(__FILE__) . "/$file.phar.tar.gz"; +$orig_file = __DIR__ . "/files/$file.tgz"; +$tgz_file = __DIR__ . "/$file.tgz"; +$phar_file = __DIR__ . "/$file.phar.tar.gz"; copy($orig_file, $tgz_file); $phar = new PharData($tgz_file); @@ -37,8 +37,8 @@ foreach(new RecursiveIteratorIterator($phar) as $path) { ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/zfapp.tgz'); -unlink(dirname(__FILE__) . '/zfapp.phar.tar.gz'); +unlink(__DIR__ . '/zfapp.tgz'); +unlink(__DIR__ . '/zfapp.phar.tar.gz'); ?> --EXPECTF-- phar://%szfapp.phar.tar.gz/application/default/controllers/ErrorController.php 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"; |