From 0984d25723e46235c7050258682f75a2cf89b446 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Sun, 26 Jul 2009 00:39:40 +0000
Subject: [PATCH] fix zip front controller tests for php6

---
 .../tests/zip/files/frontcontroller12.phar.inc  |  14 +++++++-------
 .../tests/zip/files/frontcontroller12.phar.zip  | Bin 786 -> 793 bytes
 .../tests/zip/files/frontcontroller3.phar.inc   |   2 +-
 .../tests/zip/files/frontcontroller3.phar.zip   | Bin 816 -> 818 bytes
 .../tests/zip/files/frontcontroller4.phar.inc   |   2 +-
 .../tests/zip/files/frontcontroller4.phar.zip   | Bin 812 -> 813 bytes
 ext/phar/tests/zip/frontcontroller21.phar.phpt  |   2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/phar/tests/zip/files/frontcontroller12.phar.inc b/ext/phar/tests/zip/files/frontcontroller12.phar.inc
index 77c4a1dd0e..c5f38ffd19 100644
--- a/ext/phar/tests/zip/files/frontcontroller12.phar.inc
+++ b/ext/phar/tests/zip/files/frontcontroller12.phar.inc
@@ -3,13 +3,13 @@
 $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.zip');
 $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/zip/files/frontcontroller12.phar.zip b/ext/phar/tests/zip/files/frontcontroller12.phar.zip
index e831e44302e762883b2f82b9cac9b28abb87eb1f..ed9be3d00b9aea81d32d807905bdb8cecc8740e9 100644
GIT binary patch
delta 237
zcmbQlHj_<1z?+$c0SxBM`Dqm{emcmSk%0k(IT?f)GV@YWEA$F73i3+%7{aw3TPEr|
zF(yqcRAx$2nrz6Z24wG61`_vF`I3|ZJRF1KgPnss147~_E|6wSnyk&J10=&46<9!q
zPp)QEVgVU4c_HHkUKHyl*D)!{fuyzpErx&qZ$>5<8?1XDlay5nP#Wl*#3KFTlF}q(
UhaqcZWdmts0>bG)ItOeF06yG0E&u=k

delta 217
zcmbQqHi=C?z?+$c0SuIT_gUEYpZ;RP$iM)?oD4z?nRzLx6?z331$m`>3>CaC7bogF
zF)B^wV^o?rO?~1%<%y3}Cvz}rOg3cHnH<NczydO3aucHx3rOwc6^s{nQB0lO%A{lo
zlG+9|9|8ir8JS>gklIh%pC<1D3V<*l&;<yPJNW^Vs0zAnRyL3dCLo*+q*K9W0RROd
BF}eT%

diff --git a/ext/phar/tests/zip/files/frontcontroller3.phar.inc b/ext/phar/tests/zip/files/frontcontroller3.phar.inc
index ab28f7b3d0..ccd55b73f9 100644
--- a/ext/phar/tests/zip/files/frontcontroller3.phar.inc
+++ b/ext/phar/tests/zip/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" => b"a.phps");
     if (isset($b[$a])) return $b[$a];
     return $a;
 }
diff --git a/ext/phar/tests/zip/files/frontcontroller3.phar.zip b/ext/phar/tests/zip/files/frontcontroller3.phar.zip
index f167f2f6efbaa5312231c70e0939444869ccd20d..6f35a8042c2866d457e28e6a2cda6589bda3d06d 100644
GIT binary patch
delta 363
zcmdnMwuy}|z?+$c0Sso&`DrzgPf{aX+p%REBSegWAtN&%Rf*-3w^vwz(kv7GC0Rgf
zC+3)QCn@P?WGX4x+9@PWTyxC^WYpUC+b=K!O#xw61|fz-y{v-tyiz^}0_IQN$0!9h
zck&%Z9Tt#Dljk!@nSk7rs8^6tfN4a4HzN~B8U#S<;VzsU#iTBWY8|>-klEo?K=0si
m9=dwroW=w(pgkbW2J{sIYyuksbYL;eg_8xCrP%&~LlOYlL{W<X

delta 373
zcmdnQwt<Z=z?+$c0Swf7_gPHjlhml-b-B2W5hBLGkdc{>s^rvb<pw68G}A<XNfwaW
zi8<z+O8Oa@N(#1i3KQ2|vjG{j_Wkw?%s?|hn3X|@AyF@@AU&^?kAZ;clMgUTflZx!
zk5PvOWYXk?Oj46In0VDubq07dGQr#kQU-U{<QOJ(Is9rtMwV9q{eZ(&=w=J&G$x1v
mEdyaTpl1+Z1K5y)jDliJzXf=+vVl~x0HGXE-5(%kU;qFnNJ}aJ

diff --git a/ext/phar/tests/zip/files/frontcontroller4.phar.inc b/ext/phar/tests/zip/files/frontcontroller4.phar.inc
index d78399142e..9f664cf2c6 100644
--- a/ext/phar/tests/zip/files/frontcontroller4.phar.inc
+++ b/ext/phar/tests/zip/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/zip/files/frontcontroller4.phar.zip b/ext/phar/tests/zip/files/frontcontroller4.phar.zip
index 1ad83f8a65201f127bfc83ede1f4a3f34f43240c..fb27ccb0b1a92b6552710c2134953bdc4c7e345f 100644
GIT binary patch
delta 245
zcmZ3(ww8@Az?+$c0Sp$+`DrzgPm(2E+p%Txd`59zkU-SMv)2EC(*Gy=Lu4lAm@_6#
zTzp#*B)j(g_6y8FSrBGr5MoHw%PL6EE9GN=nZW{5HF+1K6vWgUj5-jJ*-TP`AWIYV
z3Ni}d8XB3zP%WJt#-t9>36w(UEM)}gM79bp{eVeIXf0S8XmByyWFBTIwx2*@1_l6L
C7fuiW

delta 294
zcmZ3>wuX%_z?+$c0Swf8_gPHjlVqvjb-6fs0i!rCNZ_+{!sUNJ>3<XbAu<zl%qK3n
ztq77^`+oZcW}qAhvoZ)VB<f`qr013LF~Ce<0jZk2n^6j4=1oQ&h{zl!DHD*DiFySY
z1uzZU7(qfH5a7+o1Yt2SptxajIFq^@$Z*_hCj-saE&&>a;ut*YA2LY^tpTeCx}_NA
On901%QfxoKE&>4eR!Zpr

diff --git a/ext/phar/tests/zip/frontcontroller21.phar.phpt b/ext/phar/tests/zip/frontcontroller21.phar.phpt
index d0a16c5d99..74caa2c814 100644
--- a/ext/phar/tests/zip/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt
@@ -15,7 +15,7 @@ files/frontcontroller12.phar.zip
 --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.phar.php/index.php"
 string(18) "/index.php?test=hi"
-- 
2.50.1