diff options
Diffstat (limited to 'ext/phar/tests')
57 files changed, 57 insertions, 57 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 087f822777..95aa7b0887 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 e1e94dba80..14df993e1b 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/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/bug70019.phpt b/ext/phar/tests/bug70019.phpt index 85bf1780aa..4b0cd38260 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/cache_list/copyonwrite10.phar.phpt b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt index 3d5b7fe784..660776af05 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 c3851e6494..eae6a8e26e 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 fc47174d2b..bbb3ab5aa9 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt index 11201ac989..9e10b31591 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt index 6e46289227..a74439ddeb 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt index f17784c355..5e8744e9f3 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt index 3e65f5a124..751194b330 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt index acce57415c..aa0c9653ee 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt index 8960ea7171..6b32520f2d 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt index 7cba216395..141f9c9ad7 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt index 292e5af668..c6025fd125 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 69197f2b4b..3bf0e11c3d 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt index b661cb61c1..13cae01e85 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 ffda9565bd..ee0eb34937 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/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt index 561826bd78..cd7c990c29 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller25.phpt b/ext/phar/tests/cache_list/frontcontroller25.phpt index a8779392b6..3ec1d52d54 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"
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller26.phpt b/ext/phar/tests/cache_list/frontcontroller26.phpt index 86a1c1444c..b7d1270107 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");
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller27.phpt b/ext/phar/tests/cache_list/frontcontroller27.phpt index 4a76e02eae..1e0898dffc 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
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller33.phpt b/ext/phar/tests/cache_list/frontcontroller33.phpt index 9573854823..65e0733670 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
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller24.phpt b/ext/phar/tests/frontcontroller24.phpt index 767971ee91..69cd9f92b6 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
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt index 9b383de413..1ef9117550 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"
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt index a8097b0886..e66dd2036b 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");
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt index 16203f6feb..9aa82f1349 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
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller33.phpt b/ext/phar/tests/frontcontroller33.phpt index 8593e31766..6247a4ebfc 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
\ No newline at end of file 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/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/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index f6a0a675ef..c2b25685f1 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_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt index dc9ab7f9ca..b0f518d39b 100644 --- a/ext/phar/tests/phar_oo_008.phpt +++ b/ext/phar/tests/phar_oo_008.phpt @@ -85,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 3c842fabed..f651a52563 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 ca3abddfce..0869828f8f 100644 --- a/ext/phar/tests/phar_oo_010.phpt +++ b/ext/phar/tests/phar_oo_010.phpt @@ -38,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_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt index d36c083dff..b7a1c420f1 100644 --- a/ext/phar/tests/phar_oo_011b.phpt +++ b/ext/phar/tests/phar_oo_011b.phpt @@ -33,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_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt index c650a3ceff..cb17a601e4 100644 --- a/ext/phar/tests/phar_oo_012b.phpt +++ b/ext/phar/tests/phar_oo_012b.phpt @@ -36,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 3f52227194..f6bf3f23a0 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 55e7435f95..8a23e7de84 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 af02012573..4bd04dec37 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 6d4c732862..97c3cbb7ca 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 d03d6f1a98..1a539ac803 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 0e167012b7..278137c676 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_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt index d531393281..9ed19966b3 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_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index 19cf953197..ef348563f1 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/pharfileinfo_destruct.phpt b/ext/phar/tests/pharfileinfo_destruct.phpt index 48a58c0d09..23e7042fa4 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===
\ No newline at end of file diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt index 29223e49e3..1054cb1f66 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/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt index e8f0ecf061..8620ca0520 100644 --- a/ext/phar/tests/tar/create_new_and_modify.phpt +++ b/ext/phar/tests/tar/create_new_and_modify.phpt @@ -43,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/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt index 1bb336f96c..11a36fd930 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/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt index ed614d894b..91b0da7c72 100644 --- a/ext/phar/tests/tar/tar_makebz2.phpt +++ b/ext/phar/tests/tar/tar_makebz2.phpt @@ -32,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 7d6ea89fd0..93d515280a 100644 --- a/ext/phar/tests/tar/tar_makegz.phpt +++ b/ext/phar/tests/tar/tar_makegz.phpt @@ -33,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/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt index 0941bb6e61..3ff2346f67 100644 --- a/ext/phar/tests/zip/create_new_and_modify.phpt +++ b/ext/phar/tests/zip/create_new_and_modify.phpt @@ -43,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/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt index d6b0a8f4cf..7632bd03b3 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 47dddac487..97b9e19d6e 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" |