Fix 126 tests failed of phar when --enable-zend-multibyte

diff --git a/ext/phar/tests/008.phpt b/ext/phar/tests/008.phpt
index 664ffea5cb49b1365012b4da1ab72b4437331b4b..bede8ba1c1c6152ca47dcd859aafd4b1a03e8278 100644 (file)
--- 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 61933b3814cce3d2ab2e0834f00595974a1e1580..55d13b353cd3081694e7d5953028e2138424ec67 100644 (file)
--- 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 d1e2f40c9c9bff3dee856c281c155f469fe31c92..441f13dc64a4b88330759fcbafe94ed16ffd8aa9 100644 (file)
--- 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 4a1f0dd42cb47a2012fa3cf608fab1d1b2130703..9923f853e4b8317572c4299a03108d1a5a35b6f1 100644 (file)
--- 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 3246eff468ac36a0567a43e5ef3564b5df563395..37ff8bb19e820cb463abee42ae8271b3bd5442e9 100644 (file)
--- 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 2e2df470bfbc5858978c60804819a81eb06d0749..71fa622402cb2220c1fb4427b7f861015b7a643b 100644 (file)
--- 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 5a0ef713350d10f6fcc39a4958c7772f569c11da..22d193efd6b6d2334aabc256d60275e4f3185d18 100755 (executable)
--- 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 2cb508c46c3121fd7c1d356d2f2d77f0d5699f4d..23afa261905ee4dbbdd07f3c3198e495de67fb5f 100755 (executable)
--- 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 7d01681b6f1e4c95affc5320d25905d409db6117..334a16dbf1fe12956ecc5d2a6fb0b2dfa138a7ad 100644 (file)
--- 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 bfd65769521b41eb5f9e55ddf3b727cff00b9912..af062dbcf13cfd32ddb59590ac0cc587e5c580a1 100644 (file)
--- 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 20c24a021436f27be10584a98ea717ee47a7cebd..934add472169a8ff94cb32a55ce16f12ada15782 100644 (file)
--- 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 087f822777fd9d624658af37bd72d34a0251afa9..8cead29ff4cc587b9e34691b56eea0f5881f8895 100755 (executable)
--- 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 90b0a8fe464b517b4825956703b8f7d9e3d3bef9..f3105194ebc95002e391614dead8029a10098fb7 100644 (file)
--- 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 3d5b7fe78412d1e3955b15401b5b3ca8fd8c3528..959c6e0a9461f566d6834e06bd6b14dad9f5fff6 100644 (file)
--- 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 65388163dc54159d546386e1ba3b0ad4d02b032b..f48df3776d427dbcf1839d2664b6a3020e1bdfd2 100644 (file)
--- 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 40b544191d1a5f598e430944e53126bffe7a7009..ef5d02ccc8bfbb38a5eb700e37924f77375c2420 100644 (file)
--- 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 fc47174d2bdcf2f90e6eefcca1f20abd398349b3..bd49565c8364883b8aa828e9b6d82c3b3ee9dcae 100644 (file)
--- 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 11201ac989dac160157128bee22a1866ba426b8c..9b4a65c54c2ab94524c768816e0b845b4eef99f6 100644 (file)
--- 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 6e46289227dc51914926caaab2a86380ca239154..545201e3894a393d1575349e7aeef7bd5817acbc 100644 (file)
--- 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 f17784c355f2a32a70feed8e790606924632ac35..5cc9cb415a8ffb8e0ccc2d8ff33a1fe48b5fc50a 100644 (file)
--- 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 158c049b147b0929685fdab2c46681c998055dbe..74dc6619c160e9e9ef7ce0986a9279d79d2c78c2 100644 (file)
--- 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 3e65f5a124fcaf8e203c47fcd11b2a9baed519f6..03112c18bed376f931ced79dd33d5255055e1b30 100644 (file)
--- 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 6e03554d96cafc104c9afebdff19578052b443dd..23fe5879a920e370a7cbb365e70e652681b885c3 100644 (file)
--- 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 8d21c813a4ed85ea82f35d8893da902764cf9f7b..9246a630c69815118e160ff948302659b073b602 100644 (file)
--- 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 acce57415c6550caf2dc3f5c26b9d16df8e8dede..10c56342e95db49652dd3a8091350d61b3b3f4b1 100644 (file)
--- 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 8960ea7171f335e4edd34dc4e0891e464bbe67e7..409273db6c6185a2ae5ceeef1cf9cb7333fde2b6 100644 (file)
--- 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 7cba216395f22bcf298b0e334bf2ff091053f2aa..9e7ad6c741cb07c8a9b7306081cc726324939f8e 100644 (file)
--- 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 292e5af668f679ffb060e676375ab519668a2243..28412928b634508afc4619b123aabb17eb721091 100644 (file)
--- 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 69197f2b4b9751c6433b0d8dd57a1e898853c6c3..3aaba359f5f445501bb867d2514fd71d35ea87b2 100644 (file)
--- 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 b661cb61c1b6371ff5c30839c6234d7944110f73..73a1d7648a5f8345532a05127dd469c17ea59c4d 100644 (file)
--- 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 7e2c94c5b28491d2813af6f64dfe1a7f9b4441de..44815ef5228715c933ca294f4a1fab744833e8f6 100644 (file)
--- 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 20ff78e2824993441ba758386674a4bef5cfcf53..f29a8d6247f66c563d21972d4cce64783bfc37b1 100644 (file)
--- 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 1945e31f16a80655bf2a129a532207f5e3634f6f..1b50c4204a935828b24ce9f09b5116fb1df68e57 100644 (file)
--- 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 89990a7af1fb60f598fb72faa1907d74a9356381..6f48dfa63d9e3518d8fe79b4013f3638ca004369 100644 (file)
--- 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 661fef42c1d56c4163b060931bfed18fe3087b90..ceea8508bd04415a6d1f9d88912c67b930a2530d 100644 (file)
--- 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 d6faded9cc3bd38ba1ff55314e1a19f9837efdfc..57658dddd975e72a3005a5bf82526ebba5626840 100644 (file)
--- 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 7217d336e2d65168ee3cd7af48a7abfb0af49e1f..71aa0b01be2f3f618fadb2f086e185b7ff1c00e9 100644 (file)
--- 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 ffda9565bd08091799ae5ef5076dcadebcfee68a..b2437776a10638c19d75628a43ea6640ed7d3d6a 100644 (file)
--- 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 d0d5552f167d418cdd8e506b7bd1fd339353593a..91a5c9ea7d6801c79cac8f66b39e88094a42d640 100644 (file)
--- 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 00177d4ff55803a77a240b7d3fed79416054f48c..7c94da116cb436682ad35c5bee54ccf852ba060a 100644 (file)
--- 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 25b147e19402b577d5dd24a25310c426decb8e65..e4912844de6c7cd0f5c9dc79b40b2ea0932c1f41 100644 (file)
--- 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 cfc7d0e43a0dd90290537d045c824c1460d6263b..c98a84027a5c05ee695912fa70ba28e48a063c6c 100644 (file)
--- 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 e6c9dee4aec634198d5cef48532354eb39fc8a81..deb02c25db035ea90b4487c088a0a5b6c3ab0ce2 100644 (file)
--- 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 bbd9637d242f555f0508174161f575dd63e27567..bc214141f4c291ca20af44c6fb5c3efc7da4df31 100644 (file)
--- 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 d142a5d74286111580fe5cc0830f2a1d3b40a779..22fed0af57b72e6bc93cf7ae5060a831c0276e82 100644 (file)
--- 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 10bebdccef14f78759aa692fbb557a7c55f7a0f7..4294c3d32632ed4a56a132dea00dd80ffd5e3c69 100644 (file)
--- 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 35d3ae4e9cf2cbf58192cb4c839b698a46da9b67..47688e7b6a1d0c03a505762e3dea03f4ef447aa0 100644 (file)
--- 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 5e94bf6ff5ec027ceaad52347ff651cbbcbb844d..8982706e5fecd9220d6416af6d4c49880b8141e9 100644 (file)
--- 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 bed0b1df31ce5c6b828371f6978a9264a06123e0..0e5e8f1d075d7332b705153f260d4b3c97c549bb 100644 (file)
--- 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 67ccfc1e047a4f5b258bba19e4ddc5a2fc680edd..2cf18f823c084f812cf9cf75322190d5ae5eea3f 100644 (file)
--- 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 bf333c773cf85adee10f98b47d3fd6a1e4c4d1a4..b5499b1ef55d2a9abcdc5837e4367112ec697a23 100644 (file)
--- 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 829f2986e99e8f9a53c12bf6ca277328e03d0576..6d514891df3acb8e4488c6849140e4b90b9231fb 100644 (file)
--- 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 2769b01f2fb571fcba65d010adfdeaccbb8c5a36..3454e1623995426f8e5616738a5e73bf398dee92 100644 (file)
--- 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 3da9631dfb160e7686bb92557b94dd6e00798cb9..6a053e694cd734159a9ed6ef5d137e4dc828c22d 100644 (file)
--- 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 561826bd7845d976928ef39412c926de15335108..e8892a3dab6094fa8d6e66039ef4526ce141fe89 100644 (file)
--- 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 a8779392b6d84507e5590accafa601ee1e5f8f01..2fdc23daade000a95081b3b3a166c2b021f1f421 100644 (file)
--- 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 86a1c1444c1a5fe587f386fe538df57ca70fa3b3..dc3bdf8bc309b4e466f551c1705f59ade3afa0af 100644 (file)
--- 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 4a76e02eae93a05be82b82c2b52b8128f7ca8850..87e8050e2f7f069e779d2e5a44856b9cc8912f90 100644 (file)
--- 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 80059a9da268884979fa8f8a2b572c035d5942a9..ea76bb21f6ce8a37ef560d7698399ddcc9990ffe 100644 (file)
--- 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 1cd8f96f2d31bb4fe5216c71ff76c9be7a356826..5a5dacff52bf13d188573731b3677f7acffca58d 100644 (file)
--- 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 1c1b47988133acb4443131def178581bfaeed74f..f5651e2d783fccd2c6d65b0ee5374160dcef39e3 100644 (file)
--- 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 5a63da874c24002d122726ab473518f4a37f971f..ca92c7288043a06f01c07775c5f6226bb56d8b6d 100644 (file)
--- 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 9ef1221a289f9cf8ad518768476d4e268b875978..966ca1a40c0d9aea346fba6c2b66643bc5bd5370 100644 (file)
--- 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 59116907a5931709d98be57ce96e12280e2358b9..49cb062e54093eef91a7de429391aec09882906e 100644 (file)
--- 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 95738548231a513c462b19401aee96d069f48ae4..34244d844e1b93bb2fa3bbeeeeb4093277936091 100644 (file)
--- 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 83c22f58f8f2be1688a821bd61aedeaa972f2384..f6677cc04b9d1ce6d98d9f826d913e540bee0c98 100644 (file)
--- 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 5cf36822770201894ba300961b25812d8e1b0015..16961a1e46ec492284a310c0ef5c34cdf2e4c37b 100644 (file)
--- 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 2c738d7bfb383565a7ea8db7a7b8a9b855a0c94e..93ea37a9afa6d78f5c8f7f1f462c54098eff750f 100644 (file)
--- 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 2480be41293a63d21a71d398e5b0a82cc39406c8..d498072fa291471649698399fa83ec2b164a7280 100644 (file)
--- 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 a8a88a95fe4b3554eb311e17e1f16ec00ab084c0..c4d5514ade0e27d1ecf99433a2633a7413ec5110 100644 (file)
--- 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 bf9b390defc43d8bdc8b32e90e714809b64af29d..bc6829cba58a81aed81fb75ecda26f1295a65857 100644 (file)
--- 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 1a8b9168ccf2b821a8e57feb786bb4df38627411..fb6f72ac221fb2e470a14b81ac1bd730fd26f431 100644 (file)
--- 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">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</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 1d985090645f042e6ad722e8cc6f8076210b14e4..f91b11b3d5ecd2a44ae793a8c6f3cff8c2954cfc 100644 (file)
--- 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 80efaa9ed1d0f805e9403be1d4e6c1bf39daf2e7..36b3fba122a6e9951c995b04dc6ed45e96a57c45 100644 (file)
--- 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 fcc9d646559701b04f4637b3edcc7424962fd49a..b931176e500ca4928e83921724315e30e7cc2e91 100644 (file)
--- 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 5b694d6e2de4cb9a656fb8e5ffab4af02add6c57..b10bcb3a535bb7c5079188e2b27ff2d1b1b9b92a 100644 (file)
--- 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 bab8ada0fdd357b9e18361a291ce2c2eabf3b269..4009b491f5d1b78068533724aba48e762ff34475 100644 (file)
--- 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 709332361719766b916873383e5988b14b183bdb..0186b12529910b3b2809b310ccf5c3a02829a0f4 100644 (file)
--- 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 667d5c243cd4eab3f8f10da63da62b4c47d49808..b6a0b488f6633c1fe7bdfb3bdfa2373dc4b4062d 100644 (file)
--- 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 956ea1c050be0d55424b14a7dcddfbb8d4da456f..b85b2f716bda215f9f25cef0be3771898267fc54 100644 (file)
--- 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 717e56996fa84d1b3b76f520c5e2b318b26d40c8..cde41f7cddb41f9a75c1e39273bfd9d6d3455af2 100644 (file)
--- 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 2bdb145c6e365850f24998ded85b76e53e2e54fc..13de43f426bad93c5cb9babb5354fc7b374c5175 100644 (file)
--- 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 370098014d156ce0782ce2aa840d9b5fb2290992..8dbf144618b903df59386166ab473457ef36a28a 100644 (file)
--- 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 712af40bf3e8753f7a5e91519296f66e2a865dd7..8b0499b4b4d52d32d23cd52914dd992ce3e8042c 100644 (file)
--- 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 233e2e2a49078cafbc39a3525a83ccc2af24cf50..ce8cda4642392a2047e1026fc2aa45678bf87ef1 100644 (file)
--- 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 19aea455639c3e51a289d66ebc7915c01ebb4368..3d867070ab56338e157d5e6c4f4428d23f6e6490 100644 (file)
--- 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 9adafa2b30df82f421e8fe99ee948f287f114fc5..8c72e47056487ec6f9918be41c1a758d5ca3c704 100644 (file)
--- 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 d0744dea1dcde3bdc2005426fd26adca1d24a8e4..987a04ea991dc1e6efe8192e83a92b6bcf838680 100644 (file)
--- 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 45e2bfc25eeb3c9bb9ff895a523094b619da7bef..bf87cd9688651ba7559a4f15ba5072fc6c3bda01 100644 (file)
--- 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 bf50c6e80165dc3db93784831dd0897cbd0aa814..1c61ceb60228c62837ee5c3ad7de25c6c7c120fe 100644 (file)
--- 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 b85c1eb497f812c3d2d5ef053a3b4e266b401c6b..f19c88b595012466010bac0e1db7a3aa85d9302a 100644 (file)
--- 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 24464c9beb4b1f291d4fe7cb79c019913fd9701c..4a676028b24ce2deb622733da7122e607b8b589a 100644 (file)
--- 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 767971ee91e7c850d3a22619073db1153ec54ea9..8d60ce2f7c0ad78e7d7d30d5e60da323c51659d9 100644 (file)
--- 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 9b383de413146477f2958f42003cd9cf4890e700..da4e58b49a47a613d4868a92ac51dcbb1c5af378 100644 (file)
--- 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 a8097b0886c96bb3cd0a0aeb96dad9912c571371..9c5a14d51267b7fd87a3048ed88b7d869e43ccb0 100644 (file)
--- 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 16203f6feb1f64b9093536f9800778e832e474f2..f12d7f453819f1ba8b2ed9d5bd95d9ee60c45b7a 100644 (file)
--- 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 577800885b1f20621d53dd94d0e149cfab52b645..5871f327a2dc7cdc0987f10a27f574e172273a1e 100644 (file)
--- 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 0afc17929f37fba45447f8bb9bbc3d5acd1f1cf4..61f9b1bfc181fe23e55593d826d3ea9aa53cdc70 100644 (file)
--- 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 ac36485837bd32cc0eb6276bb3304b992b9a7014..6d025aec2982af0d95f88b1cfb482e7ad4c34858 100644 (file)
--- 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 de6960c244482fc9933e864a13d18d5f450107c9..9b38bccd4feb6068c88fe9cbb23ebbc9037d82ed 100644 (file)
--- 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 13c305d2f3e11549aeff1748e57f7caffc4595cd..4995da74ef2d80a3d7e2b21f3cfbede9772e5a4c 100644 (file)
--- 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 58f6fffa00ad8764790384e8b21971de7d66a3af..2459312dc5e63cf16bb079ca654ab696fc7e9fa5 100644 (file)
--- 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 8593e317664f7d8ef5b1baf24b28d6589ce32e6b..58611080daee8a18be80bbd160a9a6511cf9d0ba 100644 (file)
--- 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 34a49ded4dfad3ced7326d5d805c9c968e0243b0..bf1cf7f244737c10d4f09b5c47a8cd242c136c20 100644 (file)
--- 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 f2482b921979115838b12ac70798879d9bcb46ce..d1cb2a4c63e090644b731c81a56b59961d0f1ef8 100644 (file)
--- 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 1990a2b008322c4da70e0bea024cafe96fa2b36d..48771efc8f79da22f3be843c63909a57f93970bf 100644 (file)
--- 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 1a2cc2cd23d12324cdfeb332d93adfb60cedc3da..1ab4e200326a14e2d6d2979dd1a5946ec13afa03 100644 (file)
--- 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 aff2087522c3aa3e398842f21a61dfea6c7afef7..c30a366e378774d4372e3f2747ee54599fb6cd5b 100644 (file)
--- 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 36e3206d66879080bcaf3a097b5111aefae22733..88312c4061bdb60da86e788f97092a6638dfe669 100644 (file)
--- 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 d47a2898e6030e8ae34f6cbe0e9d01f4ac145654..36cf2713cb4cf21266886c451e403865463c2e2e 100644 (file)
--- 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">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</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 6feee422b4ca2702bdd0816053c33b9f4f04ce03..81e528130c1f75fbeb01af1f703239f33b697c30 100644 (file)
--- 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 e1308956fef4c1c725b1bd9074085692f1cc109b..b9bf58922fe5560f64933ae1f948b48491fd8727 100644 (file)
--- 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 ca6e391b06fbf749aa26e16a8458c0fa975e08b0..e8253bbc33f2b13bb3e3f779c09c0c32768762ec 100644 (file)
--- 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 c722834ba6c0a025cf7af703a842b9b6fb96f868..472a9a2d24c5afe02a1c7fe61f0cdfdcee4d57b3 100644 (file)
--- 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 7c60589f9f64e02464bb7872fcd8b424ea66c7f8..3663d6e635a74942058fa6daece86b3143f229ad 100644 (file)
--- 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 80f8cda38943ef9e934379f2aa2a79577037239b..903e4a7bd6ef47b7ed68124afaf71da6cdfd1da7 100644 (file)
--- 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 60fdad1792cea14f7e7e8832d77323f75ce3fc06..ced02b1ae9ef5db6e726023b2daaea457498d670 100644 (file)
--- 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 c73c98ec816f4e6fbc0cff8541fd969a6ca6a3da..2f12540589686d8df773f008606533b58476f193 100644 (file)
--- 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 d19a37f70fc0908e5e4d44cff0c864693ae533dc..f2d11dc9475fa9b6323634263727e421d311b60c 100644 (file)
--- 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 b74f47b91d4f7207da6ae88cb7e996deda8785d7..3a4df6283b5698538180b590b3f609ebbbf4776f 100755 (executable)
--- 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 726e2cfbac9721166011d4d7adbf0c7843fd34ba..ffbe1563dc6b04e6be79354731407f1cfb015024 100644 (file)
--- 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 f2944da413a80b2397b1369ac68aaaecd7d93f59..0867cb42f71e0725bc5af95d4769b1669d00b166 100644 (file)
--- 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 184aa6d2ecb12f3b9b903c77406db01681b28777..a3c8491aeea7b6f30a0ff2d5bd2ab0498df58860 100644 (file)
--- 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 c422fa9843a651be0d128f0237eb2f2cb74fc750..b1af0eee51147d7ca5a2b89e3a3b8339b11255db 100644 (file)
--- 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 487873a1344e044ec50b61c82ff60b09035082a1..a3dbfd92e3142e6d26a0818b8796ab3f0c66a536 100644 (file)
--- 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 3450c84bbd1c21874843021347178632679b5807..c0648c4953410318032ae2c22dcbc87de03fee84 100644 (file)
--- 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';