From 39125fdd47621a254369e47ee09a8d5a9aa3e9d0 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Sun, 26 Jul 2009 00:35:17 +0000
Subject: [PATCH] fix tar front controller tests for php6

---
 .../tar/files/frontcontroller12.phar.inc      |  14 +++++++-------
 .../tar/files/frontcontroller12.phar.tar      | Bin 4096 -> 4096 bytes
 .../tests/tar/files/frontcontroller3.phar.inc |   2 +-
 .../tests/tar/files/frontcontroller3.phar.tar | Bin 6144 -> 6144 bytes
 .../tests/tar/files/frontcontroller4.phar.inc |   2 +-
 .../tests/tar/files/frontcontroller4.phar.tar | Bin 6144 -> 6144 bytes
 .../tests/tar/frontcontroller21.phar.phpt     |   2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/phar/tests/tar/files/frontcontroller12.phar.inc b/ext/phar/tests/tar/files/frontcontroller12.phar.inc
index 693ef0aa01f..0a9422a2990 100644
--- a/ext/phar/tests/tar/files/frontcontroller12.phar.inc
+++ b/ext/phar/tests/tar/files/frontcontroller12.phar.inc
@@ -3,13 +3,13 @@
 $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.tar');
 $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/tar/files/frontcontroller12.phar.tar b/ext/phar/tests/tar/files/frontcontroller12.phar.tar
index e0f22f5f459c22e91265539c973b8c84b131e4b2..e945e49bd476114de8336461dca165987a5ebb08 100644
GIT binary patch
delta 191
zcmZorXi%8YDq(KSU}$J$Y-Da^Xl`i6U|?WiW^8VzU@%#bF=aC&qd6l}lG5Z0OiGMN
zlcSl`d6SfaTmwU0gG1s&gFGiIGKmAlmoljW$x}=k>`6)i9*#lrlVh0FfFg3tw<oc5
z38NTpZe(f*Gn}=P8Aa02z{u1HCdtXpC~~)7dt&QMbJxZdqTL^au2{~WCI4izBG-M^
Hi3+R$vW+sA

delta 181
zcmZorXi%8YDq&{AU}$JyWMXP&Y-DW4U|?WiW^8VzU@%#bF=aC&qdDVbOD5&Xu}tbb
zN<prHp{~Ip@u5MUlNFi7C$D5uoqV22gH0*G!!am+avYP|WL4(d6BXDev2+Qe7-?=~
zY6vruwUZe|5@@-p5loVkol#^;{=w_(cI@BzjAN#3lJ?8zAxHk1ZdT;F&pJ_o6#)Es
BG2{RM

diff --git a/ext/phar/tests/tar/files/frontcontroller3.phar.inc b/ext/phar/tests/tar/files/frontcontroller3.phar.inc
index 9729d0065b7..800f65e819b 100644
--- a/ext/phar/tests/tar/files/frontcontroller3.phar.inc
+++ b/ext/phar/tests/tar/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/tar/files/frontcontroller3.phar.tar b/ext/phar/tests/tar/files/frontcontroller3.phar.tar
index 2df61c95ac0ced1c9f160b6fbfedc1bbb4a02e3d..16853bd10f1f4f3978651add6d8ec33d992e279e 100644
GIT binary patch
delta 204
zcmZoLXfT-2C2VADWNu_+Xk^M@U|?WsVrH&jFj<f>WiumVE3>!>gP|dc0&^o1Lzn_q
z9Y*dXCH;&{B?VhMg`~}9Y$q5eabTKg0Mo$P$&6;5nJL^lUNlKV10xetm`*`<Mv;#5
g6Y`V}9#dY`*I#J!^@CiU^XIzFibD5UCn~T407EP?mjD0&

delta 203
zcmZoLXfT-2C2U}1Vrph=WN5}<U|?WsVs4~hFj<f>WiumVE3>!}gP|dc0&^o1xB^xk
zMouODj7%j3TRVl#7HlUNC;wybK{wFM7-k@6Co`I)nHk(LUNlLdwWbCzor3I)B4wY>
fcfYdz`Tv7qb(WFIdFSgh^~yIZ3f*U&sK5#UW)Cxh

diff --git a/ext/phar/tests/tar/files/frontcontroller4.phar.inc b/ext/phar/tests/tar/files/frontcontroller4.phar.inc
index eb1d56f0d4e..bfb9b4104cf 100644
--- a/ext/phar/tests/tar/files/frontcontroller4.phar.inc
+++ b/ext/phar/tests/tar/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/tar/files/frontcontroller4.phar.tar b/ext/phar/tests/tar/files/frontcontroller4.phar.tar
index 4cd684d25cc0346fafcd7a7e4bb5e107c16494e4..5a1d4ee10c8282f304166c017fbb1e7abdd3e561 100644
GIT binary patch
delta 194
zcmZoLXfT-2C2VADWNu_=W?;@>U|?WsVs5NpFj<f>WiumVE3>#cgP|dc0&^o%GnfKa
z9Y)5a&AM!t7$<RHm}6!FQ^wiJjAn_M8Qc<HG)Y4PBU3||PC<4?k+=t`Nov*?_ATDq
X@H~CanXP9gF*R*g6uQqkQGpczhR`sa

delta 193
zcmZoLXfT-2C2U}1Vrph=WMsf#U|?WsVrHsfFj<f>WiumVE3>#6gP|dc0&^o1bC?2F
z9mdUiY?l}(|7Y(;H^$Tqri!zZ8BNm66mADEnk2|FW0+1sc196qU!mVuoy_mnaD`pH
UIW0u<jj4X!W<{a<tP>Sj0gSdT@c;k-

diff --git a/ext/phar/tests/tar/frontcontroller21.phar.phpt b/ext/phar/tests/tar/frontcontroller21.phar.phpt
index c1a299cc9ba..bb93996d69e 100644
--- a/ext/phar/tests/tar/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller21.phar.phpt
@@ -14,7 +14,7 @@ files/frontcontroller12.phar.tar
 --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"