diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-05 12:40:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-05 12:40:59 +0800 |
| commit | 228c2886869e7f50a272f163cb3b765a65fd40eb (patch) | |
| tree | 893fd9bed395c8ea59eecb1a2915e077d0401b07 | |
| parent | f4a315fce2658a5338486e17ee11d77bd3dcb14b (diff) | |
| download | php-git-228c2886869e7f50a272f163cb3b765a65fd40eb.tar.gz | |
Fix 126 tests failed of phar when --enable-zend-multibyte
126 files changed, 217 insertions, 75 deletions
diff --git a/ext/phar/tests/008.phpt b/ext/phar/tests/008.phpt index 664ffea5cb..bede8ba1c1 100644 --- a/ext/phar/tests/008.phpt +++ b/ext/phar/tests/008.phpt @@ -2,6 +2,8 @@ Phar::mapPhar truncated manifest (not enough for manifest length) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip");?> +--INI-- +detect_unicode=0 --FILE-- <?php $file = "<?php diff --git a/ext/phar/tests/009.phpt b/ext/phar/tests/009.phpt index 61933b3814..55d13b353c 100644 --- a/ext/phar/tests/009.phpt +++ b/ext/phar/tests/009.phpt @@ -4,6 +4,7 @@ Phar::mapPhar too many manifest entries <?php if (!extension_loaded("phar")) die("skip");?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $file = b"<?php diff --git a/ext/phar/tests/010.phpt b/ext/phar/tests/010.phpt index d1e2f40c9c..441f13dc64 100644 --- a/ext/phar/tests/010.phpt +++ b/ext/phar/tests/010.phpt @@ -4,6 +4,7 @@ Phar::mapPhar buffer overrun <?php if (!extension_loaded("phar")) die("skip");?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $file = b"<?php diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt index 4a1f0dd42c..9923f853e4 100644 --- a/ext/phar/tests/011.phpt +++ b/ext/phar/tests/011.phpt @@ -4,6 +4,7 @@ Phar::mapPhar filesize too small in manifest <?php if (!extension_loaded("phar")) die("skip");?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/012.phpt b/ext/phar/tests/012.phpt index 3246eff468..37ff8bb19e 100644 --- a/ext/phar/tests/012.phpt +++ b/ext/phar/tests/012.phpt @@ -4,6 +4,7 @@ Phar::mapPhar valid file <?php if (!extension_loaded("phar")) die("skip");?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php diff --git a/ext/phar/tests/018.phpt b/ext/phar/tests/018.phpt index 2e2df470bf..71fa622402 100644 --- a/ext/phar/tests/018.phpt +++ b/ext/phar/tests/018.phpt @@ -7,6 +7,7 @@ if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of P ?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -33,4 +34,4 @@ while (false !== ($a = readdir($dir))) { string(1) "a" bool(false) string(1) "b" -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/phar/tests/019b.phpt b/ext/phar/tests/019b.phpt index 5a0ef71335..22d193efd6 100755 --- a/ext/phar/tests/019b.phpt +++ b/ext/phar/tests/019b.phpt @@ -7,6 +7,7 @@ if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of P ?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/019c.phpt b/ext/phar/tests/019c.phpt index 2cb508c46c..23afa26190 100755 --- a/ext/phar/tests/019c.phpt +++ b/ext/phar/tests/019c.phpt @@ -7,6 +7,7 @@ if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of P ?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt index 7d01681b6f..334a16dbf1 100644 --- a/ext/phar/tests/020.phpt +++ b/ext/phar/tests/020.phpt @@ -4,6 +4,7 @@ Phar: url stat <?php if (!extension_loaded("phar")) die("skip"); ?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -133,4 +134,4 @@ array(26) { int(-1) [%sblocks"]=> int(-1) -}
\ No newline at end of file +} diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt index bfd6576952..af062dbcf1 100644 --- a/ext/phar/tests/021.phpt +++ b/ext/phar/tests/021.phpt @@ -4,6 +4,7 @@ Phar: stream stat <?php if (!extension_loaded("phar")) die("skip"); ?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -82,4 +83,4 @@ array(26) { int(-1) [%sblocks"]=> int(-1) -}
\ No newline at end of file +} diff --git a/ext/phar/tests/022.phpt b/ext/phar/tests/022.phpt index 20c24a0214..934add4721 100644 --- a/ext/phar/tests/022.phpt +++ b/ext/phar/tests/022.phpt @@ -4,6 +4,7 @@ Phar: stream stat <?php if (!extension_loaded("phar")) die("skip"); ?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt index 087f822777..8cead29ff4 100755 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -4,6 +4,7 @@ Phar::loadPhar <?php if (!extension_loaded("phar")) die("skip"); ?> --INI-- phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt index 90b0a8fe46..f3105194eb 100644 --- a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 1 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite1.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write.phar --EXPECT-- hi changed -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt index 3d5b7fe784..959c6e0a94 100644 --- a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 10 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite10.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -21,4 +22,4 @@ __HALT_COMPILER(); ?> " <?php __HALT_COMPILER(); ?> -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt index 65388163dc..f48df3776d 100644 --- a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 11 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite11.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -19,4 +20,4 @@ echo "ok\n"; __HALT_COMPILER(); ?> " 6685 -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt index 40b544191d..ef5d02ccc8 100644 --- a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 12 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite12.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -21,4 +22,4 @@ array(2) { ["hash_type"]=> string(3) "MD5" } -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt index fc47174d2b..bd49565c83 100644 --- a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 13 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite13.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> @@ -12,4 +13,4 @@ files/write13.phar --EXPECTF-- bool(false) bool(true) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt index 11201ac989..9b4a65c54c 100644 --- a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 14 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite14.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> @@ -12,4 +13,4 @@ files/write14.phar --EXPECTF-- bool(true) bool(false) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt index 6e46289227..545201e389 100644 --- a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 15 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite15.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write15.phar --EXPECTF-- bool(false) bool(true) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt index f17784c355..5cc9cb415a 100644 --- a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 16 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite16.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write16.phar --EXPECTF-- bool(true) bool(false) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt index 158c049b14..74dc6619c1 100644 --- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 17 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite17.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write17.phar --EXPECTF-- NULL %string|unicode%(2) "hi" -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt index 3e65f5a124..03112c18be 100644 --- a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 18 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite18.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write18.phar --EXPECTF-- 100666 100444 -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt index 6e03554d96..23fe5879a9 100644 --- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 19 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite19.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write19.phar --EXPECTF-- string(2) "hi" %string|unicode%(3) "hi2" -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt index 8d21c813a4..9246a630c6 100644 --- a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 2 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite2.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -14,4 +15,4 @@ bool(true) string(2) "hi" bool(true) bool(true) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt index acce57415c..10c56342e9 100644 --- a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 20 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite20.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write20.phar --EXPECTF-- string(2) "hi" NULL -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt index 8960ea7171..409273db6c 100644 --- a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 21 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite21.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> @@ -12,4 +13,4 @@ files/write21.phar --EXPECTF-- bool(false) bool(true) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt index 7cba216395..9e7ad6c741 100644 --- a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 22 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite22.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> @@ -12,4 +13,4 @@ files/write22.phar --EXPECTF-- bool(true) bool(false) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt index 292e5af668..28412928b6 100644 --- a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 23 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite23.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> @@ -14,4 +15,4 @@ bool(true) bool(false) bool(false) bool(true) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt index 69197f2b4b..3aaba359f5 100644 --- a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 24 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite24.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> @@ -12,4 +13,4 @@ files/write24.phar --EXPECTF-- bool(false) bool(true) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt index b661cb61c1..73a1d7648a 100644 --- a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 25 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite25.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> @@ -13,4 +14,4 @@ files/write25.phar bool(false) bool(true) <?php __HALT_COMPILER(); -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt index 7e2c94c5b2..44815ef522 100644 --- a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 3 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite3.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -13,4 +14,4 @@ bool(true) bool(true) bool(false) bool(false) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt index 20ff78e282..f29a8d6247 100644 --- a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 4 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite4.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -12,4 +13,4 @@ files/write4.phar bool(false) bool(true) string(2) "hi" -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite4a.phpt b/ext/phar/tests/cache_list/copyonwrite4a.phpt index 1945e31f16..1b50c4204a 100644 --- a/ext/phar/tests/cache_list/copyonwrite4a.phpt +++ b/ext/phar/tests/cache_list/copyonwrite4a.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 4a [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite4.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- @@ -17,4 +18,4 @@ var_dump(file_exists('phar://' . dirname(__FILE__) . '/files/write4.phar/testit. bool(false) bool(true) string(2) "hi" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt index 89990a7af1..6f48dfa63d 100644 --- a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 5 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite5.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -24,4 +25,4 @@ array(2) { phar://%scopyonwrite5.phar.php%cfile1 file1 phar://%scopyonwrite5.phar.php%cfile2 file2 phar://%scopyonwrite5.phar.php%chi hi -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt index 661fef42c1..ceea8508bd 100644 --- a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt @@ -5,6 +5,7 @@ default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite6.phar.php phar.readonly=0 open_basedir= +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip PHP 5.3+ required"); ?> diff --git a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt index d6faded9cc..57658dddd9 100644 --- a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 7 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite7.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write7.phar --EXPECT-- bool(true) bool(false) -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt index 7217d336e2..71aa0b01be 100644 --- a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 8 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite8.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -11,4 +12,4 @@ files/write8.phar --EXPECTF-- string(%s) "%scopyonwrite8.phar.php" hi -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt index ffda9565bd..b2437776a1 100644 --- a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt @@ -4,6 +4,7 @@ Phar: copy-on-write test 9 [cache_list] default_charset=UTF-8 phar.cache_list={PWD}/copyonwrite9.phar.php phar.readonly=0 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -20,4 +21,4 @@ __HALT_COMPILER(); ?> " <?php __HALT_COMPILER(); ?> -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/cache_list/frontcontroller1.phpt b/ext/phar/tests/cache_list/frontcontroller1.phpt index d0d5552f16..91a5c9ea7d 100644 --- a/ext/phar/tests/cache_list/frontcontroller1.phpt +++ b/ext/phar/tests/cache_list/frontcontroller1.phpt @@ -2,6 +2,7 @@ Phar front controller other --INI-- phar.cache_list={PWD}/frontcontroller1.php [cache_list] +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller10.phpt b/ext/phar/tests/cache_list/frontcontroller10.phpt index 00177d4ff5..7c94da116c 100644 --- a/ext/phar/tests/cache_list/frontcontroller10.phpt +++ b/ext/phar/tests/cache_list/frontcontroller10.phpt @@ -3,6 +3,7 @@ Phar front controller rewrite access denied [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller10.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller11.phpt b/ext/phar/tests/cache_list/frontcontroller11.phpt index 25b147e194..e4912844de 100644 --- a/ext/phar/tests/cache_list/frontcontroller11.phpt +++ b/ext/phar/tests/cache_list/frontcontroller11.phpt @@ -3,6 +3,7 @@ Phar front controller mime type extension is not a string [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller11.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php die("skip"); ?> @@ -19,4 +20,4 @@ Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type o Stack trace: #0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} - thrown in %sfrontcontroller11.php on line 2
\ No newline at end of file + thrown in %sfrontcontroller11.php on line 2 diff --git a/ext/phar/tests/cache_list/frontcontroller12.phpt b/ext/phar/tests/cache_list/frontcontroller12.phpt index cfc7d0e43a..c98a84027a 100644 --- a/ext/phar/tests/cache_list/frontcontroller12.phpt +++ b/ext/phar/tests/cache_list/frontcontroller12.phpt @@ -3,6 +3,7 @@ Phar front controller mime type unknown int [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller12.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -18,4 +19,4 @@ Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type Stack trace: #0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} - thrown in %sfrontcontroller12.php on line 2
\ No newline at end of file + thrown in %sfrontcontroller12.php on line 2 diff --git a/ext/phar/tests/cache_list/frontcontroller13.phpt b/ext/phar/tests/cache_list/frontcontroller13.phpt index e6c9dee4ae..deb02c25db 100644 --- a/ext/phar/tests/cache_list/frontcontroller13.phpt +++ b/ext/phar/tests/cache_list/frontcontroller13.phpt @@ -3,6 +3,7 @@ Phar front controller mime type not string/int [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller13.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -18,4 +19,4 @@ Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type Stack trace: #0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} - thrown in %sfrontcontroller13.php on line 2
\ No newline at end of file + thrown in %sfrontcontroller13.php on line 2 diff --git a/ext/phar/tests/cache_list/frontcontroller14.phpt b/ext/phar/tests/cache_list/frontcontroller14.phpt index bbd9637d24..bc214141f4 100644 --- a/ext/phar/tests/cache_list/frontcontroller14.phpt +++ b/ext/phar/tests/cache_list/frontcontroller14.phpt @@ -2,6 +2,7 @@ Phar front controller mime type override, other [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller14.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller15.phpt b/ext/phar/tests/cache_list/frontcontroller15.phpt index d142a5d742..22fed0af57 100644 --- a/ext/phar/tests/cache_list/frontcontroller15.phpt +++ b/ext/phar/tests/cache_list/frontcontroller15.phpt @@ -3,6 +3,7 @@ Phar front controller mime type override, Phar::PHPS [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller15.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller16.phpt b/ext/phar/tests/cache_list/frontcontroller16.phpt index 10bebdccef..4294c3d326 100644 --- a/ext/phar/tests/cache_list/frontcontroller16.phpt +++ b/ext/phar/tests/cache_list/frontcontroller16.phpt @@ -3,6 +3,7 @@ Phar front controller mime type override, Phar::PHP [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller16.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller17.phpt b/ext/phar/tests/cache_list/frontcontroller17.phpt index 35d3ae4e9c..47688e7b6a 100644 --- a/ext/phar/tests/cache_list/frontcontroller17.phpt +++ b/ext/phar/tests/cache_list/frontcontroller17.phpt @@ -2,6 +2,7 @@ Phar front controller mime type unknown [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller17.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller18.phpt b/ext/phar/tests/cache_list/frontcontroller18.phpt index 5e94bf6ff5..8982706e5f 100644 --- a/ext/phar/tests/cache_list/frontcontroller18.phpt +++ b/ext/phar/tests/cache_list/frontcontroller18.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging failure [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller18.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller19.phpt b/ext/phar/tests/cache_list/frontcontroller19.phpt index bed0b1df31..0e5e8f1d07 100644 --- a/ext/phar/tests/cache_list/frontcontroller19.phpt +++ b/ext/phar/tests/cache_list/frontcontroller19.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging failure 2 [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller19.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller2.phpt b/ext/phar/tests/cache_list/frontcontroller2.phpt index 67ccfc1e04..2cf18f823c 100644 --- a/ext/phar/tests/cache_list/frontcontroller2.phpt +++ b/ext/phar/tests/cache_list/frontcontroller2.phpt @@ -3,6 +3,7 @@ Phar front controller PHP test [cache_list] --INI-- default_charset=UTF-8 phar.cache_list=frontcontroller2.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller20.phpt b/ext/phar/tests/cache_list/frontcontroller20.phpt index bf333c773c..b5499b1ef5 100644 --- a/ext/phar/tests/cache_list/frontcontroller20.phpt +++ b/ext/phar/tests/cache_list/frontcontroller20.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging failure 3 [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller20.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller21.phpt b/ext/phar/tests/cache_list/frontcontroller21.phpt index 829f2986e9..6d514891df 100644 --- a/ext/phar/tests/cache_list/frontcontroller21.phpt +++ b/ext/phar/tests/cache_list/frontcontroller21.phpt @@ -3,6 +3,7 @@ Phar front controller $_SERVER munging success [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller21.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -22,4 +23,4 @@ string(18) "/index.php?test=hi" string(32) "/frontcontroller21.php/index.php" string(22) "/frontcontroller21.php" string(%d) "%sfrontcontroller21.php" -string(40) "/frontcontroller21.php/index.php?test=hi"
\ No newline at end of file +string(40) "/frontcontroller21.php/index.php?test=hi" diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt index 2769b01f2f..3454e16239 100644 --- a/ext/phar/tests/cache_list/frontcontroller22.phpt +++ b/ext/phar/tests/cache_list/frontcontroller22.phpt @@ -3,6 +3,7 @@ Phar front controller include from cwd test 1 [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller22.phpt +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -19,4 +20,4 @@ Content-type: text/html; charset=UTF-8 Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d -Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
\ No newline at end of file +Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d diff --git a/ext/phar/tests/cache_list/frontcontroller23.phpt b/ext/phar/tests/cache_list/frontcontroller23.phpt index 3da9631dfb..6a053e694c 100644 --- a/ext/phar/tests/cache_list/frontcontroller23.phpt +++ b/ext/phar/tests/cache_list/frontcontroller23.phpt @@ -3,6 +3,7 @@ Phar front controller with generic action router test [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller23.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -15,4 +16,4 @@ files/frontcontroller14.phar Content-type: text/html; charset=UTF-8 --EXPECTF-- string(9) "/hi/there" -string(%d) "phar://%sfrontcontroller23.php/html/index.php"
\ No newline at end of file +string(%d) "phar://%sfrontcontroller23.php/html/index.php" diff --git a/ext/phar/tests/cache_list/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt index 561826bd78..e8892a3dab 100644 --- a/ext/phar/tests/cache_list/frontcontroller24.phpt +++ b/ext/phar/tests/cache_list/frontcontroller24.phpt @@ -3,6 +3,7 @@ Phar front controller with custom 404 php script [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller24.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -14,4 +15,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -My 404 is rawesome
\ No newline at end of file +My 404 is rawesome diff --git a/ext/phar/tests/cache_list/frontcontroller25.phpt b/ext/phar/tests/cache_list/frontcontroller25.phpt index a8779392b6..2fdc23daad 100644 --- a/ext/phar/tests/cache_list/frontcontroller25.phpt +++ b/ext/phar/tests/cache_list/frontcontroller25.phpt @@ -3,6 +3,7 @@ Phar front controller with extra path_info [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller25.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -15,4 +16,4 @@ files/frontcontroller8.phar Content-type: text/html; charset=UTF-8 --EXPECTF-- string(42) "/frontcontroller25.php/a1.phps/extra/stuff" -string(12) "/extra/stuff"
\ No newline at end of file +string(12) "/extra/stuff" diff --git a/ext/phar/tests/cache_list/frontcontroller26.phpt b/ext/phar/tests/cache_list/frontcontroller26.phpt index 86a1c1444c..dc3bdf8bc3 100644 --- a/ext/phar/tests/cache_list/frontcontroller26.phpt +++ b/ext/phar/tests/cache_list/frontcontroller26.phpt @@ -2,6 +2,7 @@ Phar front controller with unknown extension mime type [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller26.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -13,4 +14,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: application/octet-stream --EXPECTF-- -<?php var_dump("hi");
\ No newline at end of file +<?php var_dump("hi"); diff --git a/ext/phar/tests/cache_list/frontcontroller27.phpt b/ext/phar/tests/cache_list/frontcontroller27.phpt index 4a76e02eae..87e8050e2f 100644 --- a/ext/phar/tests/cache_list/frontcontroller27.phpt +++ b/ext/phar/tests/cache_list/frontcontroller27.phpt @@ -3,6 +3,7 @@ Phar front controller with no extension [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller27.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -14,4 +15,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/plain;charset=UTF-8 --EXPECTF-- -hi
\ No newline at end of file +hi diff --git a/ext/phar/tests/cache_list/frontcontroller28.phpt b/ext/phar/tests/cache_list/frontcontroller28.phpt index 80059a9da2..ea76bb21f6 100644 --- a/ext/phar/tests/cache_list/frontcontroller28.phpt +++ b/ext/phar/tests/cache_list/frontcontroller28.phpt @@ -3,6 +3,7 @@ Phar front controller with huge file [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller28.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt index 1cd8f96f2d..5a5dacff52 100644 --- a/ext/phar/tests/cache_list/frontcontroller29.phpt +++ b/ext/phar/tests/cache_list/frontcontroller29.phpt @@ -3,6 +3,7 @@ Phar front controller with fatal error in php file [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller29.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -14,4 +15,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1
\ No newline at end of file +Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1 diff --git a/ext/phar/tests/cache_list/frontcontroller3.phpt b/ext/phar/tests/cache_list/frontcontroller3.phpt index 1c1b479881..f5651e2d78 100644 --- a/ext/phar/tests/cache_list/frontcontroller3.phpt +++ b/ext/phar/tests/cache_list/frontcontroller3.phpt @@ -3,6 +3,7 @@ Phar front controller phps [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller3.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller30.phpt b/ext/phar/tests/cache_list/frontcontroller30.phpt index 5a63da874c..ca92c72880 100644 --- a/ext/phar/tests/cache_list/frontcontroller30.phpt +++ b/ext/phar/tests/cache_list/frontcontroller30.phpt @@ -2,6 +2,7 @@ Phar front controller with weird SCRIPT_NAME [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller30.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -11,4 +12,4 @@ REQUEST_URI=/huh? files/frontcontroller8.phar --EXPECTF-- oops did not run -%a
\ No newline at end of file +%a diff --git a/ext/phar/tests/cache_list/frontcontroller31.phpt b/ext/phar/tests/cache_list/frontcontroller31.phpt index 9ef1221a28..966ca1a40c 100644 --- a/ext/phar/tests/cache_list/frontcontroller31.phpt +++ b/ext/phar/tests/cache_list/frontcontroller31.phpt @@ -3,6 +3,7 @@ Phar front controller with invalid callback for rewrites [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller31.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -13,4 +14,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller16.phar --EXPECT-- -phar error: invalid rewrite callback
\ No newline at end of file +phar error: invalid rewrite callback diff --git a/ext/phar/tests/cache_list/frontcontroller32.phpt b/ext/phar/tests/cache_list/frontcontroller32.phpt index 59116907a5..49cb062e54 100644 --- a/ext/phar/tests/cache_list/frontcontroller32.phpt +++ b/ext/phar/tests/cache_list/frontcontroller32.phpt @@ -3,6 +3,7 @@ Phar front controller with valid callback that is not good [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller32.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -13,4 +14,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller17.phar --EXPECTF-- -%ahar error: failed to call rewrite callback
\ No newline at end of file +%ahar error: failed to call rewrite callback diff --git a/ext/phar/tests/cache_list/frontcontroller33.phpt b/ext/phar/tests/cache_list/frontcontroller33.phpt index 9573854823..34244d844e 100644 --- a/ext/phar/tests/cache_list/frontcontroller33.phpt +++ b/ext/phar/tests/cache_list/frontcontroller33.phpt @@ -3,6 +3,7 @@ Phar front controller with valid callback that does not return any value [cache_ --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller33.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -13,4 +14,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller18.phar --EXPECTF-- -phar error: rewrite callback must return a string or false
\ No newline at end of file +phar error: rewrite callback must return a string or false diff --git a/ext/phar/tests/cache_list/frontcontroller34.phpt b/ext/phar/tests/cache_list/frontcontroller34.phpt index 83c22f58f8..f6677cc04b 100644 --- a/ext/phar/tests/cache_list/frontcontroller34.phpt +++ b/ext/phar/tests/cache_list/frontcontroller34.phpt @@ -3,6 +3,7 @@ Phar front controller with cwd [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller34.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller4.phpt b/ext/phar/tests/cache_list/frontcontroller4.phpt index 5cf3682277..16961a1e46 100644 --- a/ext/phar/tests/cache_list/frontcontroller4.phpt +++ b/ext/phar/tests/cache_list/frontcontroller4.phpt @@ -2,6 +2,7 @@ Phar front controller index.php relocate (no /) [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller4.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller5.phpt b/ext/phar/tests/cache_list/frontcontroller5.phpt index 2c738d7bfb..93ea37a9af 100644 --- a/ext/phar/tests/cache_list/frontcontroller5.phpt +++ b/ext/phar/tests/cache_list/frontcontroller5.phpt @@ -2,6 +2,7 @@ Phar front controller index.php relocate [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller5.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller6.phpt b/ext/phar/tests/cache_list/frontcontroller6.phpt index 2480be4129..d498072fa2 100644 --- a/ext/phar/tests/cache_list/frontcontroller6.phpt +++ b/ext/phar/tests/cache_list/frontcontroller6.phpt @@ -2,6 +2,7 @@ Phar front controller 404 [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller6.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -20,4 +21,4 @@ Status: 404 Not Found <body> <h1>404 - File /notfound.php Not Found</h1> </body> -</html>
\ No newline at end of file +</html> diff --git a/ext/phar/tests/cache_list/frontcontroller7.phpt b/ext/phar/tests/cache_list/frontcontroller7.phpt index a8a88a95fe..c4d5514ade 100644 --- a/ext/phar/tests/cache_list/frontcontroller7.phpt +++ b/ext/phar/tests/cache_list/frontcontroller7.phpt @@ -2,6 +2,7 @@ Phar front controller alternate index file [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller7.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/cache_list/frontcontroller8.phpt b/ext/phar/tests/cache_list/frontcontroller8.phpt index bf9b390def..bc6829cba5 100644 --- a/ext/phar/tests/cache_list/frontcontroller8.phpt +++ b/ext/phar/tests/cache_list/frontcontroller8.phpt @@ -2,6 +2,7 @@ Phar front controller no index file 404 [cache_list] --INI-- phar.cache_list={PWD}/frontcontroller8.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -20,4 +21,4 @@ Status: 404 Not Found <body> <h1>404 - File /index.php Not Found</h1> </body> -</html>
\ No newline at end of file +</html> diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt index 1a8b9168cc..fb6f72ac22 100644 --- a/ext/phar/tests/cache_list/frontcontroller9.phpt +++ b/ext/phar/tests/cache_list/frontcontroller9.phpt @@ -3,6 +3,7 @@ Phar front controller rewrite array [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller9.php +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -17,4 +18,4 @@ Content-type: text/html; charset=UTF-8 <code><span style="color: #000000"> <span style="color: #0000BB"><?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> </span> -</code>
\ No newline at end of file +</code> diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt index 1d98509064..f91b11b3d5 100644 --- a/ext/phar/tests/delete.phpt +++ b/ext/phar/tests/delete.phpt @@ -5,6 +5,7 @@ Phar: delete test --INI-- phar.readonly=0 phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -28,4 +29,4 @@ echo file_get_contents($pname . '/a') . "\n"; --EXPECTF-- a -Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16
\ No newline at end of file +Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16 diff --git a/ext/phar/tests/fatal_error_webphar.phpt b/ext/phar/tests/fatal_error_webphar.phpt index 80efaa9ed1..36b3fba122 100644 --- a/ext/phar/tests/fatal_error_webphar.phpt +++ b/ext/phar/tests/fatal_error_webphar.phpt @@ -2,6 +2,7 @@ Phar web-based phar with fatal error --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -15,4 +16,4 @@ Content-type: text/html; charset=UTF-8 --EXPECTF-- string(9) "\Web\View" -Parse error: syntax error, unexpected T_ECHO, expecting T_FUNCTION in phar://%sfatal_error_webphar.php/Web/View.php on line 380
\ No newline at end of file +Parse error: syntax error, unexpected T_ECHO, expecting T_FUNCTION in phar://%sfatal_error_webphar.php/Web/View.php on line 380 diff --git a/ext/phar/tests/file_get_contents.phpt b/ext/phar/tests/file_get_contents.phpt index fcc9d64655..b931176e50 100644 --- a/ext/phar/tests/file_get_contents.phpt +++ b/ext/phar/tests/file_get_contents.phpt @@ -5,6 +5,7 @@ Phar: test file_get_contents() interception --INI-- phar.require_hash=1 phar.readonly=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -27,4 +28,4 @@ include $fname; --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- -hihi===DONE===
\ No newline at end of file +hihi===DONE=== diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt index 5b694d6e2d..b10bcb3a53 100644 --- a/ext/phar/tests/fopen.phpt +++ b/ext/phar/tests/fopen.phpt @@ -6,6 +6,7 @@ Phar: test fopen() interception --INI-- phar.require_hash=1 phar.readonly=0 +detect_unicode=0 --FILE-- <?php Phar::interceptFileFuncs(); @@ -40,4 +41,4 @@ include $fname; Warning: fopen() expects at least 2 parameters, 0 given in %sfopen.php on line %d hihi Warning: fopen(notfound.txt): failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/front.phar.phpt b/ext/phar/tests/front.phar.phpt index bab8ada0fd..4009b491f5 100644 --- a/ext/phar/tests/front.phar.phpt +++ b/ext/phar/tests/front.phar.phpt @@ -2,6 +2,7 @@ Phar front controller with mounted external file --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller1.phpt b/ext/phar/tests/frontcontroller1.phpt index 7093323617..0186b12529 100644 --- a/ext/phar/tests/frontcontroller1.phpt +++ b/ext/phar/tests/frontcontroller1.phpt @@ -2,6 +2,8 @@ Phar front controller other --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller1.php REQUEST_URI=/frontcontroller1.php/a.jpg diff --git a/ext/phar/tests/frontcontroller10.phpt b/ext/phar/tests/frontcontroller10.phpt index 667d5c243c..b6a0b488f6 100644 --- a/ext/phar/tests/frontcontroller10.phpt +++ b/ext/phar/tests/frontcontroller10.phpt @@ -2,6 +2,7 @@ Phar front controller rewrite access denied --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt index 956ea1c050..b85b2f716b 100644 --- a/ext/phar/tests/frontcontroller12.phpt +++ b/ext/phar/tests/frontcontroller12.phpt @@ -2,6 +2,7 @@ Phar front controller mime type unknown int --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -17,4 +18,4 @@ Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type Stack trace: #0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} - thrown in %sfrontcontroller12.php on line 2
\ No newline at end of file + thrown in %sfrontcontroller12.php on line 2 diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt index 717e56996f..cde41f7cdd 100644 --- a/ext/phar/tests/frontcontroller13.phpt +++ b/ext/phar/tests/frontcontroller13.phpt @@ -2,6 +2,7 @@ Phar front controller mime type not string/int --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -17,4 +18,4 @@ Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type Stack trace: #0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} - thrown in %sfrontcontroller13.php on line 2
\ No newline at end of file + thrown in %sfrontcontroller13.php on line 2 diff --git a/ext/phar/tests/frontcontroller14.phpt b/ext/phar/tests/frontcontroller14.phpt index 2bdb145c6e..13de43f426 100644 --- a/ext/phar/tests/frontcontroller14.phpt +++ b/ext/phar/tests/frontcontroller14.phpt @@ -2,6 +2,8 @@ Phar front controller mime type override, other --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller14.php REQUEST_URI=/frontcontroller14.php/a.jpg diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt index 370098014d..8dbf144618 100644 --- a/ext/phar/tests/frontcontroller15.phpt +++ b/ext/phar/tests/frontcontroller15.phpt @@ -2,6 +2,7 @@ Phar front controller mime type override, Phar::PHPS --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller16.phpt b/ext/phar/tests/frontcontroller16.phpt index 712af40bf3..8b0499b4b4 100644 --- a/ext/phar/tests/frontcontroller16.phpt +++ b/ext/phar/tests/frontcontroller16.phpt @@ -2,6 +2,7 @@ Phar front controller mime type override, Phar::PHP --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller17.phpt b/ext/phar/tests/frontcontroller17.phpt index 233e2e2a49..ce8cda4642 100644 --- a/ext/phar/tests/frontcontroller17.phpt +++ b/ext/phar/tests/frontcontroller17.phpt @@ -2,6 +2,8 @@ Phar front controller mime type unknown --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller17.php REQUEST_URI=/frontcontroller17.php/fronk.gronk diff --git a/ext/phar/tests/frontcontroller18.phpt b/ext/phar/tests/frontcontroller18.phpt index 19aea45563..3d867070ab 100644 --- a/ext/phar/tests/frontcontroller18.phpt +++ b/ext/phar/tests/frontcontroller18.phpt @@ -2,6 +2,8 @@ Phar front controller $_SERVER munging failure --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller18.php REQUEST_URI=/frontcontroller18.php/fronk.gronk diff --git a/ext/phar/tests/frontcontroller19.phpt b/ext/phar/tests/frontcontroller19.phpt index 9adafa2b30..8c72e47056 100644 --- a/ext/phar/tests/frontcontroller19.phpt +++ b/ext/phar/tests/frontcontroller19.phpt @@ -2,6 +2,8 @@ Phar front controller $_SERVER munging failure 2 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller19.php REQUEST_URI=/frontcontroller19.php/ diff --git a/ext/phar/tests/frontcontroller2.phpt b/ext/phar/tests/frontcontroller2.phpt index d0744dea1d..987a04ea99 100644 --- a/ext/phar/tests/frontcontroller2.phpt +++ b/ext/phar/tests/frontcontroller2.phpt @@ -2,6 +2,7 @@ Phar front controller PHP test --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller20.phpt b/ext/phar/tests/frontcontroller20.phpt index 45e2bfc25e..bf87cd9688 100644 --- a/ext/phar/tests/frontcontroller20.phpt +++ b/ext/phar/tests/frontcontroller20.phpt @@ -2,6 +2,8 @@ Phar front controller $_SERVER munging failure 3 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller20.php REQUEST_URI=/frontcontroller20.php/ diff --git a/ext/phar/tests/frontcontroller21.phpt b/ext/phar/tests/frontcontroller21.phpt index bf50c6e801..1c61ceb602 100644 --- a/ext/phar/tests/frontcontroller21.phpt +++ b/ext/phar/tests/frontcontroller21.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging success --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -21,4 +22,4 @@ string(18) "/index.php?test=hi" string(32) "/frontcontroller21.php/index.php" string(22) "/frontcontroller21.php" string(%d) "%sfrontcontroller21.php" -string(40) "/frontcontroller21.php/index.php?test=hi"
\ No newline at end of file +string(40) "/frontcontroller21.php/index.php?test=hi" diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt index b85c1eb497..f19c88b595 100644 --- a/ext/phar/tests/frontcontroller22.phpt +++ b/ext/phar/tests/frontcontroller22.phpt @@ -2,6 +2,7 @@ Phar front controller include from cwd test 1 --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -18,4 +19,4 @@ Content-type: text/html; charset=UTF-8 Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d -Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
\ No newline at end of file +Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d diff --git a/ext/phar/tests/frontcontroller23.phpt b/ext/phar/tests/frontcontroller23.phpt index 24464c9beb..4a676028b2 100644 --- a/ext/phar/tests/frontcontroller23.phpt +++ b/ext/phar/tests/frontcontroller23.phpt @@ -2,6 +2,7 @@ Phar front controller with generic action router test --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -14,4 +15,4 @@ files/frontcontroller14.phar Content-type: text/html; charset=UTF-8 --EXPECTF-- string(9) "/hi/there" -string(%d) "phar://%sfrontcontroller23.php/html/index.php"
\ No newline at end of file +string(%d) "phar://%sfrontcontroller23.php/html/index.php" diff --git a/ext/phar/tests/frontcontroller24.phpt b/ext/phar/tests/frontcontroller24.phpt index 767971ee91..8d60ce2f7c 100644 --- a/ext/phar/tests/frontcontroller24.phpt +++ b/ext/phar/tests/frontcontroller24.phpt @@ -2,6 +2,7 @@ Phar front controller with custom 404 php script --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -13,4 +14,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -My 404 is rawesome
\ No newline at end of file +My 404 is rawesome diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt index 9b383de413..da4e58b49a 100644 --- a/ext/phar/tests/frontcontroller25.phpt +++ b/ext/phar/tests/frontcontroller25.phpt @@ -2,6 +2,7 @@ Phar front controller with extra path_info --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -14,4 +15,4 @@ files/frontcontroller8.phar Content-type: text/html; charset=UTF-8 --EXPECTF-- string(42) "/frontcontroller25.php/a1.phps/extra/stuff" -string(12) "/extra/stuff"
\ No newline at end of file +string(12) "/extra/stuff" diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt index a8097b0886..9c5a14d512 100644 --- a/ext/phar/tests/frontcontroller26.phpt +++ b/ext/phar/tests/frontcontroller26.phpt @@ -2,6 +2,8 @@ Phar front controller with unknown extension mime type --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller26.php REQUEST_URI=/frontcontroller26.php/unknown.ext @@ -11,4 +13,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: application/octet-stream --EXPECTF-- -<?php var_dump("hi");
\ No newline at end of file +<?php var_dump("hi"); diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt index 16203f6feb..f12d7f4538 100644 --- a/ext/phar/tests/frontcontroller27.phpt +++ b/ext/phar/tests/frontcontroller27.phpt @@ -2,6 +2,7 @@ Phar front controller with no extension --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -13,4 +14,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/plain;charset=UTF-8 --EXPECTF-- -hi
\ No newline at end of file +hi diff --git a/ext/phar/tests/frontcontroller28.phpt b/ext/phar/tests/frontcontroller28.phpt index 577800885b..5871f327a2 100644 --- a/ext/phar/tests/frontcontroller28.phpt +++ b/ext/phar/tests/frontcontroller28.phpt @@ -2,6 +2,7 @@ Phar front controller with huge file --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt index 0afc17929f..61f9b1bfc1 100644 --- a/ext/phar/tests/frontcontroller29.phpt +++ b/ext/phar/tests/frontcontroller29.phpt @@ -2,6 +2,7 @@ Phar front controller with fatal error in php file --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -13,4 +14,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1
\ No newline at end of file +Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1 diff --git a/ext/phar/tests/frontcontroller3.phpt b/ext/phar/tests/frontcontroller3.phpt index ac36485837..6d025aec29 100644 --- a/ext/phar/tests/frontcontroller3.phpt +++ b/ext/phar/tests/frontcontroller3.phpt @@ -2,6 +2,7 @@ Phar front controller phps --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller30.phpt b/ext/phar/tests/frontcontroller30.phpt index de6960c244..9b38bccd4f 100644 --- a/ext/phar/tests/frontcontroller30.phpt +++ b/ext/phar/tests/frontcontroller30.phpt @@ -2,6 +2,8 @@ Phar front controller with weird SCRIPT_NAME --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/huh? REQUEST_URI=/huh? @@ -9,4 +11,4 @@ REQUEST_URI=/huh? files/frontcontroller8.phar --EXPECTF-- oops did not run -%a
\ No newline at end of file +%a diff --git a/ext/phar/tests/frontcontroller31.phpt b/ext/phar/tests/frontcontroller31.phpt index 13c305d2f3..4995da74ef 100644 --- a/ext/phar/tests/frontcontroller31.phpt +++ b/ext/phar/tests/frontcontroller31.phpt @@ -2,6 +2,7 @@ Phar front controller with invalid callback for rewrites --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -12,4 +13,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller16.phar --EXPECT-- -phar error: invalid rewrite callback
\ No newline at end of file +phar error: invalid rewrite callback diff --git a/ext/phar/tests/frontcontroller32.phpt b/ext/phar/tests/frontcontroller32.phpt index 58f6fffa00..2459312dc5 100644 --- a/ext/phar/tests/frontcontroller32.phpt +++ b/ext/phar/tests/frontcontroller32.phpt @@ -2,6 +2,7 @@ Phar front controller with valid callback that is not good --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -12,4 +13,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller17.phar --EXPECTF-- -%ahar error: failed to call rewrite callback
\ No newline at end of file +%ahar error: failed to call rewrite callback diff --git a/ext/phar/tests/frontcontroller33.phpt b/ext/phar/tests/frontcontroller33.phpt index 8593e31766..58611080da 100644 --- a/ext/phar/tests/frontcontroller33.phpt +++ b/ext/phar/tests/frontcontroller33.phpt @@ -2,6 +2,7 @@ Phar front controller with valid callback that does not return any value --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -12,4 +13,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller18.phar --EXPECTF-- -phar error: rewrite callback must return a string or false
\ No newline at end of file +phar error: rewrite callback must return a string or false diff --git a/ext/phar/tests/frontcontroller34.phpt b/ext/phar/tests/frontcontroller34.phpt index 34a49ded4d..bf1cf7f244 100644 --- a/ext/phar/tests/frontcontroller34.phpt +++ b/ext/phar/tests/frontcontroller34.phpt @@ -2,6 +2,7 @@ Phar front controller with cwd --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- diff --git a/ext/phar/tests/frontcontroller4.phpt b/ext/phar/tests/frontcontroller4.phpt index f2482b9219..d1cb2a4c63 100644 --- a/ext/phar/tests/frontcontroller4.phpt +++ b/ext/phar/tests/frontcontroller4.phpt @@ -2,6 +2,8 @@ Phar front controller index.php relocate (no /) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller4.php REQUEST_URI=/frontcontroller4.php diff --git a/ext/phar/tests/frontcontroller5.phpt b/ext/phar/tests/frontcontroller5.phpt index 1990a2b008..48771efc8f 100644 --- a/ext/phar/tests/frontcontroller5.phpt +++ b/ext/phar/tests/frontcontroller5.phpt @@ -2,6 +2,8 @@ Phar front controller index.php relocate --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller5.php REQUEST_URI=/frontcontroller5.php/ diff --git a/ext/phar/tests/frontcontroller6.phpt b/ext/phar/tests/frontcontroller6.phpt index 1a2cc2cd23..1ab4e20032 100644 --- a/ext/phar/tests/frontcontroller6.phpt +++ b/ext/phar/tests/frontcontroller6.phpt @@ -2,6 +2,8 @@ Phar front controller 404 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller6.php REQUEST_URI=/frontcontroller6.php/notfound.php @@ -18,4 +20,4 @@ Status: 404 Not Found <body> <h1>404 - File /notfound.php Not Found</h1> </body> -</html>
\ No newline at end of file +</html> diff --git a/ext/phar/tests/frontcontroller7.phpt b/ext/phar/tests/frontcontroller7.phpt index aff2087522..c30a366e37 100644 --- a/ext/phar/tests/frontcontroller7.phpt +++ b/ext/phar/tests/frontcontroller7.phpt @@ -2,6 +2,8 @@ Phar front controller alternate index file --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller7.php REQUEST_URI=/frontcontroller7.php/ diff --git a/ext/phar/tests/frontcontroller8.phpt b/ext/phar/tests/frontcontroller8.phpt index 36e3206d66..88312c4061 100644 --- a/ext/phar/tests/frontcontroller8.phpt +++ b/ext/phar/tests/frontcontroller8.phpt @@ -2,6 +2,8 @@ Phar front controller no index file 404 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --ENV-- SCRIPT_NAME=/frontcontroller8.php REQUEST_URI=/frontcontroller8.php/ @@ -18,4 +20,4 @@ Status: 404 Not Found <body> <h1>404 - File /index.php Not Found</h1> </body> -</html>
\ No newline at end of file +</html> diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt index d47a2898e6..36cf2713cb 100644 --- a/ext/phar/tests/frontcontroller9.phpt +++ b/ext/phar/tests/frontcontroller9.phpt @@ -2,6 +2,7 @@ Phar front controller rewrite array --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -16,4 +17,4 @@ Content-type: text/html; charset=UTF-8 <code><span style="color: #000000"> <span style="color: #0000BB"><?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span> </span> -</code>
\ No newline at end of file +</code> diff --git a/ext/phar/tests/include_path_advanced.phpt b/ext/phar/tests/include_path_advanced.phpt index 6feee422b4..81e528130c 100644 --- a/ext/phar/tests/include_path_advanced.phpt +++ b/ext/phar/tests/include_path_advanced.phpt @@ -2,6 +2,7 @@ Phar: include_path advanced code coverage test --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- @@ -9,4 +10,4 @@ files/include_path.phar --EXPECT-- file1.php test/file1.php -ok
\ No newline at end of file +ok diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt index e1308956fe..b9bf58922f 100644 --- a/ext/phar/tests/mounteddir.phpt +++ b/ext/phar/tests/mounteddir.phpt @@ -7,6 +7,7 @@ if (version_compare(PHP_VERSION, "6.0", ">")) die("skip pre-unicode version of P ?> --INI-- phar.readonly=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/tempmanifest1.phar.php'; diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt index ca6e391b06..e8253bbc33 100644 --- a/ext/phar/tests/opendir.phpt +++ b/ext/phar/tests/opendir.phpt @@ -5,6 +5,7 @@ Phar: test opendir() interception --INI-- phar.require_hash=1 phar.readonly=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -41,4 +42,4 @@ phar url "phar://" is unknown in %sopendir.php on line %d Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar" phar url "phar://hi.phar" is unknown in %sopendir.php on line %d -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt index c722834ba6..472a9a2d24 100644 --- a/ext/phar/tests/phar_gzip.phpt +++ b/ext/phar/tests/phar_gzip.phpt @@ -11,6 +11,7 @@ if (version_compare(phpversion(), '5.2.6', '<')) die("skip zlib is buggy in PHP --INI-- phar.readonly=0 phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/phar_gzip.phar'; @@ -59,4 +60,4 @@ string(9) "it worked" string(%d) "phar://%sphar_gzip.phar/tar_004.php" bool(true) bool(true) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index 7c60589f9f..3663d6e635 100644 --- a/ext/phar/tests/phar_magic.phpt +++ b/ext/phar/tests/phar_magic.phpt @@ -5,6 +5,7 @@ Phar: include/fopen magic --INI-- phar.require_hash=0 phar.readonly=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/phar_mount.phpt b/ext/phar/tests/phar_mount.phpt index 80f8cda389..903e4a7bd6 100644 --- a/ext/phar/tests/phar_mount.phpt +++ b/ext/phar/tests/phar_mount.phpt @@ -4,6 +4,7 @@ Phar: Phar::mount <?php if (!extension_loaded("phar")) die("skip"); ?> --INI-- phar.readonly=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -60,4 +61,4 @@ Mounting of testit to %sphar_mount.php within phar %sphar_mount.phar.tar failed Mounting of /oops to /home/oops/../../etc/passwd: within phar %sphar_mount.phar.php failed <?php $fname = dirname(__FILE__) . '/' . basename( -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/readfile.phpt b/ext/phar/tests/readfile.phpt index 60fdad1792..ced02b1ae9 100644 --- a/ext/phar/tests/readfile.phpt +++ b/ext/phar/tests/readfile.phpt @@ -5,6 +5,7 @@ Phar: test readfile() interception --INI-- phar.require_hash=1 phar.readonly=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -27,4 +28,4 @@ include $fname; --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- -hihi===DONE===
\ No newline at end of file +hihi===DONE=== diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt index c73c98ec81..2f12540589 100644 --- a/ext/phar/tests/rename.phpt +++ b/ext/phar/tests/rename.phpt @@ -5,6 +5,7 @@ Phar: rename test --INI-- phar.readonly=0 phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -29,4 +30,4 @@ echo file_get_contents($pname . '/a') . "\n"; a a -Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d
\ No newline at end of file +Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d diff --git a/ext/phar/tests/rename_dir.phpt b/ext/phar/tests/rename_dir.phpt index d19a37f70f..f2d11dc947 100644 --- a/ext/phar/tests/rename_dir.phpt +++ b/ext/phar/tests/rename_dir.phpt @@ -5,6 +5,7 @@ Phar: rename_dir test --INI-- phar.readonly=0 phar.require_hash=0 +detect_unicode=0 --FILE-- <?php diff --git a/ext/phar/tests/rename_dir_and_mount.phpt b/ext/phar/tests/rename_dir_and_mount.phpt index b74f47b91d..3a4df6283b 100755 --- a/ext/phar/tests/rename_dir_and_mount.phpt +++ b/ext/phar/tests/rename_dir_and_mount.phpt @@ -5,6 +5,7 @@ Phar: rename_dir and mount test --INI-- phar.readonly=0 phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/rmdir.phpt b/ext/phar/tests/rmdir.phpt index 726e2cfbac..ffbe1563dc 100644 --- a/ext/phar/tests/rmdir.phpt +++ b/ext/phar/tests/rmdir.phpt @@ -5,6 +5,7 @@ Phar: rmdir test --INI-- phar.readonly=0 phar.require_hash=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt index f2944da413..0867cb42f7 100644 --- a/ext/phar/tests/security.phpt +++ b/ext/phar/tests/security.phpt @@ -4,6 +4,7 @@ Phar: test to ensure phar.readonly cannot be circumvented <?php if (!extension_loaded("phar")) die("skip");?> --INI-- phar.readonly=0 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; @@ -33,4 +34,4 @@ include $fname2; --EXPECT-- bool(false) Write operations disabled by the php.ini setting phar.readonly -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt index 184aa6d2ec..a3c8491aee 100644 --- a/ext/phar/tests/stat.phpt +++ b/ext/phar/tests/stat.phpt @@ -5,6 +5,7 @@ Phar: test stat function interceptions --INI-- phar.require_hash=1 phar.readonly=0 +detect_unicode=0 --FILE-- <?php Phar::interceptFileFuncs(); @@ -222,4 +223,4 @@ not found 2 Warning: fileperms(): stat failed for not/found in phar://%sstat.phar.php/my/index.php on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt index c422fa9843..b1af0eee51 100644 --- a/ext/phar/tests/withphar.phpt +++ b/ext/phar/tests/withphar.phpt @@ -2,6 +2,8 @@ Phar: phar run with pecl/phar with default stub --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +detect_unicode=0 --FILE-- <?php include dirname(__FILE__) . '/files/nophar.phar'; diff --git a/ext/phar/tests/withphar_web.phpt b/ext/phar/tests/withphar_web.phpt index 487873a134..a3dbfd92e3 100644 --- a/ext/phar/tests/withphar_web.phpt +++ b/ext/phar/tests/withphar_web.phpt @@ -2,8 +2,10 @@ Phar: default web stub, with phar extension --INI-- default_charset=UTF-8 +detect_unicode=0 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip");?> +detect_unicode=0 --ENV-- SCRIPT_NAME=/withphar_web.php REQUEST_URI=/withphar_web.php/web.php diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt index 3450c84bbd..c0648c4953 100644 --- a/ext/phar/tests/zip/notphar.phpt +++ b/ext/phar/tests/zip/notphar.phpt @@ -4,6 +4,7 @@ Phar: a non-executable zip with no stub named .phar.zip <?php if (!extension_loaded("phar")) die("skip"); ?> --INI-- phar.readonly=1 +detect_unicode=0 --FILE-- <?php $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip'; |