diff options
Diffstat (limited to 'ext/phar/tests')
158 files changed, 187 insertions, 315 deletions
diff --git a/ext/phar/tests/004.phpt b/ext/phar/tests/004.phpt index 963a9b45a0..b8ebd4137d 100644 --- a/ext/phar/tests/004.phpt +++ b/ext/phar/tests/004.phpt @@ -10,5 +10,5 @@ Phar::mapPhar('hio'); echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- __HALT_COMPILER(); must be declared in a phar diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt index 04324eff07..b60926e634 100644 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -32,7 +32,7 @@ include $pname . '/a.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- This is a This is b This is b/c diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt index d8907571cf..343be7f084 100644 --- a/ext/phar/tests/030.phpt +++ b/ext/phar/tests/030.phpt @@ -37,7 +37,7 @@ echo $e->getMessage(),"\n"; <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- This is a This is b This is b/c diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt index 4d0887f66f..e8ddb1f62a 100644 --- a/ext/phar/tests/badparameters.phpt +++ b/ext/phar/tests/badparameters.phpt @@ -145,19 +145,19 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --EXPECTF-- -Warning: Phar::mungServer() expects parameter 1 to be array, %string given in %sbadparameters.php on line %d +Warning: Phar::mungServer() expects parameter 1 to be array, string given in %sbadparameters.php on line %d Warning: Phar::createDefaultStub() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d Warning: Phar::loadPhar() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d -Warning: Phar::canCompress() expects parameter 1 to be integer, %string given in %sbadparameters.php on line %d +Warning: Phar::canCompress() expects parameter 1 to be int, string given in %sbadparameters.php on line %d Exception: Phar::__construct() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d -Warning: Phar::convertToExecutable() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d +Warning: Phar::convertToExecutable() expects parameter 1 to be int, array given in %sbadparameters.php on line %d -Warning: Phar::convertToData() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d +Warning: Phar::convertToData() expects parameter 1 to be int, array given in %sbadparameters.php on line %d Warning: PharData::delete() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d Cannot write out phar archive, phar is read-only @@ -177,10 +177,10 @@ Warning: Phar::setDefaultStub() expects parameter 1 to be %string, array given i Cannot change stub: phar.readonly=1 Cannot set signature algorithm, phar is read-only -Warning: Phar::compress() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d +Warning: Phar::compress() expects parameter 1 to be int, array given in %sbadparameters.php on line %d Cannot compress phar archive, phar is read-only -Warning: Phar::compressFiles() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d +Warning: Phar::compressFiles() expects parameter 1 to be int, array given in %sbadparameters.php on line %d Phar is readonly, cannot change compression Warning: Phar::copy() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d diff --git a/ext/phar/tests/bug46032.phpt b/ext/phar/tests/bug46032.phpt index a59ddadd43..57f3fc2daf 100644 --- a/ext/phar/tests/bug46032.phpt +++ b/ext/phar/tests/bug46032.phpt @@ -24,8 +24,8 @@ new phardata('0000000000000000000'); ?> ===DONE=== --EXPECTF-- -%string|unicode%(%d) "%smytest" -%string|unicode%(%d) "%smytest" +string(%d) "%smytest" +string(%d) "%smytest" Fatal error: Uncaught UnexpectedValueException: Cannot create phar '0000000000000000000', file extension (or combination) not recognised or the directory does not exist in %sbug46032.php:%d Stack trace: diff --git a/ext/phar/tests/bug54395.phpt b/ext/phar/tests/bug54395.phpt index 091ed326a8..a3d90a1b3e 100644 --- a/ext/phar/tests/bug54395.phpt +++ b/ext/phar/tests/bug54395.phpt @@ -12,5 +12,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- string(25) "Mounting of 1 to 1 failed" diff --git a/ext/phar/tests/bug60261.phpt b/ext/phar/tests/bug60261.phpt index 84d4203e10..31baa82394 100644 --- a/ext/phar/tests/bug60261.phpt +++ b/ext/phar/tests/bug60261.phpt @@ -13,5 +13,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Phar::__construct() expects at least 1 parameter, 0 given diff --git a/ext/phar/tests/bug66960.phpt b/ext/phar/tests/bug66960.phpt new file mode 100644 index 0000000000..0d2ffa6df0 --- /dev/null +++ b/ext/phar/tests/bug66960.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #66960 phar long filename crash +--SKIPIF-- +<?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +phar.readonly = 0 +memory_limit = -1 +--FILE-- +<?php +$file = __DIR__ . DIRECTORY_SEPARATOR . 'bug66960.phar'; +$phar = new Phar($file); +var_dump(file_exists("phar://$file/". str_repeat('a', PHP_MAXPATHLEN-1))); +var_dump(file_exists("phar://$file/". str_repeat('a', PHP_MAXPATHLEN))); +var_dump(file_exists("phar://$file/". str_repeat('a', PHP_MAXPATHLEN+1))); +echo 'done'; +?> +--CLEAN-- +$file = __DIR__ . DIRECTORY_SEPARATOR . 'bug66960.phar'; +unlink($file); +--EXPECT-- +bool(false) +bool(false) +bool(false) +done diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt index 6ada368707..edd77125e1 100644 --- a/ext/phar/tests/bug70019.phpt +++ b/ext/phar/tests/bug70019.phpt @@ -19,6 +19,6 @@ $dir = __DIR__."/bug70019"; unlink("$dir/ThisIsATestFile.txt"); rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/phar/tests/bug70433.phpt b/ext/phar/tests/bug70433.phpt index cc8f438463..1bf979efad 100644 --- a/ext/phar/tests/bug70433.phpt +++ b/ext/phar/tests/bug70433.phpt @@ -10,7 +10,7 @@ $meta = $phar->getMetadata(); var_dump($meta); ?> DONE ---EXPECTF-- +--EXPECT-- object(PharData)#1 (3) { ["pathName":"SplFileInfo":private]=> string(0) "" diff --git a/ext/phar/tests/bug74196.phpt b/ext/phar/tests/bug74196.phpt index 7a8e9235a3..4cd238d654 100644 --- a/ext/phar/tests/bug74196.phpt +++ b/ext/phar/tests/bug74196.phpt @@ -18,6 +18,6 @@ var_dump(file_exists($decompressed_name)); unlink($decompressed_name); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/ext/phar/tests/bug74383.phpt b/ext/phar/tests/bug74383.phpt index 3932d0b258..92ea892b88 100644 --- a/ext/phar/tests/bug74383.phpt +++ b/ext/phar/tests/bug74383.phpt @@ -1,7 +1,7 @@ --TEST-- Phar: bug #74383: Wrong reflection on Phar::running --SKIPIF-- -<?php if (!extension_loaded("phar") || !extension_loaded('reflection')) die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php $rc = new ReflectionClass(Phar::class); diff --git a/ext/phar/tests/bug74386.phpt b/ext/phar/tests/bug74386.phpt index 1cf86cae3e..0e60e00009 100644 --- a/ext/phar/tests/bug74386.phpt +++ b/ext/phar/tests/bug74386.phpt @@ -1,7 +1,7 @@ --TEST-- Phar: bug #74386: Phar::__construct(): wrong number of parameters by reflection --SKIPIF-- -<?php if (!extension_loaded("phar") || !extension_loaded('reflection')) die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- <?php $r = new ReflectionMethod(Phar::class, '__construct'); diff --git a/ext/phar/tests/bug76584.phpt b/ext/phar/tests/bug76584.phpt new file mode 100644 index 0000000000..b37de08c49 --- /dev/null +++ b/ext/phar/tests/bug76584.phpt @@ -0,0 +1,35 @@ +--TEST-- +Bug #76584 (PharFileInfo::decompress not working) +--SKIPIF-- +<?php +if (!extension_loaded('phar')) die('skip phar extension not available'); +if (!extension_loaded('zlib')) die('skip zlib extension not available'); +?> +--INI-- +phar.readonly=0 +--FILE-- +<?php +$phar = new Phar(__DIR__ . '/76584.phar'); +$phar->addFromString('76584.txt', 'This is a test file.'); +$file = $phar['76584.txt']; +var_dump($file->compress(Phar::GZ)); +var_dump($file->isCompressed()); +var_dump($file->decompress()); +var_dump($file->isCompressed()); +mkdir(__DIR__ . '/76584'); +var_dump($phar->extractTo(__DIR__ . '/76584')); +echo file_get_contents(__DIR__ . '/76584/76584.txt'); +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(false) +bool(true) +This is a test file. +--CLEAN-- +<?php +unlink(__DIR__ . '/76584/76584.txt'); +rmdir(__DIR__ . '/76584'); +unlink(__DIR__ . '/76584.phar'); +?> diff --git a/ext/phar/tests/bug79503.phar b/ext/phar/tests/bug79503.phar Binary files differnew file mode 100644 index 0000000000..d378c6f3df --- /dev/null +++ b/ext/phar/tests/bug79503.phar diff --git a/ext/phar/tests/bug79503.phpt b/ext/phar/tests/bug79503.phpt new file mode 100644 index 0000000000..874330fac7 --- /dev/null +++ b/ext/phar/tests/bug79503.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #79503 (Memory leak on duplicate metadata) +--SKIPIF-- +<?php +if (!extension_loaded('phar')) die('skip phar extension not available'); +?> +--FILE-- +<?php +try { + new Phar(__DIR__ . '/bug79503.phar'); +} catch (UnexpectedValueException $ex) { + echo $ex->getMessage(); +} +?> +--EXPECTF-- +phar error: tar-based phar "%s%ebug79503.phar" has invalid metadata in magic file ".phar/.metadata.bin" diff --git a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt index dc4425dee1..7502988ed2 100644 --- a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write10.phar ---EXPECTF-- +--EXPECT-- string(214) "<?php $p = new Phar(__FILE__); var_dump($p->getStub()); diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt index c1d3a42dd0..e75473d463 100644 --- a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write11.phar ---EXPECTF-- +--EXPECT-- string(174) "<?php $p = new Phar(__FILE__); var_dump($p->getStub()); diff --git a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt index 0e6b68bd0d..84f7cfefca 100644 --- a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write13.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok diff --git a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt index c776058d08..a4ad2bcb29 100644 --- a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write14.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) ok diff --git a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt index 9a0f159162..6ab97b50cf 100644 --- a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write15.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok diff --git a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt index f2e531e530..670d510e5c 100644 --- a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write16.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) ok diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt index 5ca937a145..78258f8dab 100644 --- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt @@ -10,5 +10,5 @@ phar.readonly=0 files/write17.phar --EXPECTF-- NULL -%string|unicode%(2) "hi" +string(2) "hi" ok diff --git a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt index 574a976fbc..6269466b9c 100644 --- a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write18.phar ---EXPECTF-- +--EXPECT-- 100666 100444 ok diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt index 38f9a74dc0..5c2740ebf8 100644 --- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt @@ -10,5 +10,5 @@ phar.readonly=0 files/write19.phar --EXPECTF-- string(2) "hi" -%string|unicode%(3) "hi2" +string(3) "hi2" ok diff --git a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt index da4931b3c6..843ed51709 100644 --- a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write20.phar ---EXPECTF-- +--EXPECT-- string(2) "hi" NULL ok diff --git a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt index 4621679d1f..978847cf06 100644 --- a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write21.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok diff --git a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt index 0c41f7be5e..45cc8bd4a8 100644 --- a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write22.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) ok diff --git a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt index 2709399760..4cc10803f9 100644 --- a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write23.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) bool(false) diff --git a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt index b0063957f3..0dd8f632d5 100644 --- a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write24.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok diff --git a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt index 17143a6f65..41b6382f05 100644 --- a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write25.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) <?php __HALT_COMPILER(); diff --git a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt index 7d5cd7a8a7..63aa2b168e 100644 --- a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write9.phar ---EXPECTF-- +--EXPECT-- string(188) "<?php $p = new Phar(__FILE__); var_dump($p->getStub()); diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt index c73b7c05bb..f0d659b4c3 100644 --- a/ext/phar/tests/cache_list/frontcontroller22.phpt +++ b/ext/phar/tests/cache_list/frontcontroller22.phpt @@ -14,8 +14,8 @@ files/frontcontroller13.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -%string|unicode%(4) "test" -%string|unicode%(12) "oof/test.php" +string(4) "test" +string(12) "oof/test.php" Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d diff --git a/ext/phar/tests/cache_list/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt index 1304e9ccee..23ecdc904b 100644 --- a/ext/phar/tests/cache_list/frontcontroller24.phpt +++ b/ext/phar/tests/cache_list/frontcontroller24.phpt @@ -13,5 +13,5 @@ PATH_INFO=/unknown/file files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- My 404 is rawesome diff --git a/ext/phar/tests/cache_list/frontcontroller25.phpt b/ext/phar/tests/cache_list/frontcontroller25.phpt index ea42865f5c..6fe6aee714 100644 --- a/ext/phar/tests/cache_list/frontcontroller25.phpt +++ b/ext/phar/tests/cache_list/frontcontroller25.phpt @@ -13,6 +13,6 @@ PATH_INFO=/a1.phps/extra/stuff files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- string(42) "/frontcontroller25.php/a1.phps/extra/stuff" string(12) "/extra/stuff" diff --git a/ext/phar/tests/cache_list/frontcontroller26.phpt b/ext/phar/tests/cache_list/frontcontroller26.phpt index 5418c055e1..bf1b96494e 100644 --- a/ext/phar/tests/cache_list/frontcontroller26.phpt +++ b/ext/phar/tests/cache_list/frontcontroller26.phpt @@ -12,5 +12,5 @@ PATH_INFO=/unknown.ext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: application/octet-stream ---EXPECTF-- +--EXPECT-- <?php var_dump("hi"); diff --git a/ext/phar/tests/cache_list/frontcontroller27.phpt b/ext/phar/tests/cache_list/frontcontroller27.phpt index 51e1e4c29f..00867b53c1 100644 --- a/ext/phar/tests/cache_list/frontcontroller27.phpt +++ b/ext/phar/tests/cache_list/frontcontroller27.phpt @@ -13,5 +13,5 @@ PATH_INFO=/noext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/plain;charset=UTF-8 ---EXPECTF-- +--EXPECT-- hi diff --git a/ext/phar/tests/cache_list/frontcontroller33.phpt b/ext/phar/tests/cache_list/frontcontroller33.phpt index 6ceae8abe6..8cf0a16056 100644 --- a/ext/phar/tests/cache_list/frontcontroller33.phpt +++ b/ext/phar/tests/cache_list/frontcontroller33.phpt @@ -12,5 +12,5 @@ REQUEST_URI=/frontcontroller33.php Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller18.phar ---EXPECTF-- +--EXPECT-- phar error: rewrite callback must return a string or false diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt index 940e3e9776..029ea7a53f 100644 --- a/ext/phar/tests/create_new_and_modify.phpt +++ b/ext/phar/tests/create_new_and_modify.phpt @@ -2,7 +2,6 @@ Phar: create and modify phar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt index 6beaa2eb61..d32f758f93 100644 --- a/ext/phar/tests/create_new_phar_c.phpt +++ b/ext/phar/tests/create_new_phar_c.phpt @@ -2,7 +2,6 @@ Phar: create a completely new phar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 7829ffc533..fd200d8613 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -2,7 +2,6 @@ Phar: create with illegal path --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt index ddde929d35..b55bc59c84 100644 --- a/ext/phar/tests/fopen.phpt +++ b/ext/phar/tests/fopen.phpt @@ -2,7 +2,6 @@ Phar: test fopen() interception --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip");?> -<?php if (substr(phpversion(), 0, 3) == '5.2') die("skip PHP >= 5.3 required for this test");?> --INI-- phar.require_hash=1 phar.readonly=0 diff --git a/ext/phar/tests/fopen5.2.phpt b/ext/phar/tests/fopen5.2.phpt deleted file mode 100644 index e0975b62ba..0000000000 --- a/ext/phar/tests/fopen5.2.phpt +++ /dev/null @@ -1,43 +0,0 @@ ---TEST-- -Phar: test fopen() interception ---SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip");?> -<?php if (substr(phpversion(), 0, 3) != '5.2') die("skip PHP 5.2 required for this test");?> ---INI-- -phar.require_hash=1 -phar.readonly=0 ---FILE-- -<?php -Phar::interceptFileFuncs(); -$a = fopen(__FILE__, 'rb'); // this satisfies 1 line of code coverage -fclose($a); -$a = fopen(); // this satisfies another line of code coverage - -$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; -$a = new Phar($fname); -$a['index.php'] = '<?php -$a = fopen("dir/file1.txt", "r"); -echo fread($a, 2); -fclose($a); -$a = fopen("file1.txt", "r", true); -echo fread($a, 2); -fclose($a); -$a = fopen("notfound.txt", "r", true); -?>'; -$a['dir/file1.txt'] = 'hi'; -$a['dir/file2.txt'] = 'hi2'; -$a['dir/file3.txt'] = 'hi3'; -$a->setStub('<?php -set_include_path("phar://" . __FILE__ . "/dir" . PATH_SEPARATOR . "phar://" . __FILE__); -include "index.php"; -__HALT_COMPILER();'); -include $fname; -?> -===DONE=== ---CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- -Warning: fopen() expects at least 2 parameters, 0 given in %sfopen5.2.php on line %d -hihi -Warning: fopen(phar://%sfopen5.2.phar.php/notfound.txt): failed to open stream: phar error: "notfound.txt" is not a file in phar "%sfopen5.2.phar.php" in phar://%sfopen5.2.phar.php/index.php on line %d -===DONE=== diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index 4510fbd801..4ac529a4e0 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -2,7 +2,6 @@ Phar: test edge cases of fopen() function interception #2 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (version_compare(phpversion(), '6.0', '>=')) die('skip parameter parsing changed in 6.0'); ?> --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt index 80f7ba847e..eed93fcc0a 100644 --- a/ext/phar/tests/frontcontroller11.phpt +++ b/ext/phar/tests/frontcontroller11.phpt @@ -3,8 +3,7 @@ Phar front controller mime type extension is not a string --INI-- default_charset= --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> -<?php die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?> --ENV-- SCRIPT_NAME=/frontcontroller11.php REQUEST_URI=/frontcontroller11.php/a.php @@ -13,9 +12,5 @@ PATH_INFO=/a.php files/frontcontroller5.phar --EXPECTHEADERS-- Content-type: text/html ---EXPECTF-- -Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.php:2 -Stack trace: -#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array) -#1 {main} - thrown in %sfrontcontroller11.php on line 2 +--EXPECT-- +hio diff --git a/ext/phar/tests/frontcontroller24.phpt b/ext/phar/tests/frontcontroller24.phpt index 5d94738ae7..e7d5dce909 100644 --- a/ext/phar/tests/frontcontroller24.phpt +++ b/ext/phar/tests/frontcontroller24.phpt @@ -12,5 +12,5 @@ PATH_INFO=/unknown/file files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- My 404 is rawesome diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt index 80a0844f2e..c2995ed437 100644 --- a/ext/phar/tests/frontcontroller25.phpt +++ b/ext/phar/tests/frontcontroller25.phpt @@ -12,6 +12,6 @@ PATH_INFO=/a1.phps/extra/stuff files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- string(42) "/frontcontroller25.php/a1.phps/extra/stuff" string(12) "/extra/stuff" diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt index 7d787ddf49..20a7d88351 100644 --- a/ext/phar/tests/frontcontroller26.phpt +++ b/ext/phar/tests/frontcontroller26.phpt @@ -10,5 +10,5 @@ PATH_INFO=/unknown.ext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: application/octet-stream ---EXPECTF-- +--EXPECT-- <?php var_dump("hi"); diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt index 21dd28d31d..720a2ec9e6 100644 --- a/ext/phar/tests/frontcontroller27.phpt +++ b/ext/phar/tests/frontcontroller27.phpt @@ -12,5 +12,5 @@ PATH_INFO=/noext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/plain;charset=UTF-8 ---EXPECTF-- +--EXPECT-- hi diff --git a/ext/phar/tests/frontcontroller33.phpt b/ext/phar/tests/frontcontroller33.phpt index 91581f43af..d80f44fffa 100644 --- a/ext/phar/tests/frontcontroller33.phpt +++ b/ext/phar/tests/frontcontroller33.phpt @@ -11,5 +11,5 @@ REQUEST_URI=/frontcontroller33.php Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller18.phar ---EXPECTF-- +--EXPECT-- phar error: rewrite callback must return a string or false diff --git a/ext/phar/tests/ini_set.phpt b/ext/phar/tests/ini_set.phpt index 4ddc9794f9..6bba43991a 100644 --- a/ext/phar/tests/ini_set.phpt +++ b/ext/phar/tests/ini_set.phpt @@ -19,7 +19,7 @@ var_dump(ini_get('phar.require_hash')); var_dump(ini_get('phar.readonly')); __HALT_COMPILER(); ?> ---EXPECTF-- +--EXPECT-- string(1) "1" string(1) "1" string(1) "1" diff --git a/ext/phar/tests/nophar.phpt b/ext/phar/tests/nophar.phpt index d97df8af2e..0534c17cd9 100644 --- a/ext/phar/tests/nophar.phpt +++ b/ext/phar/tests/nophar.phpt @@ -1,5 +1,5 @@ --TEST-- -Phar: phar run without pecl/phar with default stub +Phar: phar run without ext/phar with default stub --SKIPIF-- <?php if (extension_loaded("phar")) die("skip Phar extension must be disabled for this test"); ?> --FILE-- diff --git a/ext/phar/tests/open_for_write_existing.phpt b/ext/phar/tests/open_for_write_existing.phpt index 2a3ec8b824..e9e2c05b9e 100644 --- a/ext/phar/tests/open_for_write_existing.phpt +++ b/ext/phar/tests/open_for_write_existing.phpt @@ -26,6 +26,6 @@ include $pname . '/b/c.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--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 3c4ffbe3dd..d91318533e 100644 --- a/ext/phar/tests/open_for_write_existing_b.phpt +++ b/ext/phar/tests/open_for_write_existing_b.phpt @@ -36,8 +36,8 @@ include $pname . '/b/c.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 -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d 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 c217fc7d2c..eb0c27bf64 100644 --- a/ext/phar/tests/open_for_write_existing_c.phpt +++ b/ext/phar/tests/open_for_write_existing_c.phpt @@ -30,8 +30,8 @@ include $pname . '/b/c.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 -Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d This is b/c ===DONE=== diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt index c1c08df7ef..2918d49dad 100644 --- a/ext/phar/tests/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/open_for_write_newfile_b.phpt @@ -38,9 +38,9 @@ include $pname . '/b/new.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d This is b/c Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line 22 diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt index d8ae654dc9..8275c02baa 100644 --- a/ext/phar/tests/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/open_for_write_newfile_c.phpt @@ -32,9 +32,9 @@ include $pname . '/b/new.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d This is b/c Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt index 19ad7112cb..c269a8b34f 100644 --- a/ext/phar/tests/phar_bz2.phpt +++ b/ext/phar/tests/phar_bz2.phpt @@ -3,7 +3,6 @@ Phar: bzipped phar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> --INI-- @@ -60,6 +59,6 @@ string(%d) "phar://%sphar_bz2.phar/tar_004.php" bool(true) bool(true) -Warning: Phar::isFileFormat() expects parameter 1 to be integer, array given in %sphar_bz2.php on line %d +Warning: Phar::isFileFormat() expects parameter 1 to be int, array given in %sphar_bz2.php on line %d Unknown file format specified ===DONE=== diff --git a/ext/phar/tests/phar_copy.phpt b/ext/phar/tests/phar_copy.phpt index 5b28278ceb..8b270302ef 100644 --- a/ext/phar/tests/phar_copy.phpt +++ b/ext/phar/tests/phar_copy.phpt @@ -2,7 +2,6 @@ Phar: copy() --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- phar.readonly=0 diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt index b2c0639843..6c04571d86 100644 --- a/ext/phar/tests/phar_dir_iterate.phpt +++ b/ext/phar/tests/phar_dir_iterate.phpt @@ -2,7 +2,6 @@ Phar object: iterate test with sub-directories and RecursiveIteratorIterator --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/phar_get_supportedcomp1.phpt b/ext/phar/tests/phar_get_supportedcomp1.phpt index aa278a768f..fecb806f2e 100644 --- a/ext/phar/tests/phar_get_supportedcomp1.phpt +++ b/ext/phar/tests/phar_get_supportedcomp1.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (bz2 and zlib) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- diff --git a/ext/phar/tests/phar_get_supportedcomp2.phpt b/ext/phar/tests/phar_get_supportedcomp2.phpt index a535eba41c..aa941d0e4b 100644 --- a/ext/phar/tests/phar_get_supportedcomp2.phpt +++ b/ext/phar/tests/phar_get_supportedcomp2.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (bz2 only) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> <?php if (extension_loaded("zlib")) die("skip zlib is available"); ?> --INI-- diff --git a/ext/phar/tests/phar_get_supportedcomp3.phpt b/ext/phar/tests/phar_get_supportedcomp3.phpt index ab1d7cb6e2..fadb482042 100644 --- a/ext/phar/tests/phar_get_supportedcomp3.phpt +++ b/ext/phar/tests/phar_get_supportedcomp3.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (zlib only) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (extension_loaded("bz2")) die("skip bz2 is available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- diff --git a/ext/phar/tests/phar_get_supportedcomp4.phpt b/ext/phar/tests/phar_get_supportedcomp4.phpt index fba2c71bfc..1d953e2e38 100644 --- a/ext/phar/tests/phar_get_supportedcomp4.phpt +++ b/ext/phar/tests/phar_get_supportedcomp4.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (none) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (extension_loaded("bz2")) die("skip bz2 is available"); ?> <?php if (extension_loaded("zlib")) die("skip zlib is available"); ?> --FILE-- diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt index f7cf7f0964..3308424fa9 100644 --- a/ext/phar/tests/phar_gzip.phpt +++ b/ext/phar/tests/phar_gzip.phpt @@ -3,7 +3,6 @@ Phar: gzipped phar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index f0d87a7241..cbe0ebf133 100644 --- a/ext/phar/tests/phar_magic.phpt +++ b/ext/phar/tests/phar_magic.phpt @@ -24,7 +24,7 @@ include $fname; unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> ---EXPECTF-- +--EXPECT-- in b <?php include "b/c.php"; in d diff --git a/ext/phar/tests/phar_offset_check.phpt b/ext/phar/tests/phar_offset_check.phpt index 7609f2051f..469dce6c11 100644 --- a/ext/phar/tests/phar_offset_check.phpt +++ b/ext/phar/tests/phar_offset_check.phpt @@ -2,7 +2,6 @@ Phar: disallow stub and alias setting via offset*() methods --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt index dade4726d9..8e96246eef 100644 --- a/ext/phar/tests/phar_offset_get_error.phpt +++ b/ext/phar/tests/phar_offset_get_error.phpt @@ -2,7 +2,6 @@ Phar: ignore filenames starting with / on offsetSet --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt index 98e9992b5f..7ee7ca6fa5 100644 --- a/ext/phar/tests/phar_oo_001.phpt +++ b/ext/phar/tests/phar_oo_001.phpt @@ -3,7 +3,6 @@ Phar object: basics --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt index 1a4c4e40e7..2787ac8a53 100644 --- a/ext/phar/tests/phar_oo_002.phpt +++ b/ext/phar/tests/phar_oo_002.phpt @@ -3,7 +3,6 @@ Phar object: iterator & entries --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=1 @@ -72,7 +71,7 @@ int(0) string(3) "dir" bool(false) bool(true) -bool(false) +bool(true) bool(false) bool(true) bool(false) diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt index b1596b5fe5..01ca493a2f 100644 --- a/ext/phar/tests/phar_oo_003.phpt +++ b/ext/phar/tests/phar_oo_003.phpt @@ -2,7 +2,6 @@ Phar object: entry & openFile() --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 --FILE-- diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt index 118e3b0c1f..12492e2eef 100644 --- a/ext/phar/tests/phar_oo_004.phpt +++ b/ext/phar/tests/phar_oo_004.phpt @@ -3,7 +3,6 @@ Phar and DirectoryIterator --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt index 8da8a541c3..62887655b1 100644 --- a/ext/phar/tests/phar_oo_005.phpt +++ b/ext/phar/tests/phar_oo_005.phpt @@ -3,7 +3,6 @@ Phar and RecursiveDirectoryIterator --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt index 485d015f3e..de9b499a83 100644 --- a/ext/phar/tests/phar_oo_006.phpt +++ b/ext/phar/tests/phar_oo_006.phpt @@ -2,7 +2,6 @@ Phar object: array access --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 --FILE-- diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt index d7048350ff..ff9c721150 100644 --- a/ext/phar/tests/phar_oo_007.phpt +++ b/ext/phar/tests/phar_oo_007.phpt @@ -2,7 +2,6 @@ Phar object: access through SplFileObject --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 --FILE-- diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt index 543a5d1913..b0f518d39b 100644 --- a/ext/phar/tests/phar_oo_008.phpt +++ b/ext/phar/tests/phar_oo_008.phpt @@ -2,7 +2,6 @@ Phar object: iterating via SplFileObject --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 --FILE-- @@ -86,7 +85,7 @@ foreach($v as $k => $d) unlink(dirname(__FILE__) . '/files/phar_oo_008.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- ===1=== 0=>1,2,3 diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt index 56d547a042..05e1f1efeb 100644 --- a/ext/phar/tests/phar_oo_009.phpt +++ b/ext/phar/tests/phar_oo_009.phpt @@ -39,7 +39,7 @@ foreach($f as $k => $v) unlink(dirname(__FILE__) . '/files/phar_oo_009.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- 0=>1,2,3 1=>2,a,b 2=>3,"c","'e'" diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt index 667971ae25..0869828f8f 100644 --- a/ext/phar/tests/phar_oo_010.phpt +++ b/ext/phar/tests/phar_oo_010.phpt @@ -2,7 +2,6 @@ Phar object: ArrayAccess and isset --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 --FILE-- @@ -39,7 +38,7 @@ var_dump(isset($phar['b'])); unlink(dirname(__FILE__) . '/files/phar_oo_010.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt index d99dd21c9c..5b929363db 100644 --- a/ext/phar/tests/phar_oo_011.phpt +++ b/ext/phar/tests/phar_oo_011.phpt @@ -2,7 +2,6 @@ Phar object: add file --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt index 0ce2dca7b6..b7a1c420f1 100644 --- a/ext/phar/tests/phar_oo_011b.phpt +++ b/ext/phar/tests/phar_oo_011b.phpt @@ -2,7 +2,6 @@ Phar object: add file --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=1 phar.require_hash=0 @@ -34,6 +33,6 @@ catch (BadMethodCallException $e) unlink(dirname(__FILE__) . '/files/phar_oo_011b.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--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 2c8f089376..f5566807fb 100644 --- a/ext/phar/tests/phar_oo_012.phpt +++ b/ext/phar/tests/phar_oo_012.phpt @@ -2,7 +2,6 @@ Phar object: unset file --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt index 9264c7ce93..d2798c3dd4 100644 --- a/ext/phar/tests/phar_oo_012_confirm.phpt +++ b/ext/phar/tests/phar_oo_012_confirm.phpt @@ -2,7 +2,6 @@ Phar object: unset file (confirm disk file is changed) --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt index 1c06f6631a..cb17a601e4 100644 --- a/ext/phar/tests/phar_oo_012b.phpt +++ b/ext/phar/tests/phar_oo_012b.phpt @@ -2,7 +2,6 @@ Phar object: unset file --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=1 phar.require_hash=0 @@ -37,6 +36,6 @@ catch (BadMethodCallException $e) unlink(dirname(__FILE__) . '/files/phar_oo_012b.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--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 ed6314e146..d4aadebce6 100644 --- a/ext/phar/tests/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/phar_oo_compressallbz2.phpt @@ -47,7 +47,7 @@ var_dump($phar['b']->isCompressed(Phar::BZ2)); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt index 1d45e5b4d0..65d018bdbd 100644 --- a/ext/phar/tests/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/phar_oo_compressallgz.phpt @@ -51,7 +51,7 @@ echo $e->getMessage() . "\n"; unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt index e049697d97..032faa1247 100644 --- a/ext/phar/tests/phar_oo_compressed_001.phpt +++ b/ext/phar/tests/phar_oo_compressed_001.phpt @@ -50,7 +50,7 @@ var_dump($phar['d']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt index c3b15f5cf1..fcf06d4008 100644 --- a/ext/phar/tests/phar_oo_compressed_001b.phpt +++ b/ext/phar/tests/phar_oo_compressed_001b.phpt @@ -50,7 +50,7 @@ var_dump($phar['d']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt index c325430825..f1ece51617 100644 --- a/ext/phar/tests/phar_oo_compressed_002.phpt +++ b/ext/phar/tests/phar_oo_compressed_002.phpt @@ -53,7 +53,7 @@ var_dump($phar['e']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt index f4d4075506..dd935cc5ca 100644 --- a/ext/phar/tests/phar_oo_compressed_002b.phpt +++ b/ext/phar/tests/phar_oo_compressed_002b.phpt @@ -53,7 +53,7 @@ var_dump($phar['e']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt index 72828b198e..e3a0c2dea7 100644 --- a/ext/phar/tests/phar_oo_getcontents.phpt +++ b/ext/phar/tests/phar_oo_getcontents.phpt @@ -2,7 +2,6 @@ Phar object: getContent() --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt index 9e9653bd9c..e77b5cad1a 100644 --- a/ext/phar/tests/phar_oo_getcontentsgz.phpt +++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt @@ -2,7 +2,6 @@ Phar object: getContent() (verify it works with compression) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- phar.readonly=0 diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt index 27a52c09f3..0df479e860 100644 --- a/ext/phar/tests/phar_oo_getmodified.phpt +++ b/ext/phar/tests/phar_oo_getmodified.phpt @@ -30,7 +30,7 @@ var_dump($phar->getModified()); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ===DONE=== diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt index de16a35e65..5710f4fca5 100644 --- a/ext/phar/tests/phar_oo_nosig.phpt +++ b/ext/phar/tests/phar_oo_nosig.phpt @@ -2,7 +2,6 @@ Phar::getSignature() no signature --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.require_hash=0 --FILE-- diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index 278572e69a..d5d392d14d 100644 --- a/ext/phar/tests/phar_oo_uncompressall.phpt +++ b/ext/phar/tests/phar_oo_uncompressall.phpt @@ -55,7 +55,7 @@ var_dump($phar['a']->isCompressed()); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_running.phpt b/ext/phar/tests/phar_running.phpt index 2d132b9ac7..25acf82285 100644 --- a/ext/phar/tests/phar_running.phpt +++ b/ext/phar/tests/phar_running.phpt @@ -22,7 +22,7 @@ var_dump(Phar::running()); --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: Phar::running() expects parameter 1 to be boolean, array given in phar://%sphar_running.phar.php/index.php on line 2 +Warning: Phar::running() expects parameter 1 to be bool, array given in phar://%sphar_running.phar.php/index.php on line 2 string(%d) "phar://%sphar_running.phar.php" string(%d) "%sphar_running.phar.php" string(0) "" diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt index 9101862130..23ce5c914a 100644 --- a/ext/phar/tests/pharfileinfo_chmod.phpt +++ b/ext/phar/tests/pharfileinfo_chmod.phpt @@ -29,5 +29,5 @@ $b->chmod(0666); --EXPECTF-- Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod -Warning: PharFileInfo::chmod() expects parameter 1 to be integer, array given in %spharfileinfo_chmod.php on line %d +Warning: PharFileInfo::chmod() expects parameter 1 to be int, array given in %spharfileinfo_chmod.php on line %d ===DONE=== diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt index d10450e044..9f5480be4f 100644 --- a/ext/phar/tests/pharfileinfo_compression.phpt +++ b/ext/phar/tests/pharfileinfo_compression.phpt @@ -76,7 +76,7 @@ var_dump($b->decompress()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> --EXPECTF-- -Warning: PharFileInfo::isCompressed() expects parameter 1 to be integer, array given in %spharfileinfo_compression.php on line 11 +Warning: PharFileInfo::isCompressed() expects parameter 1 to be int, array given in %spharfileinfo_compression.php on line 11 Unknown compression type specified Unknown compression type specified Cannot compress with Gzip compression, not possible with tar-based phar archives diff --git a/ext/phar/tests/pharfileinfo_destruct.phpt b/ext/phar/tests/pharfileinfo_destruct.phpt index 6625d1e0c5..dc3917d2df 100644 --- a/ext/phar/tests/pharfileinfo_destruct.phpt +++ b/ext/phar/tests/pharfileinfo_destruct.phpt @@ -21,5 +21,5 @@ unset($b); ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/phar/tests/phpinfo_001.phpt b/ext/phar/tests/phpinfo_001.phpt index d99ccd1803..be726647a0 100644 --- a/ext/phar/tests/phpinfo_001.phpt +++ b/ext/phar/tests/phpinfo_001.phpt @@ -24,9 +24,7 @@ phpinfo(INFO_MODULES); %aPhar Phar: PHP Archive support => enabled -Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %sId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled @@ -46,9 +44,7 @@ phar.require_hash => Off => Off Phar Phar: PHP Archive support => enabled -Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %sId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled diff --git a/ext/phar/tests/phpinfo_002.phpt b/ext/phar/tests/phpinfo_002.phpt index ef505fedad..10303e5280 100644 --- a/ext/phar/tests/phpinfo_002.phpt +++ b/ext/phar/tests/phpinfo_002.phpt @@ -22,9 +22,7 @@ phpinfo(INFO_MODULES); Phar Phar: PHP Archive support => enabled -Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %sId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt index 045f1a090d..fb27fb6fb9 100644 --- a/ext/phar/tests/phpinfo_003.phpt +++ b/ext/phar/tests/phpinfo_003.phpt @@ -22,14 +22,12 @@ phpinfo(INFO_MODULES); Phar Phar: PHP Archive support => enabled -Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %cId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled gzip compression => disabled (install ext/zlib) -bzip2 compression => disabled (install pecl/bz2) +bzip2 compression => disabled (install ext/bz2) OpenSSL support => disabled (install ext/openssl) diff --git a/ext/phar/tests/phpinfo_004.phpt b/ext/phar/tests/phpinfo_004.phpt index b6df340815..280fa0b157 100644 --- a/ext/phar/tests/phpinfo_004.phpt +++ b/ext/phar/tests/phpinfo_004.phpt @@ -27,9 +27,7 @@ phpinfo(INFO_MODULES); <h2><a name="module_phar">Phar</a></h2> <table> <tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr> -<tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr> <tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr> -<tr><td class="e">SVN revision </td><td class="v">%sId: %s $ </td></tr> <tr><td class="e">Phar-based phar archives </td><td class="v">enabled </td></tr> <tr><td class="e">Tar-based phar archives </td><td class="v">enabled </td></tr> <tr><td class="e">ZIP-based phar archives </td><td class="v">enabled </td></tr> @@ -51,9 +49,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik.<br />Phar full <h2><a name="module_phar">Phar</a></h2> <table> <tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr> -<tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr> <tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr> -<tr><td class="e">SVN revision </td><td class="v">%sId: %s $ </td></tr> <tr><td class="e">Phar-based phar archives </td><td class="v">enabled </td></tr> <tr><td class="e">Tar-based phar archives </td><td class="v">enabled </td></tr> <tr><td class="e">ZIP-based phar archives </td><td class="v">enabled </td></tr> diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt index 3c717eb37d..e2cb3b8cff 100644 --- a/ext/phar/tests/refcount1.phpt +++ b/ext/phar/tests/refcount1.phpt @@ -2,7 +2,6 @@ Phar: test that refcounting avoids problems with deleting a file --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/stat2.phpt b/ext/phar/tests/stat2.phpt deleted file mode 100644 index cbd60b0509..0000000000 --- a/ext/phar/tests/stat2.phpt +++ /dev/null @@ -1,61 +0,0 @@ ---TEST-- -Phar: test stat function interceptions and is_file/is_link edge cases (PHP 5.2) ---SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip");?> -<?php if (substr(phpversion(), 0, 3) != '5.2') die("skip PHP 5.2 required for this test");?> ---INI-- -phar.readonly=0 -phar.require_hash=0 ---FILE-- -<?php -Phar::interceptFileFuncs(); -is_file(); -is_link(); -var_dump(is_file(__FILE__)); - -$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar'; -$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar'; -copy(dirname(__FILE__) . '/tar/files/links.tar', $fname2); -$a = new PharData($fname2); -$b = $a->convertToExecutable(); -unset($a); -Phar::unlinkArchive($fname2); -$b['foo/stat.php'] = '<?php -echo "is_link\n"; -var_dump(is_link("./stat.php"),is_file("./stat.php"), is_link("./oops"), is_file("./oops")); -var_dump(is_link("testit/link"), filetype("testit/link"), filetype("testit"), is_file("testit/link")); -echo "not found\n"; -var_dump(is_link("notfound")); -echo "dir\n"; -var_dump(is_dir("./bar"), is_file("foo/bar/blah")); -?>'; -$b->addEmptyDir('foo/bar/blah'); -$b->setStub('<?php -include "phar://" . __FILE__ . "/foo/stat.php"; -__HALT_COMPILER();'); -include $fname3; -?> -===DONE=== ---CLEAN-- -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> -<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> ---EXPECTF-- -Warning: Wrong parameter count for is_file() in %sstat2.php on line %d - -Warning: Wrong parameter count for is_link() in %sstat2.php on line %d -bool(true) -is_link -bool(false) -bool(true) -bool(false) -bool(false) -bool(true) -string(4) "link" -string(3) "dir" -bool(true) -not found -bool(false) -dir -bool(true) -bool(false) -===DONE=== diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt index 6a3f2bf2c8..99f658fa78 100644 --- a/ext/phar/tests/stat2_5.3.phpt +++ b/ext/phar/tests/stat2_5.3.phpt @@ -2,7 +2,6 @@ Phar: test stat function interceptions and is_file/is_link edge cases (PHP 5.3+) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip");?> -<?php if (substr(phpversion(), 0, 3) == '5.2') die("skip PHP 5.3+ required for this test");?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt index 0c39b0be93..b1cbef2acd 100644 --- a/ext/phar/tests/tar/033.phpt +++ b/ext/phar/tests/tar/033.phpt @@ -39,7 +39,7 @@ try { <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(true) bool(false) diff --git a/ext/phar/tests/tar/all.phpt b/ext/phar/tests/tar/all.phpt index 9f693ff6aa..848f50502d 100644 --- a/ext/phar/tests/tar/all.phpt +++ b/ext/phar/tests/tar/all.phpt @@ -3,7 +3,6 @@ Phar: test that creation of tar-based phar generates valid tar with all bells/wh --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); if (!extension_loaded("zlib")) die("skip zlib not available"); if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> diff --git a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt index bcbccab1c8..b8004138bc 100644 --- a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt +++ b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt @@ -2,7 +2,6 @@ Bug #71317: regression in opening tar based phar files --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php diff --git a/ext/phar/tests/tar/bug71504.phpt b/ext/phar/tests/tar/bug71504.phpt index e85078810e..178d4ed750 100644 --- a/ext/phar/tests/tar/bug71504.phpt +++ b/ext/phar/tests/tar/bug71504.phpt @@ -2,7 +2,6 @@ Bug #71504: Parsing of tar file with duplicate filenames causes memory leak --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt index 7d8bcb17da..8620ca0520 100644 --- a/ext/phar/tests/tar/create_new_and_modify.phpt +++ b/ext/phar/tests/tar/create_new_and_modify.phpt @@ -2,7 +2,6 @@ Phar: create and modify tar-based phar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 --FILE-- @@ -44,7 +43,7 @@ include $pname . '/b.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); ?> ---EXPECTF-- +--EXPECT-- bool(true) brand new! bool(true) diff --git a/ext/phar/tests/tar/frontcontroller11.phar.phpt b/ext/phar/tests/tar/frontcontroller11.phar.phpt index 7343bc6660..2db9e474fc 100644 --- a/ext/phar/tests/tar/frontcontroller11.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller11.phar.phpt @@ -3,8 +3,7 @@ Phar front controller mime type extension is not a string tar-based --INI-- default_charset= --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> -<?php die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?> --ENV-- SCRIPT_NAME=/frontcontroller11.phar.php REQUEST_URI=/frontcontroller11.phar.php/a.php @@ -13,9 +12,5 @@ PATH_INFO=/a.php files/frontcontroller5.phar.tar --EXPECTHEADERS-- Content-type: text/html ---EXPECTF-- -Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2 -Stack trace: -#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) -#1 {main} - thrown in %sfrontcontroller11.phar.php on line 2 +--EXPECT-- +hio 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 04a11870f9..95cba596f9 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -49,9 +49,9 @@ include $alias . '/b/c.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d 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 2117015165..9e73f1e899 100644 --- a/ext/phar/tests/tar/open_for_write_existing_c.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt @@ -43,9 +43,9 @@ include $alias . '/b/c.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d This is b/c ===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 92d0aa079f..c274e4c2c7 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt @@ -50,9 +50,9 @@ include $alias . '/b/new.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d This is b/c Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt index 2bb8d00c99..b5078426fe 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt @@ -43,9 +43,9 @@ include $alias . '/b/new.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d This is b/c Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/tar/phar_copy.phpt b/ext/phar/tests/tar/phar_copy.phpt index a257e64fc0..782bb4fb5d 100644 --- a/ext/phar/tests/tar/phar_copy.phpt +++ b/ext/phar/tests/tar/phar_copy.phpt @@ -2,7 +2,6 @@ Phar: copy() tar-based --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- phar.readonly=0 diff --git a/ext/phar/tests/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt index 9e1f7d44cb..19579dd614 100644 --- a/ext/phar/tests/tar/phar_magic.phpt +++ b/ext/phar/tests/tar/phar_magic.phpt @@ -25,7 +25,7 @@ include $fname; unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); __HALT_COMPILER(); ?> ---EXPECTF-- +--EXPECT-- bool(true) in b <?php include "b/c.php"; diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt index 9d1cb5e415..7b4f05417a 100644 --- a/ext/phar/tests/tar/refcount1.phpt +++ b/ext/phar/tests/tar/refcount1.phpt @@ -2,7 +2,6 @@ Phar: test that refcounting avoids problems with deleting a file tar-based --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt index 638534be1c..3841d1dce3 100644 --- a/ext/phar/tests/tar/require_hash.phpt +++ b/ext/phar/tests/tar/require_hash.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, require_hash=1, no signature --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=1 phar.require_hash=0 diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index 500058b70d..a2c4f36fa3 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar corrupted --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php include dirname(__FILE__) . '/files/make_invalid_tar.php.inc'; diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt index 75fc220b40..7fc09c806f 100644 --- a/ext/phar/tests/tar/tar_002.phpt +++ b/ext/phar/tests/tar/tar_002.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar corrupted 2 --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt index 3dec341784..fe7e1d854e 100644 --- a/ext/phar/tests/tar/tar_003.phpt +++ b/ext/phar/tests/tar/tar_003.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, valid 1 --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt index 3b28f47cec..d142857388 100644 --- a/ext/phar/tests/tar/tar_004.phpt +++ b/ext/phar/tests/tar/tar_004.phpt @@ -3,7 +3,6 @@ Phar: tar-based phar, tar phar with stub, mapPhar() --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt index 61914f52c6..d7e6dc0e26 100644 --- a/ext/phar/tests/tar/tar_bz2.phpt +++ b/ext/phar/tests/tar/tar_bz2.phpt @@ -3,7 +3,6 @@ Phar: tar-based phar, bzipped tar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> --INI-- diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt index 840e30ce6a..f64962c8c8 100644 --- a/ext/phar/tests/tar/tar_gzip.phpt +++ b/ext/phar/tests/tar/tar_gzip.phpt @@ -3,7 +3,6 @@ Phar: tar-based phar, gzipped tar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt index f703b46924..91b0da7c72 100644 --- a/ext/phar/tests/tar/tar_makebz2.phpt +++ b/ext/phar/tests/tar/tar_makebz2.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, make new bzipped tar --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> --INI-- phar.readonly=0 @@ -33,7 +32,7 @@ var_dump($phar2->isCompressed() == Phar::BZ2); @unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar.bz2'); @unlink(dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt index a68db482d2..93d515280a 100644 --- a/ext/phar/tests/tar/tar_makegz.phpt +++ b/ext/phar/tests/tar/tar_makegz.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, make new gzipped tar --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- phar.readonly=0 @@ -34,7 +33,7 @@ var_dump($phar2->isCompressed() == Phar::GZ); @unlink(dirname(__FILE__) . '/tar_makegz.phar.tar.gz'); @unlink(dirname(__FILE__) . '/tar_makegz_b.phar.tar.gz'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/phar/tests/tar/tar_nohash.phpt b/ext/phar/tests/tar/tar_nohash.phpt index dae2bb92a8..3d1d0010a0 100644 --- a/ext/phar/tests/tar/tar_nohash.phpt +++ b/ext/phar/tests/tar/tar_nohash.phpt @@ -2,7 +2,6 @@ Phar: tar archive, require_hash=1, should not error out --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --INI-- phar.readonly=1 diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt index 0036662c38..210f8815ec 100644 --- a/ext/phar/tests/tar/tar_nostub.phpt +++ b/ext/phar/tests/tar/tar_nostub.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, third-party tar with no stub, Phar->getStub() --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=1 phar.require_hash=0 diff --git a/ext/phar/tests/tar/tar_openssl_hash.phpt b/ext/phar/tests/tar/tar_openssl_hash.phpt index 49ef77a44b..075136f687 100644 --- a/ext/phar/tests/tar/tar_openssl_hash.phpt +++ b/ext/phar/tests/tar/tar_openssl_hash.phpt @@ -2,7 +2,6 @@ Phar: tar archive, require_hash=1, OpenSSL hash --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip'); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> <?php if (!extension_loaded("openssl")) die("skip openssl not available"); ?> --INI-- diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt index c422fa9843..26c86d2f1b 100644 --- a/ext/phar/tests/withphar.phpt +++ b/ext/phar/tests/withphar.phpt @@ -1,5 +1,5 @@ --TEST-- -Phar: phar run with pecl/phar with default stub +Phar: phar run with ext/phar with default stub --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt index 82769345ce..1b9f832fb5 100644 --- a/ext/phar/tests/zip/all.phpt +++ b/ext/phar/tests/zip/all.phpt @@ -3,7 +3,6 @@ Phar: test that creation of zip-based phar generates valid zip with all bells/wh --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("spl")) die("skip SPL not available"); if (!extension_loaded("zlib")) die("skip zlib not available"); if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> diff --git a/ext/phar/tests/zip/bug48791.phpt b/ext/phar/tests/zip/bug48791.phpt index 45c527188b..5ad1344bd7 100644 --- a/ext/phar/tests/zip/bug48791.phpt +++ b/ext/phar/tests/zip/bug48791.phpt @@ -2,7 +2,6 @@ Phar: Bug #48791: open office documents always reported as corrupted by phar extension --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php diff --git a/ext/phar/tests/zip/bzip2.phpt b/ext/phar/tests/zip/bzip2.phpt index a703ce6033..551e419b87 100644 --- a/ext/phar/tests/zip/bzip2.phpt +++ b/ext/phar/tests/zip/bzip2.phpt @@ -2,7 +2,6 @@ Phar: process bzip2-compressed zip entry --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?> --FILE-- <?php diff --git a/ext/phar/tests/zip/corrupt_001.phpt b/ext/phar/tests/zip/corrupt_001.phpt index 0b019c6d83..000018aab6 100644 --- a/ext/phar/tests/zip/corrupt_001.phpt +++ b/ext/phar/tests/zip/corrupt_001.phpt @@ -2,7 +2,6 @@ Phar: corrupted zip (count mismatch) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_002.phpt b/ext/phar/tests/zip/corrupt_002.phpt index 86a271231d..345d1d81db 100644 --- a/ext/phar/tests/zip/corrupt_002.phpt +++ b/ext/phar/tests/zip/corrupt_002.phpt @@ -2,7 +2,6 @@ Phar: corrupted zip (no end of zip record) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_003.phpt b/ext/phar/tests/zip/corrupt_003.phpt index c41e0153d8..40c5ff1877 100644 --- a/ext/phar/tests/zip/corrupt_003.phpt +++ b/ext/phar/tests/zip/corrupt_003.phpt @@ -2,7 +2,6 @@ Phar: corrupted zip (truncated file comment) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_004.phpt b/ext/phar/tests/zip/corrupt_004.phpt index 3760e8f9ae..a36281151d 100644 --- a/ext/phar/tests/zip/corrupt_004.phpt +++ b/ext/phar/tests/zip/corrupt_004.phpt @@ -2,7 +2,6 @@ Phar: corrupted zip (central directory offset incorrect) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_005.phpt b/ext/phar/tests/zip/corrupt_005.phpt index 6b5d31d967..e3e0d88849 100644 --- a/ext/phar/tests/zip/corrupt_005.phpt +++ b/ext/phar/tests/zip/corrupt_005.phpt @@ -2,7 +2,6 @@ Phar: encrypted zip --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_006.phpt b/ext/phar/tests/zip/corrupt_006.phpt index 9c83617a9a..dd7937850f 100644 --- a/ext/phar/tests/zip/corrupt_006.phpt +++ b/ext/phar/tests/zip/corrupt_006.phpt @@ -2,7 +2,6 @@ Phar: zip with file created from stdin --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_007.phpt b/ext/phar/tests/zip/corrupt_007.phpt index 80c9139025..52a6c1e792 100644 --- a/ext/phar/tests/zip/corrupt_007.phpt +++ b/ext/phar/tests/zip/corrupt_007.phpt @@ -2,7 +2,6 @@ Phar: corrupted zip (truncated filename record) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_008.phpt b/ext/phar/tests/zip/corrupt_008.phpt index 5a20f4d2ec..eb706b7e55 100644 --- a/ext/phar/tests/zip/corrupt_008.phpt +++ b/ext/phar/tests/zip/corrupt_008.phpt @@ -2,7 +2,6 @@ Phar: unsupported compression methods --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_009.phpt b/ext/phar/tests/zip/corrupt_009.phpt index 91f142da7b..0ca80c00c1 100644 --- a/ext/phar/tests/zip/corrupt_009.phpt +++ b/ext/phar/tests/zip/corrupt_009.phpt @@ -2,7 +2,6 @@ Phar: corrupted zip (extra field way too long) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/corrupt_010.phpt b/ext/phar/tests/zip/corrupt_010.phpt index ead723c825..b95a03272a 100644 --- a/ext/phar/tests/zip/corrupt_010.phpt +++ b/ext/phar/tests/zip/corrupt_010.phpt @@ -2,7 +2,6 @@ Phar: unable to process zip (zip spanning multiple archives) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php try { diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt index c49ec513ff..3ff2346f67 100644 --- a/ext/phar/tests/zip/create_new_and_modify.phpt +++ b/ext/phar/tests/zip/create_new_and_modify.phpt @@ -2,7 +2,6 @@ Phar: create and modify zip-based phar --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 --FILE-- @@ -44,7 +43,7 @@ include $pname . '/b.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> ---EXPECTF-- +--EXPECT-- bool(true) brand new! bool(true) diff --git a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc index c030895f2c..15ae3a926f 100644 --- a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc +++ b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc @@ -26,7 +26,6 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id$ * @link http://pear.php.net/package/File_Archive */ diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt index 0807dd8fcf..15534d02c5 100644 --- a/ext/phar/tests/zip/frontcontroller11.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt @@ -3,9 +3,8 @@ Phar front controller mime type extension is not a string zip-based --INI-- default_charset= --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> -<?php die("skip"); ?> --ENV-- SCRIPT_NAME=/frontcontroller11.phar.php REQUEST_URI=/frontcontroller11.phar.php/a.php @@ -14,9 +13,5 @@ PATH_INFO=/a.php files/frontcontroller5.phar.zip --EXPECTHEADERS-- Content-type: text/html ---EXPECTF-- -Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2 -Stack trace: -#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) -#1 {main} - thrown in %sfrontcontroller11.phar.php on line 2 +--EXPECT-- +hio diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt index b007d447a8..20f9f112df 100644 --- a/ext/phar/tests/zip/odt.phpt +++ b/ext/phar/tests/zip/odt.phpt @@ -2,7 +2,6 @@ Phar: test a zip archive created by openoffice --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php 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 0d5d90452f..e8d5a70fb1 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -46,8 +46,8 @@ include $alias . '/b/c.php'; --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 -Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_b.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_b.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_b.php on line %d 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 90eb154814..adcb50ff93 100644 --- a/ext/phar/tests/zip/open_for_write_existing_c.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt @@ -40,8 +40,8 @@ include $alias . '/b/c.php'; --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 -Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d This is b/c ===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 7176da0140..cb328ae3d7 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -49,9 +49,9 @@ include $alias . '/b/new.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d This is b/c Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d 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 126a71d1fd..86e33da7c9 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt @@ -43,9 +43,9 @@ include $alias . '/b/new.php'; --EXPECTF-- Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d -Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d -Warning: fclose() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d This is b/c Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/zip/phar_copy.phpt b/ext/phar/tests/zip/phar_copy.phpt index 98450a4ffc..d4d00a1259 100644 --- a/ext/phar/tests/zip/phar_copy.phpt +++ b/ext/phar/tests/zip/phar_copy.phpt @@ -2,7 +2,6 @@ Phar: copy() zip-based --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt index 7d9ede7238..e66c2945a8 100644 --- a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt @@ -48,7 +48,7 @@ var_dump($c['a']->isCompressed(Phar::BZ2)); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/zip/phar_oo_compressallgz.phpt b/ext/phar/tests/zip/phar_oo_compressallgz.phpt index 535d2abdb6..1d995553ea 100644 --- a/ext/phar/tests/zip/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallgz.phpt @@ -39,7 +39,7 @@ var_dump($phar['c']->isCompressed(Phar::GZ)); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt index 5b8085bdbc..82a6f5218f 100644 --- a/ext/phar/tests/zip/refcount1.phpt +++ b/ext/phar/tests/zip/refcount1.phpt @@ -2,7 +2,6 @@ Phar: test that refcounting avoids problems with deleting a file zip-based --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/zip/unixzip.phpt b/ext/phar/tests/zip/unixzip.phpt index e2b95be93c..d6cbe47898 100644 --- a/ext/phar/tests/zip/unixzip.phpt +++ b/ext/phar/tests/zip/unixzip.phpt @@ -2,7 +2,6 @@ Phar: test a zip archive created by unix "zip" command --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> --FILE-- <?php $a = new PharData(dirname(__FILE__) . '/files/zip.zip'); diff --git a/ext/phar/tests/zip/zlib.phpt b/ext/phar/tests/zip/zlib.phpt index c7494e2c61..bb3e012be2 100644 --- a/ext/phar/tests/zip/zlib.phpt +++ b/ext/phar/tests/zip/zlib.phpt @@ -2,7 +2,6 @@ Phar: process zlib-compressed zip alias --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> -<?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> --FILE-- <?php |