make cache_list tests pass in php 6

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 96376a3f4acc3bb8b4bc0b6c2814f0716a095fd6..b4c6e9f0458e6193cc5cd012732b4c90a49fdf2d 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -941,19 +941,7 @@ PHP_METHOD(Phar, webPhar)
                        ++ext;
 
 #if PHP_MAJOR_VERSION >= 6
-                       if (FAILURE == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) {
-                               /* try unicode extension */
-                               zstr zext;
-                               zspprintf(IS_UNICODE, &zext, 0, "%s", ext);
-                               if (SUCCESS == zend_u_hash_find(Z_ARRVAL_P(mimeoverride), IS_UNICODE, zext, strlen(ext)+1, (void **) &val)) {
-                                       ezfree(zext);
-                                       goto unicode_found;
-                               }
-                               ezfree(zext);
-                               goto notfound;
-                       }
-unicode_found:
-                       { /* this prevents parse error */
+                       if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) {
 #else
                        if (SUCCESS == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) {
 #endif
@@ -990,9 +978,6 @@ unicode_found:
                }
        }
 
-#if PHP_MAJOR_VERSION >= 6
-notfound:
-#endif
        if (!mime_type) {
                code = phar_file_type(&PHAR_G(mime_types), entry, &mime_type TSRMLS_CC);
        }

diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
index 6e13088512e242b0e0fce7be0c14b2aa36ece432..158c049b147b0929685fdab2c46681c998055dbe 100644 (file)
--- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
@@ -10,5 +10,5 @@ phar.readonly=0
 files/write17.phar
 --EXPECTF--
 NULL
-string(2) "hi"
+%string|unicode%(2) "hi"
 ok
\ No newline at end of file

diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
index 4870550c4d096ba02d2528523a31e17a562c89c6..6e03554d96cafc104c9afebdff19578052b443dd 100644 (file)
--- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
@@ -10,5 +10,5 @@ phar.readonly=0
 files/write19.phar
 --EXPECTF--
 string(2) "hi"
-string(3) "hi2"
+%string|unicode%(3) "hi2"
 ok
\ No newline at end of file

diff --git a/ext/phar/tests/cache_list/files/frontcontroller12.phar b/ext/phar/tests/cache_list/files/frontcontroller12.phar
index 9e455876101ba0d48dc523b1ff74e5577503b2ad..1cf362928208fa6660410ad0cf31e4481470bcc3 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/frontcontroller12.phar and b/ext/phar/tests/cache_list/files/frontcontroller12.phar differ

diff --git a/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc
index ba17df37e17f2028c74a08a4856c5b16426a1e25..f1e4645e2f09a6a53c1f20915ae70813306ada17 100644 (file)
--- a/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc
+++ b/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc
@@ -3,13 +3,13 @@
 $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar');
 $a['index.php'] = '<?php
 var_dump($_SERVER["PHP_SELF"]);
-var_dump($_SERVER["SCRIPT_NAME"]);
-var_dump($_SERVER["SCRIPT_FILENAME"]);
-var_dump($_SERVER["REQUEST_URI"]);
-var_dump($_SERVER["PHAR_PHP_SELF"]);
-var_dump($_SERVER["PHAR_SCRIPT_NAME"]);
-var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]);
-var_dump($_SERVER["PHAR_REQUEST_URI"]);
+var_dump($_SERVER[b"SCRIPT_NAME"]);
+var_dump($_SERVER[b"SCRIPT_FILENAME"]);
+var_dump($_SERVER[b"REQUEST_URI"]);
+var_dump($_SERVER[b"PHAR_PHP_SELF"]);
+var_dump($_SERVER[b"PHAR_SCRIPT_NAME"]);
+var_dump($_SERVER[b"PHAR_SCRIPT_FILENAME"]);
+var_dump($_SERVER[b"PHAR_REQUEST_URI"]);
 ';
 $a->setStub('<?php
 Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));

diff --git a/ext/phar/tests/cache_list/files/frontcontroller14.phar b/ext/phar/tests/cache_list/files/frontcontroller14.phar
index 78a42a999f0754ed4d008f3da32c16eb4f280d22..ebc3e9b408b9f10efe1b4a07cbf9fbf6cc19a56c 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/frontcontroller14.phar and b/ext/phar/tests/cache_list/files/frontcontroller14.phar differ

diff --git a/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc
index d0ebd9a45a7697118897df3775cd9cbe2fb1ee47..23104a642fb74b7d11795c94e2afc1ab437a9e0f 100644 (file)
--- a/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc
+++ b/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc
@@ -2,8 +2,8 @@
 @unlink(dirname(__FILE__) . '/frontcontroller14.phar');
 $a = new Phar(dirname(__FILE__) . '/frontcontroller14.phar');
 $a['html/index.php'] = '<?php
-var_dump($_SERVER["PATH_INFO"]);
-var_dump($_SERVER["PATH_TRANSLATED"]);
+var_dump($_SERVER[b"PATH_INFO"]);
+var_dump($_SERVER[b"PATH_TRANSLATED"]);
 ';
 $a->setStub('<?php
 function s($a)

diff --git a/ext/phar/tests/cache_list/files/frontcontroller3.phar b/ext/phar/tests/cache_list/files/frontcontroller3.phar
index afcf03af35117e22eda4011a818af5a205a5dbd7..35a23eadff89915292be37c3e30c5f6ecc1ed821 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/frontcontroller3.phar and b/ext/phar/tests/cache_list/files/frontcontroller3.phar differ

diff --git a/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc
index 2759d9ee45a7ea4752dbb8ad8a488db238f3f8ee..6f9126ff445ec597481d8829cbf4f7051e23a98a 100644 (file)
--- a/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc
+++ b/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc
@@ -7,7 +7,7 @@ $a['a.phps'] = '<?php function hio(){}';
 $a->setStub('<?php
 function s($a)
 {
-    static $b = array("/hi" => "a.phps");
+    static $b = array(b"/hi" => "a.phps");
     if (isset($b[$a])) return $b[$a];
     return $a;
 }

diff --git a/ext/phar/tests/cache_list/files/frontcontroller4.phar b/ext/phar/tests/cache_list/files/frontcontroller4.phar
index 4c9a92a197b8b47a026701005b94625185ea6958..83594618104f93833aba1a8b029afd040ed6bb84 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/frontcontroller4.phar and b/ext/phar/tests/cache_list/files/frontcontroller4.phar differ

diff --git a/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc
index 5c6a43f9546ce6bbe2fc3ff22d991a51f2322339..daf807e419c68083457dc70cd628718bc50d5766 100644 (file)
--- a/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc
+++ b/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc
@@ -7,7 +7,7 @@ $a['a.phps'] = '<?php function hio(){}';
 $a->setStub('<?php
 function s($a)
 {
-    static $b = array("/hi" => false);
+    static $b = array(b"/hi" => false);
     if (isset($b[$a])) return $b[$a];
     return $a;
 }

diff --git a/ext/phar/tests/cache_list/files/frontcontroller8.phar b/ext/phar/tests/cache_list/files/frontcontroller8.phar
index ec05ceafb0cd228716b92068a5318d654e77f7b3..c9c0e409ec4b9b8ca6dfd07edd777df9bf3a5d04 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/frontcontroller8.phar and b/ext/phar/tests/cache_list/files/frontcontroller8.phar differ

diff --git a/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc
index 1dfb654a031ed5203b39254c29ef0127e17bee03..8629f0890d20a994cb327cefd875fd21fffc50bd 100644 (file)
--- a/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc
+++ b/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc
@@ -2,7 +2,7 @@
 @unlink(dirname(__FILE__) . '/frontcontroller8.phar');
 $a = new Phar(dirname(__FILE__) . '/frontcontroller8.phar');
 $a['a.phps'] = 'hio1';
-$a['a1.phps'] = '<?php var_dump($_SERVER["REQUEST_URI"], $_SERVER["PATH_INFO"]);';
+$a['a1.phps'] = '<?php var_dump($_SERVER[b"REQUEST_URI"], $_SERVER[b"PATH_INFO"]);';
 $a['a.jpg'] = 'hio2';
 $a['a.php'] = '<?php function hio(){}';
 $a['fronk.gronk'] = 'hio3';

diff --git a/ext/phar/tests/cache_list/files/write24.phar b/ext/phar/tests/cache_list/files/write24.phar
index d726ceef76978279915bc8a8a8d95be0dc885c3a..36972f3663eb70f09b981f23a18fa2c7b3484a22 100644 (file)
Binary files a/ext/phar/tests/cache_list/files/write24.phar and b/ext/phar/tests/cache_list/files/write24.phar differ

diff --git a/ext/phar/tests/cache_list/files/write24.phar.inc b/ext/phar/tests/cache_list/files/write24.phar.inc
index ac9673196080850f1ca72cd175ede544661f8bd4..216f7c46d0eac27eb8ffcb7c105191b2bbfa4eba 100644 (file)
--- a/ext/phar/tests/cache_list/files/write24.phar.inc
+++ b/ext/phar/tests/cache_list/files/write24.phar.inc
@@ -8,7 +8,7 @@ $phar->setStub('<?php
 $p = new Phar(__FILE__);
 var_dump(isset($p["newname"]));
 $fp = fopen("phar://" . __FILE__ . "/newname", "w");
-fwrite($fp, "hi");
+fwrite($fp, b"hi");
 fclose($fp);
 var_dump(isset($p["newname"]));
 echo "ok\n";

diff --git a/ext/phar/tests/cache_list/frontcontroller21.phpt b/ext/phar/tests/cache_list/frontcontroller21.phpt
index 9ed315d19eb170bb3e1ee087eff20c103e1a3d59..829f2986e99e8f9a53c12bf6ca277328e03d0576 100644 (file)
--- a/ext/phar/tests/cache_list/frontcontroller21.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller21.phpt
@@ -15,7 +15,7 @@ files/frontcontroller12.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-string(10) "/index.php"
+%unicode|string%(10) "/index.php"
 string(10) "/index.php"
 string(%d) "phar://%sfrontcontroller21.php/index.php"
 string(18) "/index.php?test=hi"

diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt
index 82a8389ad5fe2ab1fb7ee1df0d7bed7bfe86f41b..2769b01f2fb571fcba65d010adfdeaccbb8c5a36 100644 (file)
--- a/ext/phar/tests/cache_list/frontcontroller22.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller22.phpt
@@ -14,8 +14,8 @@ files/frontcontroller13.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-string(4) "test"
-string(12) "oof/test.php"
+%string|unicode%(4) "test"
+%string|unicode%(12) "oof/test.php"
 
 Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d