From 3633947699e0a6130e21b94f001b01c8705982a4 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 30 Jun 2017 14:50:58 +1200 Subject: [PATCH] BUG Fix broken installer assets and session crash --- src/Dev/Install/Installer.php | 11 +++++++---- src/Dev/Install/client/images/arrows.png | Bin 0 -> 1851 bytes src/Dev/Install/client/images/network-save.gif | Bin 0 -> 1737 bytes src/Dev/Install/client/images/question.png | Bin 0 -> 343 bytes src/Dev/Install/config-form.html | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 src/Dev/Install/client/images/arrows.png create mode 100644 src/Dev/Install/client/images/network-save.gif create mode 100644 src/Dev/Install/client/images/question.png diff --git a/src/Dev/Install/Installer.php b/src/Dev/Install/Installer.php index 3ee2154bb..80df8afb0 100644 --- a/src/Dev/Install/Installer.php +++ b/src/Dev/Install/Installer.php @@ -3,7 +3,9 @@ namespace SilverStripe\Dev\Install; use Exception; +use SilverStripe\Control\Cookie; use SilverStripe\Control\HTTPRequest; +use SilverStripe\Control\HTTPRequestBuilder; use SilverStripe\Control\Session; use SilverStripe\Core\CoreKernel; use SilverStripe\Control\HTTPApplication; @@ -199,10 +201,8 @@ PHP } } - // Mock request - $session = new Session(isset($_SESSION) ? $_SESSION : array()); - $request = new HTTPRequest('GET', '/'); - $request->setSession($session); + // Build request + $request = HTTPRequestBuilder::createFromEnvironment(); // Install kernel (fix to dev) $kernel = new CoreKernel(BASE_PATH); @@ -211,6 +211,9 @@ PHP // Build db within HTTPApplication $app->execute($request, function (HTTPRequest $request) use ($config) { + // Suppress cookie errors on install + Cookie::config()->set('report_errors', false); + // Start session and execute $request->getSession()->init($request); diff --git a/src/Dev/Install/client/images/arrows.png b/src/Dev/Install/client/images/arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..a24f44db60f32852f60b2dd2f77d4cddcbcf7a29 GIT binary patch literal 1851 zcmah~2~ZPP7>gPpyIk7M1^EGA*V(OIZV)CNKh&DU`-Z@u-T9-5-uwW3F@e5 zL9n1=5l@P!)k+}>DiuY=1GOrs#agLSQSiWeb%UUtj$?Ob_r3qk_x=C(A8&T0GIW}| zn~xiXLUEVN#42+2Am1VvC-Qr_kR4Ah-h?EAP~*`=B4R`-LM^@!1>_jA2vwnoHYxrz zI+;T03+lonhzP|Dz6Qr=h#f;SV+N8p_f~G)A3) z(BXQ(?h#ptClCUVRQf&z%%D(waI81=6pAbv-HaIMFb$$(m_4szWS;uz3f8@}#8@$K3nm-$5aZ%QDi`H?McU14qWk{40AvduMlrUt?NPTT!0 zrr%Pz#g4-4%vZ(eu_xbVytrBzG2C;&oe*kAuskRwJ(9|}$dZIzSFUq+wXAicbTlXA z*ST1bt2Jp!L0$<#fWyf(!%ywjeRux3v-a^O=eTC4vdD9m5E_!p*yI5JaY{7xu3-SsBea=jp zRKKeK?Xq)cy`;G~sx#L_H)ITIsTrjQcmF$Z_hocU@nYt8l z90#SlzHX=~*KD*tM4YI6k^Ihn4Mj<*9omM>j;XiWUP_c+K_e(O<(!IPH7EWK+G!k> zK0e#3qg44h?YEYsTUk~{n_Cul<&?SszU${*x_071ah77}-nccsDs=~^dC#Q!n^=hfpH<}OGT&i6R&mo1_dwC0A}&9R zr(PvG7k)X0dUE9~bHV)B`7{$;Jd6h8@bi7fjXF1n5#IeYe6@@uA4a?Z48;=mup z`%bsl%)D2!adFPP?5^;Gdv~1P9Ocxsq>j2^%dLJ_M!h~-l@pSdX?8Cvx)o0}H7)(C z=z#3@sF`w!-&)%sjkzP$qL`JIUtxU;c{ZdD@cn}u>hHQrF>=!_PF0})e6`;6(YRWp=#pji7V{7fdGr1>oxR){2xxd+=l=F literal 0 HcmV?d00001 diff --git a/src/Dev/Install/client/images/network-save.gif b/src/Dev/Install/client/images/network-save.gif new file mode 100644 index 0000000000000000000000000000000000000000..1560b646cff2cc4fd292d7fdb6f7adc7eb484b4a GIT binary patch literal 1737 zcmaLXeN0p99l-I&!tEQiv~W&~lv_&SmI|fRw)eE0zR=T_(^9a!crF*Q_O?JP*50BW za+x#6J*VfyIVLB@`G?mSW{fe8%LJS?j`_k2*Er)fUT2(h#u;OrF~)0*amLK)uKSPd z_ve%6mwfVklPAzh+MD7sAOkM}c>DG(0N}=r8~gU{i^XCdkH_!#XEK??hY#PmbLYsB zBQ-TOdcEFcGGQ3zcDqxl)R{A9Dk>_n+3b@iPo6$~y0EaYd-v|n&dz8wdiLzuYuB#f zIId7A#>dBxA3q+6M7D3=e*gY`mSv?<>Cn*7!Gi~r$>gb1r$~|%i^V5SoY=pAe_2@> zpU;2v=+TQ8FUH2ka=F~gmoFiN$BrF){rdHrH*e0LKY#i1-Mo2odV2cVvuD?@ zUw`o6!QH!euU@^nxVSh!KY#Duy<4|#J%9fE_U+r-wrx9k^5pF7Y2!hz{_K}ehqtPf73O8@wtkGyFib|)`J9qAU_vSxN)!U+Q3$?~abhem{rh;Yf zPOJW1?#m|PBZ)!HR~tu$H1Sk?EIk|_G;Yi!he6f93Ps{~w+!$1-$w+3U+n~t&M}Ot zdSwI42rFvpj1a?ZjJW9IPwE??&E&#p9=}A*VhFMy6cm+?16Q*P7E0tZ7Ed$$XgM+i z94(M9MQ3b;8w!dQGl;PjLVE4Y?<_P{QXeB^>`CbQFBvD_OT*#R6y9XGLopA~j#=m{7->pd6t>(Yi=3 zP}uo3V`jwsY7W}yU|ZK5z%f|Z?m9z~uy*yuIRu5uFfoVs{~5H(gmaYV0%%rtm$QvL z{~uwK+1e_?@y3>z>U)~d^%(jpL%ul0QBAF>DcN4YPSb$5Y$@O`J^)4H(vAG6fyV-$ zpp9QFT`ozb8GCfYP#22&x;IILw01D;WQQ6$Rd7I-5KT1ikgn+a(|F~;N5`@Dq1(|Cs^MXKy8P08>2 ze(zaIH}OH&tXIpzRp|f=nv{at6&u#2!XbvJ4yIM4%e%g~!%0&*vz<+T(e8jvJ$eoV zB?T~K5as2YK8NWfo<~YPgTv`>IqKsqR5<(dp)cEDK=00n>#89cvunA{%L%$M)}%E- z+Y7LTL0WhsE#TMm`-=Xj>PZ!`)~ z(K&8wwg6)N&3|FkYgh7U3x!zd`r4lqi5ZME;n0{F5#}>?i)rEJH#GeJiA|m+eZ8DO zSU?f>fl#Gzi`dPes#t)+aBX={4?$xdcO&byCid?1(awZqf1}Z}+v{|OO zt|T#wanNsY&NCKu;zG`1RYSh)xbINpDJ|DFE; D?d&fs literal 0 HcmV?d00001 diff --git a/src/Dev/Install/client/images/question.png b/src/Dev/Install/client/images/question.png new file mode 100644 index 0000000000000000000000000000000000000000..f51f15ba3fb58340a9963069d70f353ea60a0f03 GIT binary patch literal 343 zcmV-d0jU0oP)G?Ct{ORyf6yHEDXe^#9r(g-p`~M~wUoKnM{r z&+`il3Grwi z+g3ygatp&ybaImDi7XC+0ES@z!!W@2eYp#B&IJsJmjf47RRvwwLDMu~Sr#5;%{?Qs zu)gm_)HDq|&jU&+2AF#tY>bQf>~&o$b57`mzs$C6F^b}AYycU~D$7z;INJlHxC_^H pRn^noO+2(nhgbP;f8$4h0RZ||b>{+D`I7(u002ovPDHLkV1gW@iwOV# literal 0 HcmV?d00001 diff --git a/src/Dev/Install/config-form.html b/src/Dev/Install/config-form.html index df1dc48ea..a9685e3a3 100644 --- a/src/Dev/Install/config-form.html +++ b/src/Dev/Install/config-form.html @@ -273,7 +273,7 @@