diff options
| author | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-07 21:31:47 +0100 |
|---|---|---|
| committer | Fabien Villepinte <fabien.villepinte@gmail.com> | 2019-11-07 21:31:47 +0100 |
| commit | a555cc0b3d4f745e6d0bb8c595de400a0c728827 (patch) | |
| tree | 61afac4216a8e7e629a878b8a873d8b32b7cf4a4 /ext/phar | |
| parent | 80cfd990740aef314b7943a3fa18c27a23f40566 (diff) | |
| download | php-git-a555cc0b3d4f745e6d0bb8c595de400a0c728827.tar.gz | |
Clean DONE tags from tests
Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.
Closes GH-4872.
Diffstat (limited to 'ext/phar')
283 files changed, 0 insertions, 567 deletions
diff --git a/ext/phar/tests/001.phpt b/ext/phar/tests/001.phpt index 1205e4e1aa..b370bef746 100644 --- a/ext/phar/tests/001.phpt +++ b/ext/phar/tests/001.phpt @@ -6,7 +6,5 @@ Phar::apiVersion <?php var_dump(Phar::apiVersion()); ?> -===DONE=== --EXPECT-- string(5) "1.1.1" -===DONE=== diff --git a/ext/phar/tests/003a.phpt b/ext/phar/tests/003a.phpt index 37e31072d4..20f178972a 100644 --- a/ext/phar/tests/003a.phpt +++ b/ext/phar/tests/003a.phpt @@ -7,8 +7,6 @@ Phar::canCompress, specific var_dump(Phar::canCompress(Phar::GZ) == extension_loaded("zlib")); var_dump(Phar::canCompress(Phar::BZ2) == extension_loaded("bz2")); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/023.phpt b/ext/phar/tests/023.phpt index f6920a48e0..e16e870b59 100644 --- a/ext/phar/tests/023.phpt +++ b/ext/phar/tests/023.phpt @@ -22,11 +22,9 @@ var_dump(file_get_contents($pname . '/b.php')); var_dump(file_get_contents($pname . '/b/c.php')); ?> -===DONE=== --CLEAN-- <?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"; ?>" string(30) "<?php echo "This is b/c\n"; ?>" -===DONE=== diff --git a/ext/phar/tests/024-opcache-win32.phpt b/ext/phar/tests/024-opcache-win32.phpt index 81eedd9668..afcd93e5f5 100644 --- a/ext/phar/tests/024-opcache-win32.phpt +++ b/ext/phar/tests/024-opcache-win32.phpt @@ -51,11 +51,9 @@ if (is_dir($cache_dir)) { } ?> -===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/024.phpt b/ext/phar/tests/024.phpt index 8ec0911e74..f0477dee42 100644 --- a/ext/phar/tests/024.phpt +++ b/ext/phar/tests/024.phpt @@ -22,11 +22,9 @@ include $pname . '/b.php'; include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/025.phpt b/ext/phar/tests/025.phpt index 76f2b1eb77..de2030448e 100644 --- a/ext/phar/tests/025.phpt +++ b/ext/phar/tests/025.phpt @@ -22,11 +22,9 @@ include $pname . '/b'; include $pname . '/b/b'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is a This is b This is b/b -===DONE=== diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt index d58555343f..05e11f6a58 100644 --- a/ext/phar/tests/026.phpt +++ b/ext/phar/tests/026.phpt @@ -22,7 +22,6 @@ include 'files/phar_test.inc'; require $pname . '/a.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -31,4 +30,3 @@ This is b This is b/c This is b/d This is e -===DONE=== diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt index 89b7252727..1d7ab5eae6 100644 --- a/ext/phar/tests/027.phpt +++ b/ext/phar/tests/027.phpt @@ -56,7 +56,6 @@ echo "opendir edge cases\n"; var_dump(opendir("phar://")); var_dump(opendir("phar://foo.phar/hi")); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -93,4 +92,3 @@ bool(false) Warning: opendir(phar://foo.phar/hi): failed to open dir: phar error: invalid url or non-existent phar "phar://foo.phar/hi" phar url "phar://foo.phar/hi" is unknown in %s027.php on line %d bool(false) -===DONE=== diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt index 19f1d988a3..89789381e0 100644 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -29,7 +29,6 @@ echo "======\n"; include $pname . '/a.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -44,4 +43,3 @@ This is b This is b/c This is b/d This is e -===DONE=== diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt index dc7f3acb63..d87064685c 100644 --- a/ext/phar/tests/029.phpt +++ b/ext/phar/tests/029.phpt @@ -37,7 +37,6 @@ catch (Exception $e) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); @@ -47,4 +46,3 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); bool(true) bool(true) alias "copy" is already used for archive "%s029.1.phar.php" cannot be overloaded with "%s029.2.phar.php" -===DONE=== diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt index 7132383d80..3ab5292c25 100644 --- a/ext/phar/tests/030.phpt +++ b/ext/phar/tests/030.phpt @@ -32,7 +32,6 @@ $p['.phar/test']; echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -45,4 +44,3 @@ This is b/d This is e bool(false) Cannot directly get any files or directories in magic ".phar" directory -===DONE=== diff --git a/ext/phar/tests/033.phpt b/ext/phar/tests/033.phpt index 9beb281912..4d3582ae11 100644 --- a/ext/phar/tests/033.phpt +++ b/ext/phar/tests/033.phpt @@ -30,7 +30,6 @@ var_dump($a['dir']->isReadable()); $a['dir']->chmod(0666); var_dump($a['dir']->isReadable()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); @@ -44,4 +43,3 @@ bool(true) bool(true) bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt index 548121f842..6b5956a714 100644 --- a/ext/phar/tests/033a.phpt +++ b/ext/phar/tests/033a.phpt @@ -25,7 +25,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); @@ -33,4 +32,3 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); --EXPECTF-- bool(false) Cannot modify permissions for file "a.php" in phar "%s033a.1.phar.php", write operations are prohibited -===DONE=== diff --git a/ext/phar/tests/addfuncs.phpt b/ext/phar/tests/addfuncs.phpt index a099dc4ed9..17073ab17e 100644 --- a/ext/phar/tests/addfuncs.phpt +++ b/ext/phar/tests/addfuncs.phpt @@ -39,7 +39,6 @@ $phar->addFromString('.phar/stub.php', 'hi'); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -50,4 +49,3 @@ Entry a does not exist and cannot be created: phar error: file "a" in phar "%sad phar error: unable to open file "%s/does/not/exist" to add to phar archive Cannot create any files in magic ".phar" directory Cannot create any files in magic ".phar" directory -===DONE=== diff --git a/ext/phar/tests/alias_acrobatics.phpt b/ext/phar/tests/alias_acrobatics.phpt index 56391def63..c30b2a3b07 100644 --- a/ext/phar/tests/alias_acrobatics.phpt +++ b/ext/phar/tests/alias_acrobatics.phpt @@ -32,7 +32,6 @@ $b = new Phar($fname, 0, 'another'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -43,4 +42,3 @@ alias "foo" is already used for archive "%salias_acrobatics.phar" cannot be over 2 Cannot open archive "%salias_acrobatics.2.phar", alias is already in use by existing archive alias "another" is already used for archive "%salias_acrobatics.phar" cannot be overloaded with "%salias_acrobatics.phar" -===DONE=== diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt index ad3506ace9..62c3be2e23 100644 --- a/ext/phar/tests/badparameters.phpt +++ b/ext/phar/tests/badparameters.phpt @@ -227,7 +227,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- Phar::mungServer() expects parameter 1 to be array, string given Phar::createDefaultStub() expects parameter 1 to be a valid path, array given @@ -267,4 +266,3 @@ Phar::addFromString() expects exactly 2 parameters, 1 given Write operations disabled by the php.ini setting phar.readonly Phar::setMetadata() expects exactly 1 parameter, 2 given Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/bug13727.phpt b/ext/phar/tests/bug13727.phpt index 2db6637efc..345968cdbb 100644 --- a/ext/phar/tests/bug13727.phpt +++ b/ext/phar/tests/bug13727.phpt @@ -22,7 +22,6 @@ for ($i = 0; $i < 4*1024; $i++){ } echo("\n Written Files($i)\n"); ?> -===DONE=== --CLEAN-- <?php $dirName = __DIR__; @@ -4133,4 +4132,3 @@ __HALT_COMPILER(); 4095 Written Files(4096) -===DONE=== diff --git a/ext/phar/tests/bug13786.phpt b/ext/phar/tests/bug13786.phpt index 1fc1cfd502..0ef1c33037 100644 --- a/ext/phar/tests/bug13786.phpt +++ b/ext/phar/tests/bug13786.phpt @@ -25,8 +25,6 @@ echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- string(26) "file 0 in DataArchive.phar" unable to seek to start of file "0" while creating new phar "%sDataArchive.phar" -===DONE=== diff --git a/ext/phar/tests/bug45218_SLOWTEST.phpt b/ext/phar/tests/bug45218_SLOWTEST.phpt index c71a2be618..1282ac22e9 100644 --- a/ext/phar/tests/bug45218_SLOWTEST.phpt +++ b/ext/phar/tests/bug45218_SLOWTEST.phpt @@ -51,7 +51,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -6088,4 +6087,3 @@ array(2999) { ["f2999"]=> string(22) "*bug45218_SLOWTEST.txt" } -===DONE=== diff --git a/ext/phar/tests/bug46060.phpt b/ext/phar/tests/bug46060.phpt index 02a4a7e867..f2df7ab60b 100644 --- a/ext/phar/tests/bug46060.phpt +++ b/ext/phar/tests/bug46060.phpt @@ -19,7 +19,6 @@ $phar = new PharData($fname2); var_dump($phar['blah']->isDir(), $phar['test']->isDir()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); @@ -29,4 +28,3 @@ __HALT_COMPILER(); --EXPECT-- bool(true) bool(false) -===DONE=== diff --git a/ext/phar/tests/bug47085.phpt b/ext/phar/tests/bug47085.phpt index d1fcf506f6..9e8c3b9f5b 100644 --- a/ext/phar/tests/bug47085.phpt +++ b/ext/phar/tests/bug47085.phpt @@ -15,10 +15,8 @@ unset($phar); rename("phar://a.phar/x", "phar://a.phar/y"); var_dump(rename("phar://a.phar/x", "phar://a.phar/y")); ?> -===DONE=== --CLEAN-- <?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) -===DONE=== diff --git a/ext/phar/tests/bug48377.2.phpt b/ext/phar/tests/bug48377.2.phpt index 130aaa8646..04df8940f2 100644 --- a/ext/phar/tests/bug48377.2.phpt +++ b/ext/phar/tests/bug48377.2.phpt @@ -17,9 +17,7 @@ try { echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?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 6c16654ef1..ec52c1a0f5 100644 --- a/ext/phar/tests/bug48377.phpt +++ b/ext/phar/tests/bug48377.phpt @@ -20,10 +20,8 @@ try { echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?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/bug60164.phpt b/ext/phar/tests/bug60164.phpt index 83883b6ee5..8cc2eceaa0 100644 --- a/ext/phar/tests/bug60164.phpt +++ b/ext/phar/tests/bug60164.phpt @@ -14,8 +14,6 @@ foreach (new RecursiveIteratorIterator(new Phar($phar, null, 'stuboflength1041.p var_dump($item->getFileName()); } ?> -===DONE=== --EXPECT-- string(5) "a.php" string(5) "b.php" -===DONE=== diff --git a/ext/phar/tests/bug64931/bug64931.phpt b/ext/phar/tests/bug64931/bug64931.phpt index aa2d17182c..0de8d43e78 100644 --- a/ext/phar/tests/bug64931/bug64931.phpt +++ b/ext/phar/tests/bug64931/bug64931.phpt @@ -43,7 +43,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__."/bug64931.phar"); @@ -55,4 +54,3 @@ CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Phar::addFromString() expects parameter 1 to be a valid path, string given -===DONE=== diff --git a/ext/phar/tests/bug69441.phpt b/ext/phar/tests/bug69441.phpt index 91e2dcf146..b08d015843 100644 --- a/ext/phar/tests/bug69441.phpt +++ b/ext/phar/tests/bug69441.phpt @@ -12,10 +12,8 @@ $r = new Phar($fname, 0); } ?> -==DONE== --EXPECTF-- UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%sbug69441.phar" in %sbug69441.php:%d Stack trace: #0 %s%ebug69441.php(%d): Phar->__construct('%s', 0) #1 {main} -==DONE== diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt index 3309d367c6..eb7d5f248f 100644 --- a/ext/phar/tests/bug69453.phpt +++ b/ext/phar/tests/bug69453.phpt @@ -12,10 +12,8 @@ $r = new Phar($fname, 0); } ?> -==DONE== --EXPECTF-- UnexpectedValueException: phar error: "%s%ebug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "") in %s:%d Stack trace: #0 %s%ebug69453.php(%d): Phar->__construct('%s', 0) #1 {main} -==DONE== diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt index edd77125e1..cc1fa3083d 100644 --- a/ext/phar/tests/bug70019.phpt +++ b/ext/phar/tests/bug70019.phpt @@ -12,7 +12,6 @@ if(!is_dir($dir)) { $phar->extractTo($dir); var_dump(file_exists("$dir/ThisIsATestFile.txt")); ?> -===DONE=== --CLEAN-- <?php $dir = __DIR__."/bug70019"; @@ -21,4 +20,3 @@ rmdir($dir); ?> --EXPECT-- bool(true) -===DONE=== diff --git a/ext/phar/tests/bug74386.phpt b/ext/phar/tests/bug74386.phpt index 0e60e00009..f5ff2d3cca 100644 --- a/ext/phar/tests/bug74386.phpt +++ b/ext/phar/tests/bug74386.phpt @@ -12,10 +12,8 @@ $r = new ReflectionMethod(PharData::class, '__construct'); var_dump($r->getNumberOfRequiredParameters()); var_dump($r->getNumberOfParameters()); ?> -===DONE=== --EXPECT-- int(1) int(3) int(1) int(4) -===DONE=== diff --git a/ext/phar/tests/cache_list/copyonwrite4a.phpt b/ext/phar/tests/cache_list/copyonwrite4a.phpt index 948edced47..e0da5e7b8a 100644 --- a/ext/phar/tests/cache_list/copyonwrite4a.phpt +++ b/ext/phar/tests/cache_list/copyonwrite4a.phpt @@ -12,9 +12,7 @@ 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-- bool(false) bool(true) string(2) "hi" -===DONE=== diff --git a/ext/phar/tests/cached_manifest_1.phpt b/ext/phar/tests/cached_manifest_1.phpt index d9c40723ae..55669b6956 100644 --- a/ext/phar/tests/cached_manifest_1.phpt +++ b/ext/phar/tests/cached_manifest_1.phpt @@ -21,7 +21,6 @@ var_dump(is_dir($pname . '/b')); var_dump(is_dir($pname . '/d')); var_dump(is_dir($pname . '/b/c.php')); ?> -===DONE=== --EXPECTF-- string(131) "<?php echo "in b\n";$a = fopen("index.php", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";" string(1) "b" @@ -35,4 +34,3 @@ string(%d) "phar://%snophar.phar%cweb.php" bool(true) bool(false) bool(false) -===DONE=== diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt index 5aa840e383..738efb797f 100644 --- a/ext/phar/tests/create_new_and_modify.phpt +++ b/ext/phar/tests/create_new_and_modify.phpt @@ -44,7 +44,6 @@ include $pname . '/a.php'; include $pname . '/b.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -54,4 +53,3 @@ string(40) "%s" bool(true) modified! another! -===DONE=== diff --git a/ext/phar/tests/create_new_phar.phpt b/ext/phar/tests/create_new_phar.phpt index 79724b9b74..078d75491a 100644 --- a/ext/phar/tests/create_new_phar.phpt +++ b/ext/phar/tests/create_new_phar.phpt @@ -18,10 +18,8 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/$fileName.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- brand new! Text in utf8 file. -===DONE=== diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt index 8b0d6e26dc..374d4ae821 100644 --- a/ext/phar/tests/create_new_phar_b.phpt +++ b/ext/phar/tests/create_new_phar_b.phpt @@ -13,7 +13,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -23,4 +22,3 @@ Warning: include(phar://%screate_new_phar_b.phar.php/a.php): failed to open stre Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.php/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt index 19a4c81751..dc52dbf45b 100644 --- a/ext/phar/tests/create_new_phar_c.phpt +++ b/ext/phar/tests/create_new_phar_c.phpt @@ -15,7 +15,6 @@ $phar = new Phar(__DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'); var_dump($phar->getSignature()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -25,4 +24,3 @@ array(2) { ["hash_type"]=> string(5) "SHA-1" } -===DONE=== diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 4987c19b17..9fad268065 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -60,7 +60,6 @@ foreach($checks as $check) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -80,4 +79,3 @@ string(5) "query" 12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character 13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character Exception: Phar::offsetSet() expects parameter 1 to be a valid path, string given -===DONE=== diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt index 0d904d57bb..8f6efd4efd 100644 --- a/ext/phar/tests/delete_in_phar.phpt +++ b/ext/phar/tests/delete_in_phar.phpt @@ -30,7 +30,6 @@ include $pname . '/b.php'; include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -45,4 +44,3 @@ Warning: include(%sdelete_in_phar.phar.php/b/c.php): failed to open stream: phar Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d -===DONE=== diff --git a/ext/phar/tests/delete_in_phar_b.phpt b/ext/phar/tests/delete_in_phar_b.phpt index 8d5d78debc..ce45b03c84 100644 --- a/ext/phar/tests/delete_in_phar_b.phpt +++ b/ext/phar/tests/delete_in_phar_b.phpt @@ -29,7 +29,6 @@ include $pname . '/b.php'; include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -43,4 +42,3 @@ This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt index 1f8015f0cb..066938e29c 100644 --- a/ext/phar/tests/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/delete_in_phar_confirm.phpt @@ -34,7 +34,6 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/b.ph include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -49,4 +48,3 @@ Warning: include(%sdelete_in_phar_confirm.phar.php/b/c.php): failed to open stre Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d -===DONE=== diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt index c34f01a7f1..964c437298 100644 --- a/ext/phar/tests/dir.phpt +++ b/ext/phar/tests/dir.phpt @@ -50,7 +50,6 @@ rmdir($pname); rmdir($pname . '/'); mkdir($pname . '/'); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/ok.phar'); ?> @@ -89,4 +88,3 @@ Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php", directory does not exist in %sdir.php on line %d Warning: mkdir(): phar error: cannot create directory "" in phar "%sdir.phar.php", phar error: invalid path "" must not be empty in %sdir.php on line %d -===DONE=== diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index 4a6b367aab..118a5ff550 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -44,7 +44,6 @@ echo file_get_contents("./hi", 0, $context, 0, 0); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php rmdir(__DIR__ . '/poo'); ?> @@ -99,4 +98,3 @@ echo file_get_contents("./hi", 0, $context, 50000); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> -===DONE=== diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt index 42175bc037..5af0737530 100644 --- a/ext/phar/tests/fopen.phpt +++ b/ext/phar/tests/fopen.phpt @@ -31,10 +31,8 @@ include "index.php"; __HALT_COMPILER();'); include $fname; ?> -===DONE=== --CLEAN-- <?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 -===DONE=== diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt index 5dce0384ff..52e8f476c1 100644 --- a/ext/phar/tests/fopen_edgecases.phpt +++ b/ext/phar/tests/fopen_edgecases.phpt @@ -66,7 +66,6 @@ $a = fopen("./notfound.php", "r"); include $pname . '/test.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> @@ -121,4 +120,3 @@ Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/ Warning: fopen(./notfound.php): failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d -===DONE=== diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index 840c039d9e..586e9ba20e 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -33,7 +33,6 @@ fopen("../oops", "r"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php rmdir(__DIR__ . '/poo'); ?> @@ -44,4 +43,3 @@ blah test Warning: fopen(phar://%sfopen_edgecases2.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sfopen_edgecases2.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt index 7831fc72e3..38486c4748 100644 --- a/ext/phar/tests/include_path.phpt +++ b/ext/phar/tests/include_path.phpt @@ -21,7 +21,6 @@ set_include_path('.' . PATH_SEPARATOR . 'phar://' . $fname . '/test'); include 'file1.php'; include 'file2.php'; ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tempmanifest1.phar.php'); @@ -33,4 +32,3 @@ test/file1.php Warning: include(file2.php): failed to open stream: No such file or directory in %sinclude_path.php on line %d Warning: include(): Failed opening 'file2.php' for inclusion (include_path='%sphar://%stempmanifest1.phar.php/test') in %sinclude_path.php on line %d -===DONE=== diff --git a/ext/phar/tests/ini_set_off.phpt b/ext/phar/tests/ini_set_off.phpt index 127a07a7ce..7088714a58 100644 --- a/ext/phar/tests/ini_set_off.phpt +++ b/ext/phar/tests/ini_set_off.phpt @@ -53,7 +53,6 @@ var_dump(Phar::canWrite()); var_dump(ini_get('phar.require_hash')); var_dump(ini_get('phar.readonly')); ?> -===DONE=== --EXPECT-- string(1) "0" string(1) "0" @@ -84,4 +83,3 @@ string(4) "true" bool(true) string(1) "0" string(1) "0" -===DONE=== diff --git a/ext/phar/tests/invalid_alias.phpt b/ext/phar/tests/invalid_alias.phpt index 7a3cb31575..255bef52d7 100644 --- a/ext/phar/tests/invalid_alias.phpt +++ b/ext/phar/tests/invalid_alias.phpt @@ -32,7 +32,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -42,4 +41,3 @@ Invalid alias "hi/" specified for phar "%sinvalid_alias.phar" Invalid alias "hi\l" specified for phar "%sinvalid_alias.phar" Invalid alias "hil;" specified for phar "%sinvalid_alias.phar" Invalid alias ":hil" specified for phar "%sinvalid_alias.phar" -===DONE=== diff --git a/ext/phar/tests/invalid_setstubalias.phpt b/ext/phar/tests/invalid_setstubalias.phpt index 6234df1bff..5456662709 100644 --- a/ext/phar/tests/invalid_setstubalias.phpt +++ b/ext/phar/tests/invalid_setstubalias.phpt @@ -33,7 +33,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -44,4 +43,3 @@ Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.t Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.tar", use setAlias Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.zip", use setStub Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.zip", use setAlias -===DONE=== diff --git a/ext/phar/tests/metadata_read.phpt b/ext/phar/tests/metadata_read.phpt index 2e23af2a4a..f67bf692d8 100644 --- a/ext/phar/tests/metadata_read.phpt +++ b/ext/phar/tests/metadata_read.phpt @@ -34,7 +34,6 @@ foreach($files as $name => $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -60,4 +59,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt index 1dea6dfac2..fefa2bc0c0 100644 --- a/ext/phar/tests/metadata_write.phpt +++ b/ext/phar/tests/metadata_write.phpt @@ -40,7 +40,6 @@ foreach($files as $name => $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -61,4 +60,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/metadata_write_commit.phpt b/ext/phar/tests/metadata_write_commit.phpt index def84b06f9..02fceee29d 100644 --- a/ext/phar/tests/metadata_write_commit.phpt +++ b/ext/phar/tests/metadata_write_commit.phpt @@ -48,7 +48,6 @@ foreach($files as $name => $cont) { var_dump($phar[$name]->getMetadata()); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -78,4 +77,3 @@ array(2) { string(3) "bar" } bool(true) -===DONE=== diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt index 32081b145d..3a5782f3ef 100644 --- a/ext/phar/tests/mkdir.phpt +++ b/ext/phar/tests/mkdir.phpt @@ -25,7 +25,6 @@ $a->addEmptyDir('.phar'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -44,4 +43,3 @@ Warning: rmdir(): phar error: cannot remove directory "" in phar "foo.phar", dir Warning: rmdir(): phar error: cannot remove directory "a" in phar "%smkdir.phar.php", phar error: path "a" exists and is a not a directory in %smkdir.php on line %d Cannot create a directory in magic ".phar" directory -===DONE=== diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt index 0a89e586ed..ec14348671 100644 --- a/ext/phar/tests/mounteddir.phpt +++ b/ext/phar/tests/mounteddir.phpt @@ -82,7 +82,6 @@ Phar::mount($pname . '/testit/extfile.php', __DIR__); echo $e->getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tempmanifest1.phar.php'); @@ -116,4 +115,3 @@ Mounting of /testit to another\..\mistake within phar %stempmanifest1.phar.php f Mounting of /notfound to %stests/this/does/not/exist within phar %stempmanifest1.phar.php failed Mounting of /testit to %stests within phar %stests/tempmanifest1.phar.php failed Mounting of /testit/extfile.php to %stests within phar %stests/tempmanifest1.phar.php failed -===DONE=== diff --git a/ext/phar/tests/nophar.phpt b/ext/phar/tests/nophar.phpt index e9cff950f4..46285796d4 100644 --- a/ext/phar/tests/nophar.phpt +++ b/ext/phar/tests/nophar.phpt @@ -6,9 +6,7 @@ Phar: phar run without ext/phar with default stub <?php include __DIR__ . '/files/nophar.phar'; ?> -===DONE=== --EXPECT-- in b <?php include "b/c.php"; in d -===DONE=== diff --git a/ext/phar/tests/open_for_write_existing.phpt b/ext/phar/tests/open_for_write_existing.phpt index e1648568e0..bd4988ece9 100644 --- a/ext/phar/tests/open_for_write_existing.phpt +++ b/ext/phar/tests/open_for_write_existing.phpt @@ -23,9 +23,7 @@ fclose($fp); include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?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 16b9d0cbbe..ddd1e904ef 100644 --- a/ext/phar/tests/open_for_write_existing_b.phpt +++ b/ext/phar/tests/open_for_write_existing_b.phpt @@ -22,11 +22,9 @@ include 'files/phar_test.inc'; var_dump(fopen($pname . '/b/c.php', 'wb')); include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?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) This is b/c -===DONE=== diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt index 4eee2ea25f..d46f8b23b1 100644 --- a/ext/phar/tests/open_for_write_existing_c.phpt +++ b/ext/phar/tests/open_for_write_existing_c.phpt @@ -22,11 +22,9 @@ include 'files/phar_test.inc'; var_dump(fopen($pname . '/b/c.php', 'wb')); include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?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) This is b/c -===DONE=== diff --git a/ext/phar/tests/open_for_write_newfile.phpt b/ext/phar/tests/open_for_write_newfile.phpt index bd54a13397..57b7be090d 100644 --- a/ext/phar/tests/open_for_write_newfile.phpt +++ b/ext/phar/tests/open_for_write_newfile.phpt @@ -24,10 +24,8 @@ include $pname . '/b/c.php'; include $pname . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- This is b/c extra -===DONE=== diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt index 576388eb2d..99538325af 100644 --- a/ext/phar/tests/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/open_for_write_newfile_b.phpt @@ -24,7 +24,6 @@ include $pname . '/b/c.php'; include $pname . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -36,4 +35,3 @@ Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt index 0eb70d63e5..470aefede0 100644 --- a/ext/phar/tests/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/open_for_write_newfile_c.phpt @@ -24,7 +24,6 @@ include $pname . '/b/c.php'; include $pname . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -36,4 +35,3 @@ Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt index 2f5f6635d7..ee96491061 100644 --- a/ext/phar/tests/opendir.phpt +++ b/ext/phar/tests/opendir.phpt @@ -30,7 +30,6 @@ echo "\n"; opendir('phar://'); opendir('phar://hi.phar'); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -41,4 +40,3 @@ phar url "phar://" is unknown in %sopendir.php on line %d Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar" phar url "phar://hi.phar" is unknown in %sopendir.php on line %d -===DONE=== diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index 6270eac224..594cc823f8 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -51,7 +51,6 @@ opendir("oops"); include $pname . '/foo'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php rmdir(__DIR__ . '/poo'); @@ -62,4 +61,3 @@ opendir() expects parameter 1 to be a valid path, array given foo Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): failed to open dir: %s in phar://%sopendir_edgecases.phar.php/foo on line %d -===DONE=== diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt index fffef0bdbf..44ebaabd64 100644 --- a/ext/phar/tests/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/phar_begin_setstub_commit.phpt @@ -29,7 +29,6 @@ include 'phar://phar_begin_setstub_commit.phar/a.php'; include 'phar://phar_begin_setstub_commit.phar/b.php'; var_dump($p->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/phar_begin_setstub_commit.phar'); @@ -49,4 +48,3 @@ string(5) "Hello" string(5) "World" string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?> " -===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt index b7f7338e23..71afd1647b 100644 --- a/ext/phar/tests/phar_buildfromdirectory1.phpt +++ b/ext/phar/tests/phar_buildfromdirectory1.phpt @@ -16,7 +16,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromdirectory1.phar'); @@ -25,4 +24,3 @@ __HALT_COMPILER(); --EXPECTF-- %s(24) "UnexpectedValueException" Cannot write to archive - write operations restricted by INI setting -===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt index fd552302ae..be8ee60b52 100644 --- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt @@ -18,7 +18,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromdirectory2.phar'); @@ -27,4 +26,3 @@ __HALT_COMPILER(); --EXPECTF-- %s(24) "UnexpectedValueException" RecursiveDirectoryIterator::__construct(1,1): %s (code: 2) -===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt index 0105d1967c..6d97ecbd97 100644 --- a/ext/phar/tests/phar_buildfromdirectory2.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2.phpt @@ -18,7 +18,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromdirectory2.phar'); @@ -27,4 +26,3 @@ __HALT_COMPILER(); --EXPECTF-- %s(24) "UnexpectedValueException" RecursiveDirectoryIterator::__construct(1): failed to open dir: No such file or directory -===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory4.phpt b/ext/phar/tests/phar_buildfromdirectory4.phpt index 610e67719a..78bc0f2f8b 100644 --- a/ext/phar/tests/phar_buildfromdirectory4.phpt +++ b/ext/phar/tests/phar_buildfromdirectory4.phpt @@ -27,7 +27,6 @@ try { var_dump(file_exists(__DIR__ . '/buildfromdirectory4.phar')); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromdirectory4.phar'); @@ -48,4 +47,3 @@ array(4) { string(%d) "%stestdir4%cfile4.txt" } bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory5.phpt b/ext/phar/tests/phar_buildfromdirectory5.phpt index b7434968a4..d1402dd078 100644 --- a/ext/phar/tests/phar_buildfromdirectory5.phpt +++ b/ext/phar/tests/phar_buildfromdirectory5.phpt @@ -26,7 +26,6 @@ try { var_dump(file_exists(__DIR__ . '/buildfromdirectory5.phar')); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromdirectory5.phar'); @@ -47,4 +46,3 @@ array(4) { string(%d) "%stestdir5%cfile4.txt" } bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory6.phpt b/ext/phar/tests/phar_buildfromdirectory6.phpt index 1d3491e659..3780ffbb17 100644 --- a/ext/phar/tests/phar_buildfromdirectory6.phpt +++ b/ext/phar/tests/phar_buildfromdirectory6.phpt @@ -24,7 +24,6 @@ try { var_dump(file_exists(__DIR__ . '/buildfromdirectory6.phar')); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromdirectory6.phar'); @@ -37,4 +36,3 @@ rmdir(__DIR__ . '/testdir6'); array(0) { } bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator1.phpt b/ext/phar/tests/phar_buildfromiterator1.phpt index 774ef658fa..bd81538a0b 100644 --- a/ext/phar/tests/phar_buildfromiterator1.phpt +++ b/ext/phar/tests/phar_buildfromiterator1.phpt @@ -16,7 +16,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator1.phar'); @@ -25,4 +24,3 @@ __HALT_COMPILER(); --EXPECTF-- %s(24) "UnexpectedValueException" Cannot write out phar archive, phar is read-only -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt index a7b9c8701b..735a53f656 100644 --- a/ext/phar/tests/phar_buildfromiterator10.phpt +++ b/ext/phar/tests/phar_buildfromiterator10.phpt @@ -22,7 +22,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator10.phar'); @@ -99,4 +98,3 @@ array(34) { ["zip/corrupt_010.phpt"]=> string(%d) "%szip%ccorrupt_010.phpt" } -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator4.phpt b/ext/phar/tests/phar_buildfromiterator4.phpt index fc42d77d4e..14266bab54 100644 --- a/ext/phar/tests/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/phar_buildfromiterator4.phpt @@ -51,7 +51,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator4.phar'); @@ -80,4 +79,3 @@ array(1) { ["a"]=> string(%d) "%sphar_buildfromiterator4.phpt" } -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt index a83e1c0d38..9417f9a84c 100644 --- a/ext/phar/tests/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/phar_buildfromiterator5.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator5.phar'); @@ -56,4 +55,3 @@ valid current %s(24) "UnexpectedValueException" Iterator myIterator returned an invalid value (must return a string) -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator6.phpt b/ext/phar/tests/phar_buildfromiterator6.phpt index 0b99e54611..982c094caa 100644 --- a/ext/phar/tests/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/phar_buildfromiterator6.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator6.phar'); @@ -57,4 +56,3 @@ current key %s(24) "UnexpectedValueException" Iterator myIterator returned an invalid key (must return a string) -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator7.phpt b/ext/phar/tests/phar_buildfromiterator7.phpt index bc0fa6ee4a..aa0cd7bf48 100644 --- a/ext/phar/tests/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/phar_buildfromiterator7.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator7.phar'); @@ -57,4 +56,3 @@ current key %s(24) "UnexpectedValueException" Iterator myIterator returned a file that could not be opened "phar_buildfromiterator7./oopsie/there.phpt" -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator8.phpt b/ext/phar/tests/phar_buildfromiterator8.phpt index cbee1a536a..ff50fd7748 100644 --- a/ext/phar/tests/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/phar_buildfromiterator8.phpt @@ -17,7 +17,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator8.phar'); @@ -92,4 +91,3 @@ array(33) { ["033.phpt"]=> string(%d) "%s033.phpt" } -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator9.phpt b/ext/phar/tests/phar_buildfromiterator9.phpt index 28febccf81..9dd091eee5 100644 --- a/ext/phar/tests/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/phar_buildfromiterator9.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator9.phar'); @@ -62,4 +61,3 @@ array(1) { ["a"]=> string(%d) "[stream]" } -===DONE=== diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt index cb8f07ef0b..f70e2ae9eb 100644 --- a/ext/phar/tests/phar_bz2.phpt +++ b/ext/phar/tests/phar_bz2.phpt @@ -46,7 +46,6 @@ $b->isFileFormat(25); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/phar_bz2.phar'); @@ -58,4 +57,3 @@ string(%d) "phar://%sphar_bz2.phar/tar_004.php" bool(true) bool(true) Unknown file format specified -===DONE=== diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt index 9723b2e043..5891d4b081 100644 --- a/ext/phar/tests/phar_commitwrite.phpt +++ b/ext/phar/tests/phar_commitwrite.phpt @@ -21,7 +21,6 @@ __HALT_COMPILER(); ?>"); var_dump($p->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/phar_commitwrite.phar'); @@ -37,4 +36,3 @@ Phar::mapPhar('phar_commitwrite.phar'); include 'phar://phar_commitwrite.phar/startup.php'; __HALT_COMPILER(); ?> " -===DONE=== diff --git a/ext/phar/tests/phar_construct_invalidurl.phpt b/ext/phar/tests/phar_construct_invalidurl.phpt index 30a4687289..295159fd0b 100644 --- a/ext/phar/tests/phar_construct_invalidurl.phpt +++ b/ext/phar/tests/phar_construct_invalidurl.phpt @@ -22,9 +22,7 @@ try { echo $e->getMessage(),"\n"; } ?> -===DONE=== --EXPECT-- Cannot create a phar archive from a URL like "http://should.fail.com". Phar objects can only be created from local files Cannot create a phar archive from a URL like "http://". Phar objects can only be created from local files Cannot create phar 'http:/', file extension (or combination) not recognised or the directory does not exist -===DONE=== diff --git a/ext/phar/tests/phar_convert_again.phpt b/ext/phar/tests/phar_convert_again.phpt index 126e6a64b3..82dc739efb 100644 --- a/ext/phar/tests/phar_convert_again.phpt +++ b/ext/phar/tests/phar_convert_again.phpt @@ -152,7 +152,6 @@ $tgz->convertToData(Phar::TAR, Phar::GZ, '.phar/.tgz.oops'); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -202,4 +201,3 @@ A Phar stub cannot be set in a plain tar archive data phar "%sphar_convert_again2.phar.tgz.oops" has invalid extension phar.tgz.oops phar "%sphar_convert_again2.tgz.oops" has invalid extension tgz.oops data phar "%sphar_convert_again2.phar/.tgz.oops" has invalid extension phar/.tgz.oops -===DONE=== diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt index 94b5bf47ff..f7553f489d 100644 --- a/ext/phar/tests/phar_convert_repeated.phpt +++ b/ext/phar/tests/phar_convert_repeated.phpt @@ -85,7 +85,6 @@ var_dump($phar->getStub()); var_dump($phar->getAlias()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -146,4 +145,3 @@ bool(true) string(60) "<?php // zip-based phar archive stub file __HALT_COMPILER();" NULL -===DONE=== diff --git a/ext/phar/tests/phar_convert_repeated_b.phpt b/ext/phar/tests/phar_convert_repeated_b.phpt index faa372d071..484789cf1f 100644 --- a/ext/phar/tests/phar_convert_repeated_b.phpt +++ b/ext/phar/tests/phar_convert_repeated_b.phpt @@ -75,7 +75,6 @@ try { echo $e->getMessage()."\n"; } ?> -===DONE=== --CLEAN-- <?php echo __DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz' . "\n"; @@ -117,4 +116,3 @@ string(0) "" NULL ================= convertToPhar() ==================== Cannot write out executable phar archive, phar is read-only -===DONE=== diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt index 5efbe9bed5..d4a7f3c8bc 100644 --- a/ext/phar/tests/phar_convert_tar.phpt +++ b/ext/phar/tests/phar_convert_tar.phpt @@ -37,7 +37,6 @@ var_dump($phar->isFileFormat(Phar::TAR)); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -54,4 +53,3 @@ __HALT_COMPILER();" bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" -===DONE=== diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt index 5b7eb8cc8a..54130aec99 100644 --- a/ext/phar/tests/phar_convert_tar2.phpt +++ b/ext/phar/tests/phar_convert_tar2.phpt @@ -41,7 +41,6 @@ var_dump($phar->isCompressed() == Phar::GZ); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); @@ -61,4 +60,3 @@ bool(true) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" -===DONE=== diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt index bc737d5483..031303241a 100644 --- a/ext/phar/tests/phar_convert_tar3.phpt +++ b/ext/phar/tests/phar_convert_tar3.phpt @@ -41,7 +41,6 @@ var_dump($phar->isCompressed() == Phar::BZ2); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2'); @@ -62,4 +61,3 @@ bool(true) bool(true) string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" -===DONE=== diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt index 8f8ef415b1..584e58ee99 100644 --- a/ext/phar/tests/phar_convert_zip.phpt +++ b/ext/phar/tests/phar_convert_zip.phpt @@ -36,7 +36,6 @@ $phar = new Phar($fname3); var_dump($phar->isFileFormat(Phar::ZIP)); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -53,4 +52,3 @@ __HALT_COMPILER();" bool(true) string(60) "<?php // zip-based phar archive stub file __HALT_COMPILER();" -===DONE=== diff --git a/ext/phar/tests/phar_copy.phpt b/ext/phar/tests/phar_copy.phpt index 2f5c2d5bd2..4ab45aad80 100644 --- a/ext/phar/tests/phar_copy.phpt +++ b/ext/phar/tests/phar_copy.phpt @@ -67,7 +67,6 @@ $p2->copy('.phar/stub.php', 'd'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar.php'); ?> @@ -80,4 +79,3 @@ file "a" cannot be copied to file "b", file must not already exist in phar %spha hi file "d" cannot be copied to file ".phar/stub.php", cannot copy to Phar meta-file in %sphar_copy2.phar.php file ".phar/stub.php" cannot be copied to file "d", cannot copy Phar meta-file in %sphar_copy2.phar.php -===DONE=== diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt index f091055596..3a7b38f698 100644 --- a/ext/phar/tests/phar_create_in_cwd.phpt +++ b/ext/phar/tests/phar_create_in_cwd.phpt @@ -25,7 +25,6 @@ __HALT_COMPILER(); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/phar_create_in_cwd.phar'); @@ -40,4 +39,3 @@ Phar::mapPhar('phar_create_in_cwd.phar'); include 'phar://phar_create_in_cwd.phar/startup.php'; __HALT_COMPILER(); ?> " -===DONE=== diff --git a/ext/phar/tests/phar_createdefaultstub.phpt b/ext/phar/tests/phar_createdefaultstub.phpt index e074d649bd..0ed5abfb69 100644 --- a/ext/phar/tests/phar_createdefaultstub.phpt +++ b/ext/phar/tests/phar_createdefaultstub.phpt @@ -32,7 +32,6 @@ var_dump(Phar::createDefaultStub('hio', str_repeat('a', 401))); echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- string(6641) "<?php @@ -926,4 +925,3 @@ __HALT_COMPILER(); ?>" ============================================================================ int(7032) Illegal web filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed -===DONE=== diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt index 8aba1259a1..96402333a7 100644 --- a/ext/phar/tests/phar_ctx_001.phpt +++ b/ext/phar/tests/phar_ctx_001.phpt @@ -58,7 +58,6 @@ var_dump(file_get_contents($pname . '/b')); var_dump($phar['b']->isCompressed()); var_dump($phar['b']->getMetaData()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -97,4 +96,3 @@ array(1) { [0]=> int(4) } -===DONE=== diff --git a/ext/phar/tests/phar_decompress.phpt b/ext/phar/tests/phar_decompress.phpt index 3b16b78f64..6f5e33452b 100644 --- a/ext/phar/tests/phar_decompress.phpt +++ b/ext/phar/tests/phar_decompress.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -63,4 +62,3 @@ int(4096) %sphar_decompress.hooba.phar Cannot decompress phar archive, phar is read-only Cannot decompress zip-based archives with whole-archive compression -===DONE=== diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt index 754ae44600..95a0775a87 100644 --- a/ext/phar/tests/phar_dir_iterate.phpt +++ b/ext/phar/tests/phar_dir_iterate.phpt @@ -18,7 +18,6 @@ foreach (new RecursiveIteratorIterator($newphar) as $path => $obj) { var_dump($obj->getPathName()); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -28,4 +27,3 @@ __halt_compiler(); string(%d) "phar://%sphar_dir_iterate.phar.php%canother.file.txt" string(%d) "phar://%sphar_dir_iterate.phar.php/sub%ctop.txt" string(%d) "phar://%sphar_dir_iterate.phar.php%ctop.txt" -===DONE=== diff --git a/ext/phar/tests/phar_dotted_path.phpt b/ext/phar/tests/phar_dotted_path.phpt index 9f7fb217fc..0315da5e28 100644 --- a/ext/phar/tests/phar_dotted_path.phpt +++ b/ext/phar/tests/phar_dotted_path.phpt @@ -29,7 +29,6 @@ foreach ($phar as $entry) { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/broken.dirname/dotted_path.phar'); @@ -38,4 +37,3 @@ rmdir(__DIR__ . '/broken.dirname'); --EXPECT-- this is a this is b -===DONE=== diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt index d3b4afcf6c..89f3dc29a3 100644 --- a/ext/phar/tests/phar_extract.phpt +++ b/ext/phar/tests/phar_extract.phpt @@ -103,7 +103,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php @rmdir(__DIR__ . '/whatever'); @@ -152,4 +151,3 @@ string(5) "first" string(2) "hi" Cannot extract to "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...", destination directory is too long for filesystem Extraction from phar "%stempmanifest1.phar.php" failed: Cannot extract "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..." to "%s...", extracted filename is too long for filesystem -===DONE=== diff --git a/ext/phar/tests/phar_extract2.phpt b/ext/phar/tests/phar_extract2.phpt index dd41f38660..719189fbf3 100644 --- a/ext/phar/tests/phar_extract2.phpt +++ b/ext/phar/tests/phar_extract2.phpt @@ -34,7 +34,6 @@ foreach ($extracted as $out) { } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tempmanifest2.phar.php'); @@ -57,4 +56,3 @@ $dir = __DIR__ . '/extract1/'; %sextract2%csubdir %sextract2%csubdir%cectory %sextract2%csubdir%cectory%cfile.txt -===DONE=== diff --git a/ext/phar/tests/phar_extract3.phpt b/ext/phar/tests/phar_extract3.phpt index ffd31a4201..f342dc6e5a 100644 --- a/ext/phar/tests/phar_extract3.phpt +++ b/ext/phar/tests/phar_extract3.phpt @@ -31,7 +31,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php $dir = __DIR__ . '/test-extract3/'; @@ -43,4 +42,3 @@ $dir = __DIR__ . '/test-extract3/'; Invalid argument, %sfiles/bogus.zip cannot be found phar://%sfiles/notbogus.zip%cnonsense.txt phar://%sfiles/notbogus.zip%cstuff.txt -===DONE=== diff --git a/ext/phar/tests/phar_get_supported_signatures_002.phpt b/ext/phar/tests/phar_get_supported_signatures_002.phpt index d55785264d..86740d5411 100644 --- a/ext/phar/tests/phar_get_supported_signatures_002.phpt +++ b/ext/phar/tests/phar_get_supported_signatures_002.phpt @@ -13,8 +13,6 @@ phar.readonly=0 <?php var_dump(Phar::getSupportedSignatures()); ?> -===DONE=== -?> --EXPECT-- array(4) { [0]=> @@ -26,4 +24,3 @@ array(4) { [3]=> string(7) "SHA-512" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supported_signatures_002a.phpt b/ext/phar/tests/phar_get_supported_signatures_002a.phpt index 391ee600cc..c8e4989dd1 100644 --- a/ext/phar/tests/phar_get_supported_signatures_002a.phpt +++ b/ext/phar/tests/phar_get_supported_signatures_002a.phpt @@ -13,7 +13,6 @@ phar.readonly=0 <?php var_dump(Phar::getSupportedSignatures()); ?> -===DONE=== --EXPECT-- array(5) { [0]=> @@ -27,4 +26,3 @@ array(5) { [4]=> string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp1.phpt b/ext/phar/tests/phar_get_supportedcomp1.phpt index fecb806f2e..2dcbd72df2 100644 --- a/ext/phar/tests/phar_get_supportedcomp1.phpt +++ b/ext/phar/tests/phar_get_supportedcomp1.phpt @@ -10,7 +10,6 @@ phar.require_hash=0 <?php var_dump(Phar::getSupportedCompression()); ?> -===DONE=== --EXPECT-- array(2) { [0]=> @@ -18,4 +17,3 @@ array(2) { [1]=> string(5) "BZIP2" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp2.phpt b/ext/phar/tests/phar_get_supportedcomp2.phpt index aa941d0e4b..c08a55ed52 100644 --- a/ext/phar/tests/phar_get_supportedcomp2.phpt +++ b/ext/phar/tests/phar_get_supportedcomp2.phpt @@ -10,10 +10,8 @@ phar.require_hash=0 <?php var_dump(Phar::getSupportedCompression()); ?> -===DONE=== --EXPECT-- array(1) { [0]=> string(5) "BZIP2" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp3.phpt b/ext/phar/tests/phar_get_supportedcomp3.phpt index fadb482042..4fbc442215 100644 --- a/ext/phar/tests/phar_get_supportedcomp3.phpt +++ b/ext/phar/tests/phar_get_supportedcomp3.phpt @@ -10,10 +10,8 @@ phar.require_hash=0 <?php var_dump(Phar::getSupportedCompression()); ?> -===DONE=== --EXPECT-- array(1) { [0]=> string(2) "GZ" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp4.phpt b/ext/phar/tests/phar_get_supportedcomp4.phpt index 1d953e2e38..91137989ba 100644 --- a/ext/phar/tests/phar_get_supportedcomp4.phpt +++ b/ext/phar/tests/phar_get_supportedcomp4.phpt @@ -8,8 +8,6 @@ Phar::getSupportedCompression() (none) <?php var_dump(Phar::getSupportedCompression()); ?> -===DONE=== --EXPECT-- array(0) { } -===DONE=== diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt index ff7b685aac..7b1b683fa4 100644 --- a/ext/phar/tests/phar_gobyebye-win32.phpt +++ b/ext/phar/tests/phar_gobyebye-win32.phpt @@ -24,7 +24,6 @@ opendir("foo/hi"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> @@ -45,4 +44,3 @@ bool(false) Warning: opendir(foo/hi,foo/hi): %s (code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt index 753562571d..fd779ff549 100644 --- a/ext/phar/tests/phar_gobyebye.phpt +++ b/ext/phar/tests/phar_gobyebye.phpt @@ -25,7 +25,6 @@ opendir("foo/hi"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> @@ -44,4 +43,3 @@ bool(false) bool(false) Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt index 16821caab6..f31bf03e73 100644 --- a/ext/phar/tests/phar_gzip.phpt +++ b/ext/phar/tests/phar_gzip.phpt @@ -40,7 +40,6 @@ $b = new Phar($fname2); var_dump($b->isFileFormat(Phar::PHAR)); var_dump($b->isCompressed() == Phar::GZ); ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/phar_gzip.phar'); @@ -51,4 +50,3 @@ string(9) "it worked" string(%d) "phar://%sphar_gzip.phar/tar_004.php" bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt index 6e299d08e0..8b9088b9b3 100644 --- a/ext/phar/tests/phar_isvalidpharfilename.phpt +++ b/ext/phar/tests/phar_isvalidpharfilename.phpt @@ -69,7 +69,6 @@ var_dump(Phar::isValidPharFilename('dir.phar.php', true)); var_dump(Phar::isValidPharFilename('dir.phar.php', false)); ?> -===DONE=== --CLEAN-- <?php rmdir(__DIR__ . '/.phar'); @@ -132,4 +131,3 @@ dir.phar.php bool(true) bool(true) bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index 42ad3d3c71..72033364f4 100644 --- a/ext/phar/tests/phar_magic.phpt +++ b/ext/phar/tests/phar_magic.phpt @@ -18,7 +18,6 @@ include "phar://" . __FILE__ . "/a"; __HALT_COMPILER();'); include $fname; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -28,4 +27,3 @@ __HALT_COMPILER(); in b <?php include "b/c.php"; in d -===DONE=== diff --git a/ext/phar/tests/phar_metadata_read.phpt b/ext/phar/tests/phar_metadata_read.phpt index 1c8428adba..56d46713f2 100644 --- a/ext/phar/tests/phar_metadata_read.phpt +++ b/ext/phar/tests/phar_metadata_read.phpt @@ -46,7 +46,6 @@ foreach($files as $name => $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -94,4 +93,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/phar_metadata_write.phpt b/ext/phar/tests/phar_metadata_write.phpt index a15d23d4c6..7a70491f49 100644 --- a/ext/phar/tests/phar_metadata_write.phpt +++ b/ext/phar/tests/phar_metadata_write.phpt @@ -44,7 +44,6 @@ foreach($files as $name => $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -70,4 +69,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/phar_mount.phpt b/ext/phar/tests/phar_mount.phpt index 73bd489a2d..bffdf76470 100644 --- a/ext/phar/tests/phar_mount.phpt +++ b/ext/phar/tests/phar_mount.phpt @@ -49,7 +49,6 @@ echo $e->getMessage(),"\n"; Phar::mount($pname . '/testit2', $pname . '/testit1'); echo substr($a['testit2']->getContent(),0, 50),"\n"; ?> -===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> @@ -60,4 +59,3 @@ Mounting of testit to %sphar_mount.php within phar %sphar_mount.phar.tar failed Mounting of /oops to /home/oops/../../etc/passwd: within phar %sphar_mount.phar.php failed <?php $fname = dirname(__FILE__) . '/' . basename( -===DONE=== diff --git a/ext/phar/tests/phar_offset_check.phpt b/ext/phar/tests/phar_offset_check.phpt index 493d823a68..32b67685cc 100644 --- a/ext/phar/tests/phar_offset_check.phpt +++ b/ext/phar/tests/phar_offset_check.phpt @@ -62,7 +62,6 @@ try { var_dump($phar->getAlias()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -74,4 +73,3 @@ int(6643) Cannot set alias ".phar/alias.txt" directly in phar "%sphar_offset_check.phar.php", use setAlias string(5) "susan" string(5) "susan" -===DONE=== diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt index 54dec470c2..b49035fd66 100644 --- a/ext/phar/tests/phar_offset_get_error.phpt +++ b/ext/phar/tests/phar_offset_get_error.phpt @@ -39,7 +39,6 @@ $a = $p['.phar/stub.php']; echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- @@ -47,4 +46,3 @@ Entry /error/.. does not exist and cannot be created: phar error: invalid path " foobar Cannot set any files or directories in magic ".phar" directory Entry .phar/stub.php does not exist -===DONE=== diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt index 83d52eeabf..ba93c88107 100644 --- a/ext/phar/tests/phar_oo_001.phpt +++ b/ext/phar/tests/phar_oo_001.phpt @@ -41,7 +41,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_001.phar.php'); @@ -52,4 +51,3 @@ string(5) "1.0.0" int(5) string(50) "Cannot call method on an uninitialized Phar object" string(29) "Cannot call constructor twice" -===DONE=== diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt index fdc08c3bfc..9be0877676 100644 --- a/ext/phar/tests/phar_oo_002.phpt +++ b/ext/phar/tests/phar_oo_002.phpt @@ -45,7 +45,6 @@ foreach(new RecursiveIteratorIterator($phar) as $name => $ent) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_002.phar.php'); @@ -135,4 +134,3 @@ int(32) bool(false) NULL int(0) -===DONE=== diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt index 4ff8361120..110dcec9e7 100644 --- a/ext/phar/tests/phar_oo_003.phpt +++ b/ext/phar/tests/phar_oo_003.phpt @@ -23,7 +23,6 @@ foreach($phar as $name => $ent) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_003.phar.php'); @@ -41,4 +40,3 @@ This is b.php string(5) "e.php" string(32) "<?php echo "This is e.php\n"; ?>" This is e.php -===DONE=== diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt index 2191e0082b..5130f816d4 100644 --- a/ext/phar/tests/phar_oo_004.phpt +++ b/ext/phar/tests/phar_oo_004.phpt @@ -73,7 +73,6 @@ foreach($it as $name => $ent) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_004.phar.php'); @@ -124,4 +123,3 @@ int(3) string(5) "e.php" MyDirectoryIterator::next MyDirectoryIterator::valid -===DONE=== diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt index 27279ddbbc..7b414435c4 100644 --- a/ext/phar/tests/phar_oo_005.phpt +++ b/ext/phar/tests/phar_oo_005.phpt @@ -26,7 +26,6 @@ foreach($it as $name => $ent) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_005.phar.php'); @@ -58,4 +57,3 @@ string(14) "phar://*/e.php" string(0) "" string(5) "e.php" string(20) "phar_oo_005.phar.php" -===DONE=== diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt index 412726908b..9e14127a8e 100644 --- a/ext/phar/tests/phar_oo_006.phpt +++ b/ext/phar/tests/phar_oo_006.phpt @@ -34,7 +34,6 @@ echo $phar['b/c.php']->getFilename() . "\n"; echo $phar['b.php']->getFilename() . "\n"; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_006.phar.php'); @@ -48,4 +47,3 @@ MyFile::__construct(phar://%s/b/c.php) c.php MyFile::__construct(phar://%s/b.php) b.php -===DONE=== diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt index 7af8bfa790..7cb803f15e 100644 --- a/ext/phar/tests/phar_oo_007.phpt +++ b/ext/phar/tests/phar_oo_007.phpt @@ -55,7 +55,6 @@ var_dump($f->eof()); //unset($f); without unset we check for working refcounting ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_007.phar.php'); @@ -83,4 +82,3 @@ int(0) bool(false) string(32) "<?php echo "This is a.php\n"; ?>" bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt index e1107df4ef..7ae68c034d 100644 --- a/ext/phar/tests/phar_oo_008.phpt +++ b/ext/phar/tests/phar_oo_008.phpt @@ -79,7 +79,6 @@ foreach($v as $k => $d) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_008.phar.php'); @@ -115,4 +114,3 @@ MyCSVFile2::getCurrentLine 3=>2|a|b MyCSVFile2::getCurrentLine 5=>3|c|'e' -===DONE=== diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt index c6898d456d..a630ceb7a3 100644 --- a/ext/phar/tests/phar_oo_009.phpt +++ b/ext/phar/tests/phar_oo_009.phpt @@ -33,7 +33,6 @@ foreach($f as $k => $v) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_009.phar.php'); @@ -53,4 +52,3 @@ __halt_compiler(); 3=>4 4=>5|5 6=>7|777 -===DONE=== diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt index 243a11e92f..2bd2297310 100644 --- a/ext/phar/tests/phar_oo_010.phpt +++ b/ext/phar/tests/phar_oo_010.phpt @@ -32,7 +32,6 @@ var_dump(isset($phar[12])); var_dump(isset($phar['b'])); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_010.phar.php'); @@ -51,4 +50,3 @@ bool(false) bool(false) bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt index 223a214fe0..03dc452ac7 100644 --- a/ext/phar/tests/phar_oo_011.phpt +++ b/ext/phar/tests/phar_oo_011.phpt @@ -22,7 +22,6 @@ echo $phar['hi/f.php']; echo "\n"; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_011.phar.php'); @@ -32,4 +31,3 @@ __halt_compiler(); bool(true) bool(true) hi -===DONE=== diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt index 098742ca7f..fcba17e0be 100644 --- a/ext/phar/tests/phar_oo_011b.phpt +++ b/ext/phar/tests/phar_oo_011b.phpt @@ -27,7 +27,6 @@ catch (BadMethodCallException $e) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_011b.phar.php'); @@ -35,4 +34,3 @@ __halt_compiler(); ?> --EXPECT-- Exception: Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt index 44e0eecdfa..4142b2e291 100644 --- a/ext/phar/tests/phar_oo_012.phpt +++ b/ext/phar/tests/phar_oo_012.phpt @@ -23,7 +23,6 @@ unset($phar['f.php']); var_dump(isset($phar['f.php'])); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_012.phar.php'); @@ -33,4 +32,3 @@ __halt_compiler(); bool(true) hi bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt index d69af5d0e6..8475946e1c 100644 --- a/ext/phar/tests/phar_oo_012_confirm.phpt +++ b/ext/phar/tests/phar_oo_012_confirm.phpt @@ -26,7 +26,6 @@ if ($md5 == $md52) echo 'File on disk has not changed'; var_dump(isset($phar['f.php'])); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_012_confirm.phar.php'); @@ -36,4 +35,3 @@ __halt_compiler(); bool(true) hi bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt index bafd13c489..6f85ac19c0 100644 --- a/ext/phar/tests/phar_oo_012b.phpt +++ b/ext/phar/tests/phar_oo_012b.phpt @@ -30,7 +30,6 @@ catch (BadMethodCallException $e) } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_012b.phar.php'); @@ -38,4 +37,3 @@ __halt_compiler(); ?> --EXPECT-- Exception: Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt index 8a1c5f21b2..6c04052f1d 100644 --- a/ext/phar/tests/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/phar_oo_compressallbz2.phpt @@ -41,7 +41,6 @@ var_dump($phar['c']->isCompressed(Phar::GZ)); var_dump($phar['b']->isCompressed(Phar::BZ2)); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -63,4 +62,3 @@ bool(true) string(1) "c" bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt index a42a92770c..d22f995426 100644 --- a/ext/phar/tests/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/phar_oo_compressallgz.phpt @@ -45,7 +45,6 @@ $phar->compressFiles(25); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -68,4 +67,3 @@ string(1) "c" bool(true) bool(false) Unknown compression specified, please pass one of Phar::GZ or Phar::BZ2 -===DONE=== diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt index 8b6e96419f..6392b1da57 100644 --- a/ext/phar/tests/phar_oo_compressed_001.phpt +++ b/ext/phar/tests/phar_oo_compressed_001.phpt @@ -45,7 +45,6 @@ var_dump(file_get_contents($pname . '/d')); var_dump($phar['d']->isCompressed()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -65,4 +64,3 @@ string(1) "c" bool(false) string(5) "new d" bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt index bd8404638d..cfd9ba8cab 100644 --- a/ext/phar/tests/phar_oo_compressed_001b.phpt +++ b/ext/phar/tests/phar_oo_compressed_001b.phpt @@ -45,7 +45,6 @@ var_dump(file_get_contents($pname . '/d')); var_dump($phar['d']->isCompressed()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -65,4 +64,3 @@ string(1) "c" bool(false) string(5) "new d" bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt index 0f3f6a5d6e..accf32b64f 100644 --- a/ext/phar/tests/phar_oo_compressed_002.phpt +++ b/ext/phar/tests/phar_oo_compressed_002.phpt @@ -48,7 +48,6 @@ var_dump(file_get_contents($pname . '/e')); var_dump($phar['e']->isCompressed()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -70,4 +69,3 @@ string(5) "new d" bool(false) string(5) "new e" bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt index 8c4fbc8966..e27887bdbf 100644 --- a/ext/phar/tests/phar_oo_compressed_002b.phpt +++ b/ext/phar/tests/phar_oo_compressed_002b.phpt @@ -48,7 +48,6 @@ var_dump(file_get_contents($pname . '/e')); var_dump($phar['e']->isCompressed()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -70,4 +69,3 @@ string(5) "new d" bool(false) string(5) "new e" bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt index 35b9a4a887..bac62a6e0d 100644 --- a/ext/phar/tests/phar_oo_getcontents.phpt +++ b/ext/phar/tests/phar_oo_getcontents.phpt @@ -24,7 +24,6 @@ echo $phar['hi']->getContent(), "\n"; echo $e->getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -35,4 +34,3 @@ file contents this works Phar error: Cannot retrieve contents, "a" in phar "%sphar_oo_getcontents.phar.php" is a directory Phar error: Cannot retrieve contents, "hi" in phar "%sphar_oo_getcontents.phar.php" is a directory -===DONE=== diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt index e15b177316..7510ac57a6 100644 --- a/ext/phar/tests/phar_oo_getcontentsgz.phpt +++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt @@ -19,7 +19,6 @@ $phar2 = new Phar($fname2); var_dump($phar2['a']->isCompressed()); echo $phar2['a']->getContent() . "\n"; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -30,4 +29,3 @@ __halt_compiler(); bool(true) file contents this works -===DONE=== diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt index 7a11b8920c..7622894475 100644 --- a/ext/phar/tests/phar_oo_getmodified.phpt +++ b/ext/phar/tests/phar_oo_getmodified.phpt @@ -24,7 +24,6 @@ var_dump($phar->getModified()); $phar->compressFiles(Phar::GZ); var_dump($phar->getModified()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -33,4 +32,3 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); --EXPECT-- bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_oo_iswriteable.phpt b/ext/phar/tests/phar_oo_iswriteable.phpt index b87f58f0da..8467ff2f25 100644 --- a/ext/phar/tests/phar_oo_iswriteable.phpt +++ b/ext/phar/tests/phar_oo_iswriteable.phpt @@ -56,7 +56,6 @@ var_dump($a->isWritable()); var_dump($b->isWritable()); chmod($fname2, 0666); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); @@ -81,4 +80,3 @@ bool(false) bool(true) bool(false) bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt index acf897490b..b0f18c0441 100644 --- a/ext/phar/tests/phar_oo_nosig.phpt +++ b/ext/phar/tests/phar_oo_nosig.phpt @@ -12,7 +12,6 @@ require_once 'files/phar_oo_test.inc'; $phar = new Phar($fname); var_dump($phar->getSignature()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/files/phar_oo_test.phar.php'); @@ -20,4 +19,3 @@ __halt_compiler(); ?> --EXPECT-- bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index f669f5e8ca..c3e38a649a 100644 --- a/ext/phar/tests/phar_oo_uncompressall.phpt +++ b/ext/phar/tests/phar_oo_uncompressall.phpt @@ -49,7 +49,6 @@ var_dump(file_get_contents($pname . '/c')); var_dump($phar['a']->isCompressed()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -77,4 +76,3 @@ string(1) "b" bool(false) string(1) "c" bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_running.phpt b/ext/phar/tests/phar_running.phpt index 7b74921a3e..4c7491f463 100644 --- a/ext/phar/tests/phar_running.phpt +++ b/ext/phar/tests/phar_running.phpt @@ -17,11 +17,9 @@ var_dump(Phar::running(false)); include $pname . '/index.php'; var_dump(Phar::running()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- string(%d) "phar://%sphar_running.phar.php" string(%d) "%sphar_running.phar.php" string(0) "" -===DONE=== diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt index 7d67d787c5..e193f5f37f 100644 --- a/ext/phar/tests/phar_setalias.phpt +++ b/ext/phar/tests/phar_setalias.phpt @@ -23,7 +23,6 @@ echo $phar->getAlias() . "\n"; $phar->setAlias('test'); echo $phar->getAlias() . "\n"; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -33,4 +32,3 @@ __HALT_COMPILER(); --EXPECT-- hio test -===DONE=== diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt index 4a9d9ea638..6a0876b5f9 100644 --- a/ext/phar/tests/phar_setalias2.phpt +++ b/ext/phar/tests/phar_setalias2.phpt @@ -35,7 +35,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -48,4 +47,3 @@ hio test alias "test" is already used for archive "%sphar_setalias2.phar.php" and cannot be used for other archives alias "test" is already used for archive "%sphar_setalias2.phar.php" cannot be overloaded with "%snope.phar" -===DONE=== diff --git a/ext/phar/tests/phar_setdefaultstub.phpt b/ext/phar/tests/phar_setdefaultstub.phpt index f834f3543e..6fed792966 100644 --- a/ext/phar/tests/phar_setdefaultstub.phpt +++ b/ext/phar/tests/phar_setdefaultstub.phpt @@ -48,7 +48,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -941,4 +940,3 @@ __HALT_COMPILER(); ?> ============================================================================ int(7034) Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed -===DONE=== diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt index 726e756a65..a0d2e03f73 100644 --- a/ext/phar/tests/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/phar_setsignaturealgo2.phpt @@ -43,7 +43,6 @@ var_dump($p->getSignature()); echo $e->getMessage(); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -85,4 +84,3 @@ array(2) { ["hash_type"]=> string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt index e5b2f27f1d..e2fec8054c 100644 --- a/ext/phar/tests/phar_stub.phpt +++ b/ext/phar/tests/phar_stub.phpt @@ -75,7 +75,6 @@ if (fread($fp, strlen('booya')) == 'booya') { fclose($fp); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -89,4 +88,3 @@ __HALT_COMPILER(); <?php echo "third stub\n"; __HALT_COMPILER(); ?>booya <?php echo "third stub\n"; __HALT_COMPILER(); ?> <?php echo "third stub\n"; __HALT_COMPILER(); ?> -===DONE=== diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt index 065078d296..0a95e290de 100644 --- a/ext/phar/tests/phar_stub_error.phpt +++ b/ext/phar/tests/phar_stub_error.phpt @@ -38,7 +38,6 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -53,4 +52,3 @@ string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>" bool(true) string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>" bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt index 67bea0ddfe..21853ee3bd 100644 --- a/ext/phar/tests/phar_stub_write.phpt +++ b/ext/phar/tests/phar_stub_write.phpt @@ -41,7 +41,6 @@ var_dump($phar->getStub() == $stub); var_dump($phar->getStub() == $sexp); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -61,4 +60,3 @@ bool(false) bool(true) bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt index 5589033297..ce615ef0cd 100644 --- a/ext/phar/tests/phar_stub_write_file.phpt +++ b/ext/phar/tests/phar_stub_write_file.phpt @@ -42,7 +42,6 @@ var_dump($phar->getStub() == $stub); var_dump($phar->getStub() == $sexp); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); @@ -62,4 +61,3 @@ bool(false) bool(true) bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_unlinkarchive.phpt b/ext/phar/tests/phar_unlinkarchive.phpt index 4477719c11..8789c37e79 100644 --- a/ext/phar/tests/phar_unlinkarchive.phpt +++ b/ext/phar/tests/phar_unlinkarchive.phpt @@ -80,7 +80,6 @@ $phar['another.php'] = "hi\n"; unset($phar); include $pname . '/evil.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -108,4 +107,3 @@ int(0) phar archive "%sphar_unlinkarchive.phar" cannot be unlinked from within itself string(%d) "%sphar_unlinkarchive.phar" hi -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt index 1c9c355689..822b5ac628 100644 --- a/ext/phar/tests/pharfileinfo_chmod.phpt +++ b/ext/phar/tests/pharfileinfo_chmod.phpt @@ -22,9 +22,7 @@ echo $e->getMessage(), "\n"; lstat($pname . '/a/b'); // sets BG(CurrentLStatFile) $b->chmod(0666); ?> -===DONE=== --CLEAN-- <?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 c8f236d166..8abd5a9b2d 100644 --- a/ext/phar/tests/pharfileinfo_compression.phpt +++ b/ext/phar/tests/pharfileinfo_compression.phpt @@ -70,7 +70,6 @@ var_dump($b->decompress()); var_dump($b->decompress()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> @@ -89,4 +88,3 @@ Phar is readonly, cannot decompress Phar entry is a directory, cannot set compression bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_construct.phpt b/ext/phar/tests/pharfileinfo_construct.phpt index 4802e0fb40..4597660d80 100644 --- a/ext/phar/tests/pharfileinfo_construct.phpt +++ b/ext/phar/tests/pharfileinfo_construct.phpt @@ -45,7 +45,6 @@ $a = new PharFileInfo(__FILE__); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- @@ -54,4 +53,3 @@ PharFileInfo::__construct() expects parameter 1 to be a valid path, array given Cannot access phar file entry '%s' in archive '%s' Cannot call constructor twice '%s' is not a valid phar archive URL (must have at least phar://filename.phar) -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_getcrc32.phpt b/ext/phar/tests/pharfileinfo_getcrc32.phpt index 277d96804a..b8061280f7 100644 --- a/ext/phar/tests/pharfileinfo_getcrc32.phpt +++ b/ext/phar/tests/pharfileinfo_getcrc32.phpt @@ -39,11 +39,9 @@ var_dump($b->getCRC32()); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?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 int(%s) -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_setmetadata.phpt b/ext/phar/tests/pharfileinfo_setmetadata.phpt index 97f3b15ed1..38e23f706d 100644 --- a/ext/phar/tests/pharfileinfo_setmetadata.phpt +++ b/ext/phar/tests/pharfileinfo_setmetadata.phpt @@ -37,7 +37,6 @@ $b->delMetadata(); echo $e->getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> @@ -46,4 +45,3 @@ Phar entry is a temporary directory (not an actual entry in the archive), cannot Phar entry is a temporary directory (not an actual entry in the archive), cannot delete metadata Write operations disabled by the php.ini setting phar.readonly Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/phpinfo_001.phpt b/ext/phar/tests/phpinfo_001.phpt index be726647a0..dde85f969f 100644 --- a/ext/phar/tests/phpinfo_001.phpt +++ b/ext/phar/tests/phpinfo_001.phpt @@ -19,7 +19,6 @@ ini_set('phar.readonly',1); ini_set('phar.require_hash',1); phpinfo(INFO_MODULES); ?> -===DONE=== --EXPECTF-- %aPhar @@ -61,4 +60,3 @@ phar.cache_list => no value => no value phar.readonly => On => Off phar.require_hash => On => Off %a -===DONE=== diff --git a/ext/phar/tests/phpinfo_002.phpt b/ext/phar/tests/phpinfo_002.phpt index 10303e5280..0d12fe938c 100644 --- a/ext/phar/tests/phpinfo_002.phpt +++ b/ext/phar/tests/phpinfo_002.phpt @@ -16,7 +16,6 @@ phar.cache_list= <?php phpinfo(INFO_MODULES); ?> -===DONE=== --EXPECTF-- %a Phar @@ -39,4 +38,3 @@ phar.cache_list => no value => no value phar.readonly => On => On phar.require_hash => On => On %a -===DONE=== diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt index fb27fb6fb9..0636e932ff 100644 --- a/ext/phar/tests/phpinfo_003.phpt +++ b/ext/phar/tests/phpinfo_003.phpt @@ -16,7 +16,6 @@ phar.cache_list= <?php phpinfo(INFO_MODULES); ?> -===DONE=== --EXPECTF-- %a Phar @@ -39,4 +38,3 @@ phar.cache_list => no value => no value phar.readonly => On => On phar.require_hash => On => On %a -===DONE=== diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt index b4b533e360..3dc863f132 100644 --- a/ext/phar/tests/readfile_edgecases.phpt +++ b/ext/phar/tests/readfile_edgecases.phpt @@ -28,7 +28,6 @@ readfile("../oops"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php rmdir(__DIR__ . '/poo'); ?> @@ -57,4 +56,3 @@ readfile("../oops"); ?> Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt index 8aefc54245..13d776f844 100644 --- a/ext/phar/tests/refcount1.phpt +++ b/ext/phar/tests/refcount1.phpt @@ -34,7 +34,6 @@ var_dump(fread($b, 20)); include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -57,4 +56,3 @@ object(PharFileInfo)#%d (2) { } string(5) "extra" extra -===DONE=== diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt index 76af2a0e74..81408ae103 100644 --- a/ext/phar/tests/security.phpt +++ b/ext/phar/tests/security.phpt @@ -27,10 +27,8 @@ Phar::unlinkArchive($fname); ini_set('phar.readonly', 1); include $fname2; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.php'); ?> --EXPECT-- bool(false) Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt index e8649da235..7b258263ae 100644 --- a/ext/phar/tests/stat.phpt +++ b/ext/phar/tests/stat.phpt @@ -68,7 +68,6 @@ include "my/index.php"; __HALT_COMPILER();'); include $fname; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- @@ -223,4 +222,3 @@ not found 2 Warning: fileperms(): stat failed for not/found in phar://%sstat.phar.php/my/index.php on line %d bool(false) -===DONE=== diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt index d145cdd21d..19acc3ba99 100644 --- a/ext/phar/tests/stat2_5.3.phpt +++ b/ext/phar/tests/stat2_5.3.phpt @@ -32,7 +32,6 @@ include "phar://" . __FILE__ . "/foo/stat.php"; __HALT_COMPILER();'); include $fname3; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> @@ -52,4 +51,3 @@ bool(false) dir bool(true) bool(false) -===DONE=== diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt index f07dd7f48a..d881ea125b 100644 --- a/ext/phar/tests/tar/033.phpt +++ b/ext/phar/tests/tar/033.phpt @@ -34,7 +34,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -47,4 +46,3 @@ test dir bool(true) bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/033a.phpt b/ext/phar/tests/tar/033a.phpt index 4bb8757314..3930407087 100644 --- a/ext/phar/tests/tar/033a.phpt +++ b/ext/phar/tests/tar/033a.phpt @@ -34,7 +34,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -42,4 +41,3 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); --EXPECTF-- bool(false) Cannot modify permissions for file "a.php" in phar "%s033a.phar.tar", write operations are prohibited -===DONE=== diff --git a/ext/phar/tests/tar/alias_acrobatics.phpt b/ext/phar/tests/tar/alias_acrobatics.phpt index 7146d054f1..40f20347c6 100644 --- a/ext/phar/tests/tar/alias_acrobatics.phpt +++ b/ext/phar/tests/tar/alias_acrobatics.phpt @@ -32,7 +32,6 @@ $b = new Phar($fname, 0, 'another'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -43,4 +42,3 @@ alias "foo" is already used for archive "%salias_acrobatics.phar.tar" cannot be 2 phar error: Unable to add tar-based phar "%salias_acrobatics.2.phar.tar", alias is already in use alias "another" is already used for archive "%salias_acrobatics.phar.tar" cannot be overloaded with "%salias_acrobatics.phar.tar" -===DONE=== diff --git a/ext/phar/tests/tar/all.phpt b/ext/phar/tests/tar/all.phpt index 215043e2da..66e9c1e951 100644 --- a/ext/phar/tests/tar/all.phpt +++ b/ext/phar/tests/tar/all.phpt @@ -39,7 +39,6 @@ var_dump($phar->getAlias()); var_dump($phar->getMetadata()); var_dump($phar['a']->getMetadata()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar.php'); ?> --EXPECT-- @@ -54,4 +53,3 @@ string(32) "<?php ok __HALT_COMPILER(); ?> string(4) "hime" string(8) "hi there" string(6) "a meta" -===DONE=== diff --git a/ext/phar/tests/tar/badalias.phpt b/ext/phar/tests/tar/badalias.phpt index 532aba8c3c..b3ad7accd0 100644 --- a/ext/phar/tests/tar/badalias.phpt +++ b/ext/phar/tests/tar/badalias.phpt @@ -15,11 +15,9 @@ echo $ee->getMessage(), "\n"; } } ?> -===DONE=== --EXPECTF-- phar error: invalid alias "hi/thereaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..." in tar-based phar "%sbadalias1.phar.tar" phar error: invalid alias "hi\there" in tar-based phar "%sbadalias2.phar.tar" phar error: invalid alias "hi;there" in tar-based phar "%sbadalias3.phar.tar" phar error: invalid alias "hi:there" in tar-based phar "%sbadalias4.phar.tar" phar error: tar-based phar "%sbadalias5.phar.tar" has alias that is larger than 511 bytes, cannot process -===DONE=== diff --git a/ext/phar/tests/tar/badchecksum.phpt b/ext/phar/tests/tar/badchecksum.phpt index 35b5fc5836..b6b4047263 100644 --- a/ext/phar/tests/tar/badchecksum.phpt +++ b/ext/phar/tests/tar/badchecksum.phpt @@ -20,11 +20,9 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECTF-- phar error: "%sbadchecksum.tar" is a corrupted tar file (checksum mismatch of file "hithere") -===DONE=== diff --git a/ext/phar/tests/tar/bignames.phpt b/ext/phar/tests/tar/bignames.phpt index 3a10ac7547..a22d5bd40d 100644 --- a/ext/phar/tests/tar/bignames.phpt +++ b/ext/phar/tests/tar/bignames.phpt @@ -40,7 +40,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); @@ -54,4 +53,3 @@ hi2 tar-based phar "%sbignames.2.tar" cannot be created, filename "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is too long for tar file format tar-based phar "%sbignames.3.tar" cannot be created, filename "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is too long for tar file format tar-based phar "%sbignames.4.tar" cannot be created, filename "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is too long for tar file format -===DONE=== diff --git a/ext/phar/tests/tar/bignames_overflow.phpt b/ext/phar/tests/tar/bignames_overflow.phpt index 1d3f9071da..3d3247a806 100644 --- a/ext/phar/tests/tar/bignames_overflow.phpt +++ b/ext/phar/tests/tar/bignames_overflow.phpt @@ -26,7 +26,6 @@ echo $p1['a/' . str_repeat('a', 100)]->getContent() . "\n"; echo $p1[str_repeat('a', 155) . '/' . str_repeat('a', 100)]->getContent() . "\n"; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); @@ -37,4 +36,3 @@ a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa hi hi2 -===DONE=== diff --git a/ext/phar/tests/tar/bug49910.phpt b/ext/phar/tests/tar/bug49910.phpt index e03998bc28..0854c7284b 100644 --- a/ext/phar/tests/tar/bug49910.phpt +++ b/ext/phar/tests/tar/bug49910.phpt @@ -13,7 +13,6 @@ foreach (new RecursiveIteratorIterator($tar) as $file) { } print_r($files); ?> -===DONE=== --EXPECT-- Array ( @@ -47,4 +46,3 @@ Array [27] => phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php [28] => phar://*/package.xml ) -===DONE=== diff --git a/ext/phar/tests/tar/bug64343.phpt b/ext/phar/tests/tar/bug64343.phpt index ed4501dd6a..01fca83900 100644 --- a/ext/phar/tests/tar/bug64343.phpt +++ b/ext/phar/tests/tar/bug64343.phpt @@ -10,7 +10,5 @@ echo "Test\n"; $phar = new PharData(__DIR__."/files/bug64343.tar"); ?> -===DONE=== --EXPECT-- Test -===DONE=== diff --git a/ext/phar/tests/tar/bug67761.phpt b/ext/phar/tests/tar/bug67761.phpt index 0686881118..c8d013cab1 100644 --- a/ext/phar/tests/tar/bug67761.phpt +++ b/ext/phar/tests/tar/bug67761.phpt @@ -11,9 +11,7 @@ include __DIR__."/files/bug67761.tar/bug67761.phar"; ?> -===DONE=== --EXPECT-- Test #!/usr/bin/env php Test -===DONE=== diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt index d0a954a981..355b69399e 100644 --- a/ext/phar/tests/tar/create_new_and_modify.phpt +++ b/ext/phar/tests/tar/create_new_and_modify.phpt @@ -42,7 +42,6 @@ include $pname . '/a.php'; include $pname . '/b.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); ?> --EXPECT-- @@ -51,4 +50,3 @@ brand new! bool(true) modified! another! -===DONE=== diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt index 1b41db6134..570d20678f 100644 --- a/ext/phar/tests/tar/create_new_phar_b.phpt +++ b/ext/phar/tests/tar/create_new_phar_b.phpt @@ -13,7 +13,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -23,4 +22,3 @@ Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stre Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.tar/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/delete_in_phar.phpt b/ext/phar/tests/tar/delete_in_phar.phpt index 0b4362aa91..87e1fb53dd 100644 --- a/ext/phar/tests/tar/delete_in_phar.phpt +++ b/ext/phar/tests/tar/delete_in_phar.phpt @@ -31,7 +31,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -46,4 +45,3 @@ Warning: include(%sdelete_in_phar.phar.tar/b/c.php): failed to open stream: phar Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/delete_in_phar_b.phpt b/ext/phar/tests/tar/delete_in_phar_b.phpt index 466ffcdf07..cb9b832e9f 100644 --- a/ext/phar/tests/tar/delete_in_phar_b.phpt +++ b/ext/phar/tests/tar/delete_in_phar_b.phpt @@ -32,7 +32,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -46,4 +45,3 @@ This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/tar/delete_in_phar_confirm.phpt b/ext/phar/tests/tar/delete_in_phar_confirm.phpt index ec4eec68b1..0ee0d00c59 100644 --- a/ext/phar/tests/tar/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/tar/delete_in_phar_confirm.phpt @@ -34,7 +34,6 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/b.ph include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -49,4 +48,3 @@ Warning: include(%sdelete_in_phar_confirm.phar.tar/b/c.php): failed to open stre Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/exists_as_phar.phpt b/ext/phar/tests/tar/exists_as_phar.phpt index 66842cbd33..2a87dc7327 100644 --- a/ext/phar/tests/tar/exists_as_phar.phpt +++ b/ext/phar/tests/tar/exists_as_phar.phpt @@ -27,7 +27,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -35,4 +34,3 @@ 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 -===DONE=== diff --git a/ext/phar/tests/tar/links.phpt b/ext/phar/tests/tar/links.phpt index 0964cd7fab..2d1c76b85e 100644 --- a/ext/phar/tests/tar/links.phpt +++ b/ext/phar/tests/tar/links.phpt @@ -19,7 +19,6 @@ var_dump($p['testit/file']->getContent()); $p['testit/link'] = 'overwriting'; var_dump($p['testit/link']->getContent()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); @@ -32,4 +31,3 @@ string(3) "hi string(3) "hi " string(11) "overwriting" -===DONE=== diff --git a/ext/phar/tests/tar/links2.phpt b/ext/phar/tests/tar/links2.phpt index ebeb27732d..75f5c51e25 100644 --- a/ext/phar/tests/tar/links2.phpt +++ b/ext/phar/tests/tar/links2.phpt @@ -25,11 +25,9 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php 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" -===DONE=== diff --git a/ext/phar/tests/tar/links3.phpt b/ext/phar/tests/tar/links3.phpt index 5c41a00ace..b771da1260 100644 --- a/ext/phar/tests/tar/links3.phpt +++ b/ext/phar/tests/tar/links3.phpt @@ -14,8 +14,6 @@ try { echo $p['file.txt']->getContent(); echo $p['my/file']->getContent(); ?> -===DONE=== --EXPECT-- my file my file -===DONE=== diff --git a/ext/phar/tests/tar/links4.phpt b/ext/phar/tests/tar/links4.phpt index 638c47f69c..941197c67b 100644 --- a/ext/phar/tests/tar/links4.phpt +++ b/ext/phar/tests/tar/links4.phpt @@ -14,8 +14,6 @@ try { echo $p['file.txt']->getContent(); echo $p['link.txt']->getContent(); ?> -===DONE=== --EXPECT-- hi hi -===DONE=== diff --git a/ext/phar/tests/tar/links5.phpt b/ext/phar/tests/tar/links5.phpt index 0639b9b415..17892370f7 100644 --- a/ext/phar/tests/tar/links5.phpt +++ b/ext/phar/tests/tar/links5.phpt @@ -14,8 +14,6 @@ try { echo $p['hi/test.txt']->getContent(); echo $p['hi/link.txt']->getContent(); ?> -===DONE=== --EXPECT-- hi hi -===DONE=== diff --git a/ext/phar/tests/tar/links6.phpt b/ext/phar/tests/tar/links6.phpt index 811272c57a..9958c64da2 100644 --- a/ext/phar/tests/tar/links6.phpt +++ b/ext/phar/tests/tar/links6.phpt @@ -16,7 +16,6 @@ $a = fopen('phar://' . __DIR__ . '/files/links.phar.tar/link2', 'r'); fseek($a, 3); echo fread($a, 10); ?> -===DONE=== --EXPECT-- hi there @@ -26,4 +25,3 @@ hi there there -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_existing.phpt b/ext/phar/tests/tar/open_for_write_existing.phpt index 67b59d4ad7..05ab333bfd 100644 --- a/ext/phar/tests/tar/open_for_write_existing.phpt +++ b/ext/phar/tests/tar/open_for_write_existing.phpt @@ -34,9 +34,7 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?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 93d40845db..dc8dfeb8be 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -43,4 +42,3 @@ Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to o bool(false) This is b/c -===DONE=== 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 976c7358b0..fe457b1f06 100644 --- a/ext/phar/tests/tar/open_for_write_existing_c.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -43,4 +42,3 @@ Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to o bool(false) This is b/c -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_newfile.phpt b/ext/phar/tests/tar/open_for_write_newfile.phpt index f2f5d945d7..f5485eac18 100644 --- a/ext/phar/tests/tar/open_for_write_newfile.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile.phpt @@ -35,10 +35,8 @@ include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECT-- This is b/c extra -===DONE=== 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 dd28ff747a..1a11debae8 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt @@ -36,7 +36,6 @@ include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -48,4 +47,3 @@ Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d -===DONE=== 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 aae6e424d1..6793de14f4 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt @@ -35,7 +35,6 @@ include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -47,4 +46,3 @@ Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt index 9be6f2cf7b..59f66ed697 100644 --- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt @@ -29,7 +29,6 @@ include 'phar://phar_begin_setstub_commit.phar/a.php'; include 'phar://phar_begin_setstub_commit.phar/b.php'; var_dump($p->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/phar_begin_setstub_commit.phar.tar'); @@ -50,4 +49,3 @@ string(5) "Hello" string(5) "World" string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?> " -===DONE=== diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt index 5e82d88550..bffc21b36c 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.tar'); @@ -63,4 +62,3 @@ array(1) { string(%d) "%sphar_buildfromiterator4.phpt" } bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/phar_buildfromiterator5.phpt b/ext/phar/tests/tar/phar_buildfromiterator5.phpt index 5467165973..c5191ee3e0 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator5.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.tar'); @@ -56,4 +55,3 @@ valid current %s(24) "UnexpectedValueException" Iterator myIterator returned an invalid value (must return a string) -===DONE=== diff --git a/ext/phar/tests/tar/phar_buildfromiterator6.phpt b/ext/phar/tests/tar/phar_buildfromiterator6.phpt index 981310f15e..58706a714c 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator6.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.tar'); @@ -57,4 +56,3 @@ current key %s(24) "UnexpectedValueException" Iterator myIterator returned an invalid key (must return a string) -===DONE=== diff --git a/ext/phar/tests/tar/phar_buildfromiterator7.phpt b/ext/phar/tests/tar/phar_buildfromiterator7.phpt index 9f145cdbc8..1ffc2da8d6 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator7.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.tar'); @@ -57,4 +56,3 @@ current key %s(24) "UnexpectedValueException" Iterator myIterator returned a file that could not be opened "phar_buildfromiterator7./oopsie/there.phpt" -===DONE=== diff --git a/ext/phar/tests/tar/phar_buildfromiterator8.phpt b/ext/phar/tests/tar/phar_buildfromiterator8.phpt index 27b480da6f..d2efdce66d 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator8.phpt @@ -18,7 +18,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.tar'); @@ -70,4 +69,3 @@ array(21) { string(%d) "%sfrontcontroller9.phar.phpt" } bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/phar_buildfromiterator9.phpt b/ext/phar/tests/tar/phar_buildfromiterator9.phpt index 998d6653da..6653b1dbf2 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator9.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.tar'); @@ -62,4 +61,3 @@ array(1) { ["a"]=> string(%d) "[stream]" } -===DONE=== diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt index ec36a60583..a99eff7f46 100644 --- a/ext/phar/tests/tar/phar_commitwrite.phpt +++ b/ext/phar/tests/tar/phar_commitwrite.phpt @@ -22,7 +22,6 @@ __HALT_COMPILER(); var_dump($p->getStub()); var_dump($p->isFileFormat(Phar::TAR)); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/phar_commitwrite.phar.tar'); @@ -39,4 +38,3 @@ include 'phar://phar_commitwrite.phar/startup.php'; __HALT_COMPILER(); ?> " bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt index e121cf6f7b..609feda8da 100644 --- a/ext/phar/tests/tar/phar_convert_phar.phpt +++ b/ext/phar/tests/tar/phar_convert_phar.phpt @@ -35,7 +35,6 @@ var_dump($phar->isFileFormat(Phar::PHAR)); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -55,4 +54,3 @@ bool(true) int(6641) bool(true) int(6641) -===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt index d8ca717296..eba04fcbb1 100644 --- a/ext/phar/tests/tar/phar_convert_phar2.phpt +++ b/ext/phar/tests/tar/phar_convert_phar2.phpt @@ -37,7 +37,6 @@ var_dump($phar->isCompressed() == Phar::GZ); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -59,4 +58,3 @@ int(6641) bool(true) bool(true) int(6641) -===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt index 443ac26525..8f09068b0a 100644 --- a/ext/phar/tests/tar/phar_convert_phar3.phpt +++ b/ext/phar/tests/tar/phar_convert_phar3.phpt @@ -37,7 +37,6 @@ var_dump($phar->isCompressed() == Phar::BZ2); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.bz2'); @@ -59,4 +58,3 @@ int(6641) bool(true) bool(true) int(6641) -===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar4.phpt b/ext/phar/tests/tar/phar_convert_phar4.phpt index 2188debbea..858cb5bc6a 100644 --- a/ext/phar/tests/tar/phar_convert_phar4.phpt +++ b/ext/phar/tests/tar/phar_convert_phar4.phpt @@ -42,7 +42,6 @@ var_dump(strlen($phar->getStub())); var_dump($phar->getMetadata()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); @@ -68,4 +67,3 @@ bool(true) bool(true) int(6641) string(2) "hi" -===DONE=== diff --git a/ext/phar/tests/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt index 0b1f6bcac1..aaf9c547ff 100644 --- a/ext/phar/tests/tar/phar_magic.phpt +++ b/ext/phar/tests/tar/phar_magic.phpt @@ -19,7 +19,6 @@ include "phar://" . __FILE__ . "/a"; __HALT_COMPILER();'); include $fname; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); @@ -30,4 +29,3 @@ bool(true) in b <?php include "b/c.php"; in d -===DONE=== diff --git a/ext/phar/tests/tar/phar_setalias.phpt b/ext/phar/tests/tar/phar_setalias.phpt index 59da7bb984..929ba7f0b8 100644 --- a/ext/phar/tests/tar/phar_setalias.phpt +++ b/ext/phar/tests/tar/phar_setalias.phpt @@ -37,7 +37,6 @@ $a = new Phar($fname2); echo $a->getAlias() . "\n"; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -48,4 +47,3 @@ __HALT_COMPILER(); hio test test -===DONE=== diff --git a/ext/phar/tests/tar/phar_setalias2.phpt b/ext/phar/tests/tar/phar_setalias2.phpt index 8179cf2cd5..eb87c0a221 100644 --- a/ext/phar/tests/tar/phar_setalias2.phpt +++ b/ext/phar/tests/tar/phar_setalias2.phpt @@ -39,7 +39,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -50,4 +49,3 @@ __HALT_COMPILER(); hio test alias "test" is already used for archive "%sphar_setalias2.phar.tar" and cannot be used for other archives -===DONE=== diff --git a/ext/phar/tests/tar/phar_setdefaultstub.phpt b/ext/phar/tests/tar/phar_setdefaultstub.phpt index bea53cdce3..55b214456e 100644 --- a/ext/phar/tests/tar/phar_setdefaultstub.phpt +++ b/ext/phar/tests/tar/phar_setdefaultstub.phpt @@ -53,7 +53,6 @@ try { var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -77,4 +76,3 @@ __HALT_COMPILER();" Warning: Phar::setDefaultStub(): method accepts no arguments for a tar- or zip-based phar stub, 2 given in %sphar_setdefaultstub.php on line %d string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" -===DONE=== diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt index 28d494e9e8..d67ca49a63 100644 --- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt @@ -42,7 +42,6 @@ var_dump($p->getSignature()); echo $e->getMessage(); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -84,4 +83,3 @@ array(2) { ["hash_type"]=> string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt index f6709280bd..1b9f6ecd60 100644 --- a/ext/phar/tests/tar/phar_stub.phpt +++ b/ext/phar/tests/tar/phar_stub.phpt @@ -57,7 +57,6 @@ $phar['testing'] = 'hi'; echo $phar->getStub(); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); @@ -72,4 +71,3 @@ __HALT_COMPILER(); <?php echo "third stub\n"; __HALT_COMPILER(); ?>booya <?php echo "third stub\n"; __HALT_COMPILER(); ?> <?php echo "third stub\n"; __HALT_COMPILER(); ?> -===DONE=== diff --git a/ext/phar/tests/tar/phar_stub_error.phpt b/ext/phar/tests/tar/phar_stub_error.phpt index b1dc49f927..82c0cbf59f 100644 --- a/ext/phar/tests/tar/phar_stub_error.phpt +++ b/ext/phar/tests/tar/phar_stub_error.phpt @@ -35,7 +35,6 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -52,4 +51,3 @@ bool(true) string(50) "<?php echo "first stub\n"; __HALT_COMPILER(); ?> " bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt index 9351b566a6..df33e3a0d4 100644 --- a/ext/phar/tests/tar/refcount1.phpt +++ b/ext/phar/tests/tar/refcount1.phpt @@ -46,7 +46,6 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- @@ -69,4 +68,3 @@ object(PharFileInfo)#%d (2) { } string(5) "extra" extra -===DONE=== diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt index a8bf6eb575..1fd44e18a5 100644 --- a/ext/phar/tests/tar/require_hash.phpt +++ b/ext/phar/tests/tar/require_hash.phpt @@ -38,7 +38,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/require_hash.phar.tar'); @@ -53,4 +52,3 @@ array(2) { ["hash_type"]=> string(3) "MD5" } -===DONE=== diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index 5eabc301a9..6add59ac0e 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -19,7 +19,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_001.phar.tar'); @@ -27,4 +26,3 @@ try { --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 phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) -===DONE=== diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt index 38623a4030..10c46e2805 100644 --- a/ext/phar/tests/tar/tar_002.phpt +++ b/ext/phar/tests/tar/tar_002.phpt @@ -22,7 +22,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_002.phar.tar'); @@ -30,4 +29,3 @@ try { --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 phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) -===DONE=== diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt index 9cec9451e1..e7b0cf8a7e 100644 --- a/ext/phar/tests/tar/tar_003.phpt +++ b/ext/phar/tests/tar/tar_003.phpt @@ -47,7 +47,6 @@ while (false !== ($v = readdir($tar))) { closedir($tar); ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_003.phar.tar'); @@ -67,4 +66,3 @@ dir internal file tar_003.phpt -===DONE=== diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt index 42473d5818..54db6bede2 100644 --- a/ext/phar/tests/tar/tar_004.phpt +++ b/ext/phar/tests/tar/tar_004.phpt @@ -29,7 +29,6 @@ $tar->close(); include $fname; ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_004.phar.tar'); @@ -37,4 +36,3 @@ include $fname; --EXPECTF-- string(9) "it worked" string(%d) "phar://%star_004.phar.tar/tar_004.php" -===DONE=== diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt index 28fd25aa52..f5b9cb9a8c 100644 --- a/ext/phar/tests/tar/tar_bz2.phpt +++ b/ext/phar/tests/tar/tar_bz2.phpt @@ -45,7 +45,6 @@ var_dump($phar2->isFileFormat(Phar::TAR)); var_dump($phar2->isCompressed() == Phar::BZ2); ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_bz2.phar'); @@ -58,4 +57,3 @@ string(9) "it worked" string(%d) "phar://%star_bz2.phar/tar_004.php" bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt index 66ab150cb7..dd5cfabc7f 100644 --- a/ext/phar/tests/tar/tar_gzip.phpt +++ b/ext/phar/tests/tar/tar_gzip.phpt @@ -38,7 +38,6 @@ $b = new Phar($fname2); var_dump($b->isFileFormat(Phar::TAR)); var_dump($b->isCompressed() == Phar::GZ); ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_gzip.phar'); @@ -49,4 +48,3 @@ string(9) "it worked" string(%d) "phar://%star_gzip.phar/tar_004.php" bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt index 7eccb3f7c3..61901b9a11 100644 --- a/ext/phar/tests/tar/tar_makebz2.phpt +++ b/ext/phar/tests/tar/tar_makebz2.phpt @@ -24,7 +24,6 @@ var_dump($phar2->isFileFormat(Phar::TAR)); var_dump($phar2->isCompressed() == Phar::BZ2); ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_makebz2.phar.bz2'); @@ -36,4 +35,3 @@ var_dump($phar2->isCompressed() == Phar::BZ2); bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt index 244e465722..f128e2b512 100644 --- a/ext/phar/tests/tar/tar_makegz.phpt +++ b/ext/phar/tests/tar/tar_makegz.phpt @@ -25,7 +25,6 @@ var_dump($phar2->isFileFormat(Phar::TAR)); var_dump($phar2->isCompressed() == Phar::GZ); ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_makegz.phar.gz'); @@ -37,4 +36,3 @@ var_dump($phar2->isCompressed() == Phar::GZ); bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/tar_nohash.phpt b/ext/phar/tests/tar/tar_nohash.phpt index a97f347b3c..e24fea16bf 100644 --- a/ext/phar/tests/tar/tar_nohash.phpt +++ b/ext/phar/tests/tar/tar_nohash.phpt @@ -16,7 +16,5 @@ try { } ?> -===DONE=== --EXPECT-- string(0) "" -===DONE=== diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt index d71f834280..4bef6dc747 100644 --- a/ext/phar/tests/tar/tar_nostub.phpt +++ b/ext/phar/tests/tar/tar_nostub.phpt @@ -35,7 +35,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php @unlink(__DIR__ . '/tar_nostub.phar.tar'); @@ -45,4 +44,3 @@ try { 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 phar url "phar://%star_nostub.phar.tar/" is unknown string(0) "" -===DONE=== diff --git a/ext/phar/tests/tar/truncated.phpt b/ext/phar/tests/tar/truncated.phpt index 66148a7d28..83adcde243 100644 --- a/ext/phar/tests/tar/truncated.phpt +++ b/ext/phar/tests/tar/truncated.phpt @@ -11,7 +11,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); @@ -19,4 +18,3 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECTF-- phar error: "%strunc.tar" is a corrupted tar file (truncated) -===DONE=== diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt index fe0ffa970f..9d85285036 100644 --- a/ext/phar/tests/test_alias_unset.phpt +++ b/ext/phar/tests/test_alias_unset.phpt @@ -33,7 +33,6 @@ var_dump($phar2->getAlias()); $a = file_get_contents($pname . '/file1.txt'); // this fails because $fname2 ref exists ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> @@ -42,4 +41,3 @@ Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by string(5) "first" Warning: file_get_contents(phar://%sfile1.txt): failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d -===DONE=== diff --git a/ext/phar/tests/test_signaturealgos.phpt b/ext/phar/tests/test_signaturealgos.phpt index 69fafdb08b..a7e1e8fa47 100644 --- a/ext/phar/tests/test_signaturealgos.phpt +++ b/ext/phar/tests/test_signaturealgos.phpt @@ -27,11 +27,9 @@ $a = new Phar(__DIR__ . '/files/openssl.phar'); $r = $a->getSignature(); var_dump($r['hash_type']); ?> -===DONE=== --EXPECT-- string(5) "SHA-1" string(7) "SHA-512" string(7) "SHA-256" string(3) "MD5" string(7) "OpenSSL" -===DONE=== diff --git a/ext/phar/tests/test_unset.phpt b/ext/phar/tests/test_unset.phpt index a512d71469..d2952b27b5 100644 --- a/ext/phar/tests/test_unset.phpt +++ b/ext/phar/tests/test_unset.phpt @@ -31,7 +31,6 @@ var_dump($phar->getAlias()); var_dump(file_exists($fname)); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> @@ -39,4 +38,3 @@ var_dump(file_exists($fname)); NULL string(%d) "%stest_unset.phar.php" bool(false) -===DONE=== diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt index 51cfbce01f..6f1c96951d 100644 --- a/ext/phar/tests/withphar.phpt +++ b/ext/phar/tests/withphar.phpt @@ -6,9 +6,7 @@ Phar: phar run with ext/phar with default stub <?php include __DIR__ . '/files/nophar.phar'; ?> -===DONE=== --EXPECT-- in b <?php include "b/c.php"; in d -===DONE=== diff --git a/ext/phar/tests/zf_test.phpt b/ext/phar/tests/zf_test.phpt index b3d1e4cb9a..0d2d34d6dd 100644 --- a/ext/phar/tests/zf_test.phpt +++ b/ext/phar/tests/zf_test.phpt @@ -34,7 +34,6 @@ foreach(new RecursiveIteratorIterator($phar) as $path) { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/zfapp.tgz'); @@ -47,4 +46,3 @@ phar://%szfapp.phar.tar.gz/application/default/views/scripts/error/error.phtml phar://%szfapp.phar.tar.gz/application/default/views/scripts/index/index.phtml phar://%szfapp.phar.tar.gz/html/.htaccess phar://%szfapp.phar.tar.gz/html/index.php -===DONE=== diff --git a/ext/phar/tests/zip/033.phpt b/ext/phar/tests/zip/033.phpt index 2935531987..9eba82f78d 100644 --- a/ext/phar/tests/zip/033.phpt +++ b/ext/phar/tests/zip/033.phpt @@ -38,7 +38,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -53,4 +52,3 @@ bool(true) bool(true) bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt index e9744b0e3c..d0140fba13 100644 --- a/ext/phar/tests/zip/033a.phpt +++ b/ext/phar/tests/zip/033a.phpt @@ -34,7 +34,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -42,4 +41,3 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); --EXPECTF-- bool(false) Cannot modify permissions for file "a.php" in phar "%sa.phar.zip", write operations are prohibited -===DONE=== diff --git a/ext/phar/tests/zip/alias_acrobatics.phpt b/ext/phar/tests/zip/alias_acrobatics.phpt index 36fb9058a5..1fb132ddd7 100644 --- a/ext/phar/tests/zip/alias_acrobatics.phpt +++ b/ext/phar/tests/zip/alias_acrobatics.phpt @@ -32,7 +32,6 @@ $b = new Phar($fname, 0, 'another'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -43,4 +42,3 @@ alias "foo" is already used for archive "%salias_acrobatics.phar.zip" cannot be 2 phar error: Unable to add zip-based phar "%salias_acrobatics.2.phar.zip" with implicit alias, alias is already in use alias "another" is already used for archive "%salias_acrobatics.phar.zip" cannot be overloaded with "%salias_acrobatics.phar.zip" -===DONE=== diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt index cd410be6c7..540f60f01d 100644 --- a/ext/phar/tests/zip/all.phpt +++ b/ext/phar/tests/zip/all.phpt @@ -42,7 +42,6 @@ var_dump($phar->getAlias()); var_dump($phar->getMetadata()); var_dump($phar['a']->getMetadata()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); ?> @@ -61,4 +60,3 @@ string(32) "<?php ok __HALT_COMPILER(); ?> string(4) "hime" string(8) "hi there" string(6) "a meta" -===DONE=== diff --git a/ext/phar/tests/zip/badalias.phpt b/ext/phar/tests/zip/badalias.phpt index 1ca964d1d6..9e7fdf8091 100644 --- a/ext/phar/tests/zip/badalias.phpt +++ b/ext/phar/tests/zip/badalias.phpt @@ -15,11 +15,9 @@ echo $ee->getMessage(), "\n"; } } ?> -===DONE=== --EXPECTF-- phar error: invalid alias "hi/there" in zip-based phar "%sbadalias1.phar.zip" phar error: invalid alias "hi\there" in zip-based phar "%sbadalias2.phar.zip" phar error: invalid alias "hi\there" in zip-based phar "%sbadalias3.phar.zip" phar error: invalid alias "hi;there" in zip-based phar "%sbadalias4.phar.zip" phar error: invalid alias "hi:there" in zip-based phar "%sbadalias5.phar.zip" -===DONE=== diff --git a/ext/phar/tests/zip/bug48791.phpt b/ext/phar/tests/zip/bug48791.phpt index b888838fe4..6b1726f230 100644 --- a/ext/phar/tests/zip/bug48791.phpt +++ b/ext/phar/tests/zip/bug48791.phpt @@ -7,8 +7,6 @@ Phar: Bug #48791: open office documents always reported as corrupted by phar ext <?php echo file_get_contents('phar://' . __DIR__ . '/files/test.odt/content.xml'), "\n"; ?> -===DONE=== --EXPECT-- <?xml version="1.0" encoding="UTF-8"?> <office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:rdfa="http://docs.oasis-open.org/opendocument/meta/rdfa#" office:version="1.2"><office:scripts/><office:font-face-decls><style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/><style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/><style:font-face style:name="Times New Roman" svg:font-family="'Times New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/><style:font-face style:name="Arial Unicode MS" svg:font-family="'Arial Unicode MS'" style:font-family-generic="system" style:font-pitch="variable"/><style:font-face style:name="MS Mincho" svg:font-family="'MS Mincho'" style:font-family-generic="system" style:font-pitch="variable"/><style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/></office:font-face-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard" style:list-style-name="L1"/><style:style style:name="T1" style:family="text"><style:text-properties style:font-name="Arial"/></style:style><text:list-style style:name="L1"><text:list-level-style-bullet text:level="1" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="•"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.27cm" fo:text-indent="-0.635cm" fo:margin-left="1.27cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="2" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="◦"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.905cm" fo:text-indent="-0.635cm" fo:margin-left="1.905cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="3" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="▪"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.54cm" fo:text-indent="-0.635cm" fo:margin-left="2.54cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="4" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="•"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3.175cm" fo:text-indent="-0.635cm" fo:margin-left="3.175cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="5" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="◦"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3.81cm" fo:text-indent="-0.635cm" fo:margin-left="3.81cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="6" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="▪"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="4.445cm" fo:text-indent="-0.635cm" fo:margin-left="4.445cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="7" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="•"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="5.08cm" fo:text-indent="-0.635cm" fo:margin-left="5.08cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="8" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="◦"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="5.715cm" fo:text-indent="-0.635cm" fo:margin-left="5.715cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="9" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="▪"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="6.35cm" fo:text-indent="-0.635cm" fo:margin-left="6.35cm"/></style:list-level-properties></text:list-level-style-bullet><text:list-level-style-bullet text:level="10" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="•"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="6.985cm" fo:text-indent="-0.635cm" fo:margin-left="6.985cm"/></style:list-level-properties></text:list-level-style-bullet></text:list-style></office:automatic-styles><office:body><office:text><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:h text:style-name="Heading_20_1" text:outline-level="1">Überschrift</text:h><text:list xml:id="list38593008" text:style-name="L1"><text:list-item><text:p text:style-name="P1"><text:span text:style-name="T1">Name:<text:tab/><text:tab/>$$n_fn$$</text:span></text:p></text:list-item><text:list-item><text:p text:style-name="P1"><text:span text:style-name="T1">Firma:<text:tab/><text:tab/>$$org_name$$</text:span></text:p></text:list-item><text:list-item><text:p text:style-name="P1"><text:span text:style-name="T1">Menge:<text:tab/>$$#menge$$</text:span></text:p></text:list-item></text:list></office:text></office:body></office:document-content> -===DONE=== diff --git a/ext/phar/tests/zip/bzip2.phpt b/ext/phar/tests/zip/bzip2.phpt index 551e419b87..0b1fb31081 100644 --- a/ext/phar/tests/zip/bzip2.phpt +++ b/ext/phar/tests/zip/bzip2.phpt @@ -16,7 +16,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- <?php include dirname(__FILE__) . '/corrupt_zipmaker.php.inc'; @@ -79,4 +78,3 @@ $a->addFile('hi', null, 'hii', null, null, 'compress', 'compress', 11); $a->writeZip(dirname(__FILE__) . '/compress_unsupunknown.zip'); ?> string(175) "hitheresuperlongzipistoostupidtodowhatIsaysoIhavetousethisridiculouslylongaliasbecauseitisstupiddidImentionthatalreadythemadnessdoesnotstopIhateinfozipIhateinfozipIhateinfozip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_001.phpt b/ext/phar/tests/zip/corrupt_001.phpt index 66d1d62ec9..188d9719f7 100644 --- a/ext/phar/tests/zip/corrupt_001.phpt +++ b/ext/phar/tests/zip/corrupt_001.phpt @@ -15,8 +15,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupt zip archive, conflicting file count in end of central directory record in zip-based phar "%scount1.zip" phar error: corrupt zip archive, conflicting file count in end of central directory record in zip-based phar "%scount2.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_002.phpt b/ext/phar/tests/zip/corrupt_002.phpt index 7aad946fa8..15058fcb22 100644 --- a/ext/phar/tests/zip/corrupt_002.phpt +++ b/ext/phar/tests/zip/corrupt_002.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: end of central directory not found in zip-based phar "%snozipend.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_003.phpt b/ext/phar/tests/zip/corrupt_003.phpt index e076a4eb8f..02fc99e59b 100644 --- a/ext/phar/tests/zip/corrupt_003.phpt +++ b/ext/phar/tests/zip/corrupt_003.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupt zip archive, zip file comment truncated in zip-based phar "%sfilecomment.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_004.phpt b/ext/phar/tests/zip/corrupt_004.phpt index 516fe31e5a..bfef6cba5d 100644 --- a/ext/phar/tests/zip/corrupt_004.phpt +++ b/ext/phar/tests/zip/corrupt_004.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupted central directory entry, no magic signature in zip-based phar "%scdir_offset.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_005.phpt b/ext/phar/tests/zip/corrupt_005.phpt index 00ac1f6b4e..795f3f17b2 100644 --- a/ext/phar/tests/zip/corrupt_005.phpt +++ b/ext/phar/tests/zip/corrupt_005.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: Cannot process encrypted zip files in zip-based phar "%sencrypted.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_006.phpt b/ext/phar/tests/zip/corrupt_006.phpt index aca7bc572b..8c36cd98b8 100644 --- a/ext/phar/tests/zip/corrupt_006.phpt +++ b/ext/phar/tests/zip/corrupt_006.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: Cannot process zips created from stdin (zero-length filename) in zip-based phar "%sstdin.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_007.phpt b/ext/phar/tests/zip/corrupt_007.phpt index 35efd5b489..21dcee826a 100644 --- a/ext/phar/tests/zip/corrupt_007.phpt +++ b/ext/phar/tests/zip/corrupt_007.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupted central directory entry, no magic signature in zip-based phar "%struncfilename.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_008.phpt b/ext/phar/tests/zip/corrupt_008.phpt index 7385b03183..5fcde01c94 100644 --- a/ext/phar/tests/zip/corrupt_008.phpt +++ b/ext/phar/tests/zip/corrupt_008.phpt @@ -80,7 +80,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: unsupported compression method (Shrunk) used in this zip in zip-based phar "%scompress_unsup1.zip" phar error: unsupported compression method (Reduce) used in this zip in zip-based phar "%scompress_unsup2.zip" @@ -97,4 +96,3 @@ phar error: unsupported compression method (IBM LZ77) used in this zip in zip-ba phar error: unsupported compression method (WavPack) used in this zip in zip-based phar "%scompress_unsup97.zip" phar error: unsupported compression method (PPMd) used in this zip in zip-based phar "%scompress_unsup98.zip" phar error: unsupported compression method (unknown) used in this zip in zip-based phar "%scompress_unsupunknown.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_009.phpt b/ext/phar/tests/zip/corrupt_009.phpt index ab7594ac30..9a86a933e6 100644 --- a/ext/phar/tests/zip/corrupt_009.phpt +++ b/ext/phar/tests/zip/corrupt_009.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: Unable to process extra field header for file in central directory in zip-based phar "%sextralen_toolong.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_010.phpt b/ext/phar/tests/zip/corrupt_010.phpt index 4643cae070..0106d308ae 100644 --- a/ext/phar/tests/zip/corrupt_010.phpt +++ b/ext/phar/tests/zip/corrupt_010.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: split archives spanning multiple zips cannot be processed in zip-based phar "%sdisknumber.zip" -===DONE=== diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt index 2a52e8a5ca..38cf305525 100644 --- a/ext/phar/tests/zip/create_new_and_modify.phpt +++ b/ext/phar/tests/zip/create_new_and_modify.phpt @@ -42,7 +42,6 @@ include $pname . '/a.php'; include $pname . '/b.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> --EXPECT-- @@ -51,4 +50,3 @@ brand new! bool(true) modified! another! -===DONE=== diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt index d8a72c9d42..1db8f6ecdb 100644 --- a/ext/phar/tests/zip/create_new_phar_b.phpt +++ b/ext/phar/tests/zip/create_new_phar_b.phpt @@ -13,7 +13,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- @@ -23,4 +22,3 @@ Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stre Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.zip/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt index 86a6d4dbd4..e1c541e7e2 100644 --- a/ext/phar/tests/zip/delete_in_phar.phpt +++ b/ext/phar/tests/zip/delete_in_phar.phpt @@ -30,7 +30,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- @@ -45,4 +44,3 @@ Warning: include(%sdelete_in_phar.phar.zip/b/c.php): failed to open stream: phar Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/delete_in_phar_b.phpt b/ext/phar/tests/zip/delete_in_phar_b.phpt index 65f47e55ba..ac8a0db4dd 100644 --- a/ext/phar/tests/zip/delete_in_phar_b.phpt +++ b/ext/phar/tests/zip/delete_in_phar_b.phpt @@ -31,7 +31,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- @@ -45,4 +44,3 @@ This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt index 26ff9b3456..84d337af06 100644 --- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt @@ -35,7 +35,6 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/b.ph include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- @@ -50,4 +49,3 @@ Warning: include(%sdelete_in_phar_confirm.phar.zip/b/c.php): failed to open stre Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/exists_as_phar.phpt b/ext/phar/tests/zip/exists_as_phar.phpt index 2499e82312..e439eae015 100644 --- a/ext/phar/tests/zip/exists_as_phar.phpt +++ b/ext/phar/tests/zip/exists_as_phar.phpt @@ -27,7 +27,6 @@ try { } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -35,4 +34,3 @@ 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 -===DONE=== diff --git a/ext/phar/tests/zip/getalias.phpt b/ext/phar/tests/zip/getalias.phpt index 2a2f5c19e6..e8ab8494cf 100644 --- a/ext/phar/tests/zip/getalias.phpt +++ b/ext/phar/tests/zip/getalias.phpt @@ -42,7 +42,6 @@ $phar->setAlias('pinocchio'); var_dump($phar->getAlias()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -56,4 +55,3 @@ string(13) "jiminycricket" Cannot set alias ".phar/alias.txt" directly in phar "%sgetalias.phar.zip", use setAlias string(13) "jiminycricket" string(9) "pinocchio" -===DONE=== diff --git a/ext/phar/tests/zip/largezip.phpt b/ext/phar/tests/zip/largezip.phpt index 78ee3d388e..d1f113d0a3 100644 --- a/ext/phar/tests/zip/largezip.phpt +++ b/ext/phar/tests/zip/largezip.phpt @@ -20,10 +20,8 @@ copy($fname, $fname2); $p2 = new Phar($fname2); var_dump(strlen($p2['big']->getContent())); ?> -===DONE=== --CLEAN-- <?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 d179b17a5c..522ddd10e7 100644 --- a/ext/phar/tests/zip/metadata_write_commit.phpt +++ b/ext/phar/tests/zip/metadata_write_commit.phpt @@ -53,7 +53,6 @@ foreach($files as $name => $cont) { } var_dump($phar->getMetadata()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> --EXPECT-- @@ -84,4 +83,3 @@ array(2) { } bool(true) string(2) "hi" -===DONE=== diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt index 5ca6ac8df0..6f229440f3 100644 --- a/ext/phar/tests/zip/odt.phpt +++ b/ext/phar/tests/zip/odt.phpt @@ -20,7 +20,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar://%sodt.odt/Configurations2/accelerator%ccurrent.xml phar://%sodt.odt/META-INF%cmanifest.xml @@ -31,4 +30,3 @@ phar://%sodt.odt%cmimetype phar://%sodt.odt%csettings.xml phar://%sodt.odt%cstyles.xml Cannot create phar '%sodt.odt', file extension (or combination) not recognised or the directory does not exist -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_existing.phpt b/ext/phar/tests/zip/open_for_write_existing.phpt index fd76d4174e..c878f5cb1d 100644 --- a/ext/phar/tests/zip/open_for_write_existing.phpt +++ b/ext/phar/tests/zip/open_for_write_existing.phpt @@ -31,9 +31,7 @@ fclose($fp); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?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 9559b1740d..a15a7897e5 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -32,11 +32,9 @@ ini_set('phar.readonly', 1); var_dump(fopen($alias . '/b/c.php', 'wb')); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?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) This is b/c -===DONE=== 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 2071aaeeef..6e6a1b9edf 100644 --- a/ext/phar/tests/zip/open_for_write_existing_c.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt @@ -32,11 +32,9 @@ ini_set('phar.readonly', 1); var_dump(fopen($alias . '/b/c.php', 'wb')); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?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) This is b/c -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_newfile.phpt b/ext/phar/tests/zip/open_for_write_newfile.phpt index 10a69f0dde..a3db9558b8 100644 --- a/ext/phar/tests/zip/open_for_write_newfile.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile.phpt @@ -33,10 +33,8 @@ include $alias . '/b/c.php'; include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECT-- This is b/c extra -===DONE=== 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 9e851be30a..e25bade085 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- @@ -47,4 +46,3 @@ Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d -===DONE=== 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 bb46affc07..e2074d7003 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- @@ -47,4 +46,3 @@ Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt index 3adcc9c234..a7c8d76375 100644 --- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt @@ -41,7 +41,6 @@ $p->setStub($a, $c); var_dump($p->getStub()); fclose($a); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/phar_begin_setstub_commit.phar.zip'); @@ -67,4 +66,3 @@ string(%d) "<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_ " string(%d) "<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?> " -===DONE=== diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt index 3f2b9f8355..8e6f3993c3 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.zip'); @@ -63,4 +62,3 @@ array(1) { string(%d) "%sphar_buildfromiterator4.phpt" } bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt index abc9295ad2..cf7700b965 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator5.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.zip'); @@ -56,4 +55,3 @@ valid current %s(24) "UnexpectedValueException" Iterator myIterator returned an invalid value (must return a string) -===DONE=== diff --git a/ext/phar/tests/zip/phar_buildfromiterator6.phpt b/ext/phar/tests/zip/phar_buildfromiterator6.phpt index d478c92f07..0853c8fa24 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator6.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.zip'); @@ -57,4 +56,3 @@ current key %s(24) "UnexpectedValueException" Iterator myIterator returned an invalid key (must return a string) -===DONE=== diff --git a/ext/phar/tests/zip/phar_buildfromiterator7.phpt b/ext/phar/tests/zip/phar_buildfromiterator7.phpt index 06c039bb79..d4f26e40db 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator7.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.zip'); @@ -57,4 +56,3 @@ current key %s(24) "UnexpectedValueException" Iterator myIterator returned a file that could not be opened "phar_buildfromiterator7./oopsie/there.phpt" -===DONE=== diff --git a/ext/phar/tests/zip/phar_buildfromiterator8.phpt b/ext/phar/tests/zip/phar_buildfromiterator8.phpt index 17c23afa2e..1713170981 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator8.phpt @@ -18,7 +18,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar.zip'); @@ -70,4 +69,3 @@ array(21) { string(%d) "%sfrontcontroller9.phar.phpt" } bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/phar_buildfromiterator9.phpt b/ext/phar/tests/zip/phar_buildfromiterator9.phpt index 01bbb150fb..10361fbeb4 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator9.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/buildfromiterator.phar'); @@ -62,4 +61,3 @@ array(1) { ["a"]=> string(%d) "[stream]" } -===DONE=== diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt index 04fe255869..0d42723e38 100644 --- a/ext/phar/tests/zip/phar_commitwrite.phpt +++ b/ext/phar/tests/zip/phar_commitwrite.phpt @@ -22,7 +22,6 @@ __HALT_COMPILER(); var_dump($p->getStub()); var_dump($p->isFileFormat(Phar::ZIP)); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/phar_commitwrite.phar.zip'); @@ -39,4 +38,3 @@ include 'phar://phar_commitwrite.phar/startup.php'; __HALT_COMPILER(); ?> " bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt index 494afd9583..ef9d9b35fc 100644 --- a/ext/phar/tests/zip/phar_convert_phar.phpt +++ b/ext/phar/tests/zip/phar_convert_phar.phpt @@ -35,7 +35,6 @@ var_dump($phar->isFileFormat(Phar::PHAR)); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); @@ -54,4 +53,3 @@ bool(true) int(6641) bool(true) int(6641) -===DONE=== diff --git a/ext/phar/tests/zip/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt index fd29f06347..34b30d7d7f 100644 --- a/ext/phar/tests/zip/phar_magic.phpt +++ b/ext/phar/tests/zip/phar_magic.phpt @@ -24,7 +24,6 @@ include "phar://" . __FILE__ . "/a"; __HALT_COMPILER();'); include $pname; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); @@ -37,4 +36,3 @@ bool(true) in b <?php include "b/c.php"; in d -===DONE=== diff --git a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt index b2306bca61..2062f602f8 100644 --- a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt @@ -42,7 +42,6 @@ var_dump($c['a']->isCompressed(Phar::GZ)); var_dump($c['a']->isCompressed(Phar::BZ2)); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); @@ -67,4 +66,3 @@ bool(true) string(1) "a" bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/phar_oo_compressallgz.phpt b/ext/phar/tests/zip/phar_oo_compressallgz.phpt index 5daaed48ad..0db97eadf0 100644 --- a/ext/phar/tests/zip/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallgz.phpt @@ -34,7 +34,6 @@ var_dump($phar['b']->isCompressed(Phar::BZ2)); var_dump($phar['c']->isCompressed(Phar::GZ)); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); @@ -55,4 +54,3 @@ bool(true) string(1) "c" bool(false) bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/phar_setalias.phpt b/ext/phar/tests/zip/phar_setalias.phpt index cb60a068d6..2148316086 100644 --- a/ext/phar/tests/zip/phar_setalias.phpt +++ b/ext/phar/tests/zip/phar_setalias.phpt @@ -46,7 +46,6 @@ $p2->setAlias('unused2'); $p3 = new Phar($fname3); echo $p3->getAlias(), "\n"; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -59,4 +58,3 @@ hio test test test -===DONE=== diff --git a/ext/phar/tests/zip/phar_setalias2.phpt b/ext/phar/tests/zip/phar_setalias2.phpt index 8b63551b04..0af688703b 100644 --- a/ext/phar/tests/zip/phar_setalias2.phpt +++ b/ext/phar/tests/zip/phar_setalias2.phpt @@ -36,7 +36,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -46,4 +45,3 @@ __HALT_COMPILER(); hio test alias "test" is already used for archive "%sphar_setalias2.phar.zip" and cannot be used for other archives -===DONE=== diff --git a/ext/phar/tests/zip/phar_setdefaultstub.phpt b/ext/phar/tests/zip/phar_setdefaultstub.phpt index 4851a90cae..416dd10c26 100644 --- a/ext/phar/tests/zip/phar_setdefaultstub.phpt +++ b/ext/phar/tests/zip/phar_setdefaultstub.phpt @@ -53,7 +53,6 @@ try { var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -77,4 +76,3 @@ __HALT_COMPILER();" Warning: Phar::setDefaultStub(): method accepts no arguments for a tar- or zip-based phar stub, 2 given in %sphar_setdefaultstub.php on line %d string(60) "<?php // zip-based phar archive stub file __HALT_COMPILER();" -===DONE=== diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt index 53f9461c98..84c256ba27 100644 --- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt @@ -63,7 +63,6 @@ var_dump($p->getSignature()); echo $e->getMessage(); } ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -111,4 +110,3 @@ array(2) { ["hash_type"]=> string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt index 197cf409a9..c2c41dc4f1 100644 --- a/ext/phar/tests/zip/phar_stub.phpt +++ b/ext/phar/tests/zip/phar_stub.phpt @@ -57,7 +57,6 @@ $phar['testing'] = 'hi'; echo $phar->getStub(); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); @@ -72,4 +71,3 @@ __HALT_COMPILER(); <?php echo "third stub\n"; __HALT_COMPILER(); ?>booya <?php echo "third stub\n"; __HALT_COMPILER(); ?> <?php echo "third stub\n"; __HALT_COMPILER(); ?> -===DONE=== diff --git a/ext/phar/tests/zip/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt index 4bab4c2870..0d2cedebc3 100644 --- a/ext/phar/tests/zip/phar_stub_error.phpt +++ b/ext/phar/tests/zip/phar_stub_error.phpt @@ -35,7 +35,6 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); @@ -52,4 +51,3 @@ bool(true) string(50) "<?php echo "first stub\n"; __HALT_COMPILER(); ?> " bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt index 14fb3b228a..e5db8285e1 100644 --- a/ext/phar/tests/zip/refcount1.phpt +++ b/ext/phar/tests/zip/refcount1.phpt @@ -42,7 +42,6 @@ var_dump(fread($b, 20)); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- @@ -65,4 +64,3 @@ object(PharFileInfo)#%d (2) { } string(5) "extra" extra -===DONE=== diff --git a/ext/phar/tests/zip/unixzip.phpt b/ext/phar/tests/zip/unixzip.phpt index 371c34e0c7..e281a18f0b 100644 --- a/ext/phar/tests/zip/unixzip.phpt +++ b/ext/phar/tests/zip/unixzip.phpt @@ -17,7 +17,6 @@ if (isset($a['notempty/hi.txt'])) { echo $a['notempty/hi.txt']->getPathName() . "\n"; } ?> -===DONE=== --EXPECTF-- dir phar://%s/zip.zip%cempty phar://%s/zip.zip%chi.txt @@ -25,4 +24,3 @@ hi there dir phar://%s/zip.zip%cnotempty phar://%s/zip.zip/notempty%chi.txt -===DONE=== diff --git a/ext/phar/tests/zip/zlib.phpt b/ext/phar/tests/zip/zlib.phpt index 1e66e99937..5cd59fcac4 100644 --- a/ext/phar/tests/zip/zlib.phpt +++ b/ext/phar/tests/zip/zlib.phpt @@ -12,7 +12,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- string(175) "hitheresuperlongzipistoostupidtodowhatIsaysoIhavetousethisridiculouslylongaliasbecauseitisstupiddidImentionthatalreadythemadnessdoesnotstopIhateinfozipIhateinfozipIhateinfozip" -===DONE=== |