From 73cd160bfc6e4a1b88f2117eb0c097a91ac5c753 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 14 Jan 2016 18:15:07 +0100 Subject: [PATCH] Switch to Symfony 3 structure --- .gitignore | 23 +++++++++------------- app/AppKernel.php | 21 +++++++++++++++++--- app/autoload.php | 2 +- app/config/config.yml | 3 ++- app/config/config_dev.yml | 5 +++-- {app => bin}/console | 6 +++--- bin/doctrine | 1 + bin/doctrine-dbal | 1 + bin/doctrine-migrations | 1 + bin/doctrine.php | 1 + bin/poche.sqlite | Bin 393216 -> 0 bytes bin/security-checker | 1 + app/check.php => bin/symfony_requirements | 3 ++- {app => var}/SymfonyRequirements.php | 0 {app/logs => var/cache}/.gitkeep | 0 var/logs/.gitkeep | 0 var/sessions/.gitkeep | 0 web/.htaccess | 22 ++++++++++++++++----- web/app.php | 2 +- web/app_dev.php | 2 +- web/robots.txt | 4 +++- 21 files changed, 65 insertions(+), 33 deletions(-) rename {app => bin}/console (78%) mode change 100755 => 100644 create mode 120000 bin/doctrine create mode 120000 bin/doctrine-dbal create mode 120000 bin/doctrine-migrations create mode 120000 bin/doctrine.php delete mode 100644 bin/poche.sqlite create mode 120000 bin/security-checker rename app/check.php => bin/symfony_requirements (97%) rename {app => var}/SymfonyRequirements.php (100%) rename {app/logs => var/cache}/.gitkeep (100%) create mode 100644 var/logs/.gitkeep create mode 100644 var/sessions/.gitkeep diff --git a/.gitignore b/.gitignore index f88370d7..b6d6aa5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,20 @@ -# Cache and logs (Symfony2) -/app/cache/* -/app/logs/* -!app/cache/.gitkeep -!app/logs/.gitkeep - -# Cache and logs (Symfony3) +# Cache, logs & sessions +/var/* +!/var/cache /var/cache/* -/var/logs/* !var/cache/.gitkeep +!/var/logs +/var/logs/* !var/logs/.gitkeep +!/var/sessions +/var/sessions/* +!var/sessions/.gitkeep +!var/SymfonyRequirements.php # Parameters /app/config/parameters.yml -/app/config/parameters.ini # Managed by Composer -/app/bootstrap.php.cache -/var/bootstrap.php.cache -/bin/* -!bin/console -!bin/symfony_requirements /vendor/ # Assets and user uploads diff --git a/app/AppKernel.php b/app/AppKernel.php index d97842f9..7e76a9e9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -7,7 +7,7 @@ class AppKernel extends Kernel { public function registerBundles() { - $bundles = array( + $bundles = [ new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), new Symfony\Bundle\SecurityBundle\SecurityBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), @@ -33,9 +33,9 @@ class AppKernel extends Kernel new KPhoen\RulerZBundle\KPhoenRulerZBundle(), new Wallabag\ImportBundle\WallabagImportBundle(), new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), - ); + ]; - if (in_array($this->getEnvironment(), array('dev', 'test'), true)) { + if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); @@ -46,6 +46,21 @@ class AppKernel extends Kernel return $bundles; } + public function getRootDir() + { + return __DIR__; + } + + public function getCacheDir() + { + return dirname(__DIR__).'/var/cache/'.$this->getEnvironment(); + } + + public function getLogDir() + { + return dirname(__DIR__).'/var/logs'; + } + public function registerContainerConfiguration(LoaderInterface $loader) { $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); diff --git a/app/autoload.php b/app/autoload.php index 70526bb5..fa582ecd 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -8,6 +8,6 @@ use Composer\Autoload\ClassLoader; */ $loader = require __DIR__.'/../vendor/autoload.php'; -AnnotationRegistry::registerLoader(array($loader, 'loadClass')); +AnnotationRegistry::registerLoader([$loader, 'loadClass']); return $loader; diff --git a/app/config/config.yml b/app/config/config.yml index 5fac3192..133fc12f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -21,7 +21,8 @@ framework: trusted_proxies: ~ session: # handler_id set to null will use default session handler from php.ini - handler_id: ~ + handler_id: session.handler.native_file + save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" fragments: ~ http_method_override: true diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 116dd0d5..6b077fdb 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -17,13 +17,14 @@ monolog: type: stream path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug + channels: [!event] console: type: console bubble: false verbosity_levels: VERBOSITY_VERBOSE: INFO VERBOSITY_VERY_VERBOSE: DEBUG - channels: ["!doctrine"] + channels: [!event, !doctrine] console_very_verbose: type: console bubble: false @@ -31,7 +32,7 @@ monolog: VERBOSITY_VERBOSE: NOTICE VERBOSITY_VERY_VERBOSE: NOTICE VERBOSITY_DEBUG: DEBUG - channels: ["doctrine"] + channels: [doctrine] assetic: use_controller: true diff --git a/app/console b/bin/console old mode 100755 new mode 100644 similarity index 78% rename from app/console rename to bin/console index 3b4c367c..49247c94 --- a/app/console +++ b/bin/console @@ -14,11 +14,11 @@ set_time_limit(0); /** * @var Composer\Autoload\ClassLoader $loader */ -$loader = require __DIR__.'/autoload.php'; +$loader = require __DIR__.'/../app/autoload.php'; $input = new ArgvInput(); -$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; +$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev'); +$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod'; if ($debug) { Debug::enable(); diff --git a/bin/doctrine b/bin/doctrine new file mode 120000 index 00000000..0f72e36f --- /dev/null +++ b/bin/doctrine @@ -0,0 +1 @@ +../vendor/doctrine/orm/bin/doctrine \ No newline at end of file diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal new file mode 120000 index 00000000..110e93c5 --- /dev/null +++ b/bin/doctrine-dbal @@ -0,0 +1 @@ +../vendor/doctrine/dbal/bin/doctrine-dbal \ No newline at end of file diff --git a/bin/doctrine-migrations b/bin/doctrine-migrations new file mode 120000 index 00000000..7184da71 --- /dev/null +++ b/bin/doctrine-migrations @@ -0,0 +1 @@ +../vendor/doctrine/migrations/bin/doctrine-migrations \ No newline at end of file diff --git a/bin/doctrine.php b/bin/doctrine.php new file mode 120000 index 00000000..b22b74da --- /dev/null +++ b/bin/doctrine.php @@ -0,0 +1 @@ +../vendor/doctrine/orm/bin/doctrine.php \ No newline at end of file diff --git a/bin/poche.sqlite b/bin/poche.sqlite deleted file mode 100644 index f2b79b68f2480a6fa0ec923f225b6a24c880ed54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393216 zcmeI*Pi!3Nncs2Bns`PU%U&cf1Y<9?Tue-@*=&*eJ2M*E9E#FthN5JNnz5XNQ0%U5 zme}3ZQ`JR^vd7Xa0t5(BIF(V3~oQ%8_~vwe@K2 zhW>YFbv3%PcJ0S^R%Ql>$bA9F3wdL7p5ciX4edQj%zWz4-F;kJ3@EzP2(CCzy@W;$EJ_V*z#Lm8CnY>(OcdRVUuAZ6<#s z{E^NVy}x?n{pS!*eb${i^EF1k-u~L>Z=QJlW%|yf_`rOsDPX7sX?AXmsxn?`nKUv(dB#%5?Pc(yiqWmTuMKKAQIH znD!ny^=M)0>DTCh-}$XN-)p~kI(6Y|ALzpGee>i;Z+$6r71jZ~PN?6ydGwnnfAE7N zcb&ZIp(6RTOa`sw(2uVj=!8SRoH5N=ee%?!e>U~){r3Oh*f&r9@Ov+7Sm?-m3*qar zAH4Au-aH@P{D#iadGsHqn)~PaD&Kvb@ucIuc0zw0dGtS~^oRctKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|ubp%cvIXd+R*)SOt zS(&$z(fA|jp1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmdVPQsC&(W5-VD%8x$!%hw+L_ecNp(O9p0=xg{piu}`WsH@ha->v*OdP79|8yVEzY-gx8lf73s9C6D{@M%9 z%IzdBqaw+-(^eAo(v3Wcl2O#n<58K8Hb( zM$s@XqP?fB&3HK6dm4ROCc4;>F0Pdgimcy{N2wjve;y?ReYjmlpClVmQj8)sF;6#o z;Xtj;JR4-g&A96_!#E$Mt+JQyeNmmMlb6LPk9A?uC@V+N-jk>oN1ZG!o;`U-XB~*Q ztPUpd!kVT_DxwY1x3Y2=&5ZJF`0U9KPg#RTNq<;G$v~aa)rIM3$%A1p%ac6nB}LRv z2l_iM^R#0vP`lM_vCf?KlG$k2phih+q~=7r@L@XAThyVQw5L zQRd!ia~Z{YNgve7`|&_#bJ6v^U-y%!NW*8;p6X-9+m3Y+y(D@l<8;uCI{Dtyfli;A zwm#B{TWXXaQLPe0OFbb!zm9g+vZf7--PUHNuqyS#r)3%qv%x6sq}B{IExa`zbd%hB zXi)a|p5}gnVOIV6eo`7qOL3L-L^Ki=TzX>n@Sn{H8bp#AEPPR|BGntL1$dqUaVd+MX=@WmEo zx~(f!EGhQm{)Sn)k`NVe3fWewb6G$tbNDFeCBJ?AXO}kesJVElsiAnOIUEnmo7O$v z3+-$$5cr0D@!{9f5nBpY|E&g2H?h%BwDNMOaZ(l`WOR~#oGX+XLmPVP4sX5(oqnfY zEgJ2tC{i8U0!KmH%KF1B*Em$T-B&vo&YiE$qOou1(C2jZdrw15P9D*RPbaW7F$EtGkamM&URtj`pgg@Hb9$Jka_c*FPkqx+?T!;Yj;p;*wU zpSAbrNmtDfjD^p3DvnG8vO9=%?P^Ii1Qi|+1*m?_bh`R9I=W@e)RLu!jqzHL>SZ-H z_pV3_jZ#aH<23d1I9O8ZQmRvzdvcz&_)&X0v4)mTIT;~gxYgs&`c!jBoQ@(Tm6lzd z6s(<=yLzRK2Bo$K)+HLAwopFx59{l!+ z_M5)4q)$9OMdT>9Z$q;bUz#6sr3YQ~I18P!3-n}M9i~dbLuII3Swu%rxN2-#zDYf9 zE!J#~v$mMXrD7N>5|yfo_oiF((~If`4Zqkk-=(Jgc5#0)59u)86_`(V7Cbhi>7W)I zia8|~#i3qnryeZB5P`-eMZv^qxr15CM8oDhB}}+ z_TP{D!*`?08e$d-o}){9Q!m-p5UkHS7p*AfbUuqzo3yQ277apC1?dHgM0NbN+e_*M zC1mfPP$|?h-gZwNHjtEre{HTBR+ipF)na+klX-}4MV5^7T5#JKj(U4fW>teJ0ejylU7mW$yt!(2 zHdA`q2BUXQA(E6#Mw2Eg(|?i!_H-yM|mON`?vZ|C)S!_za>70)K#_ztraXv$4Vsw zJJ4LTtRq>4UDfu{>Yx9zO!XVZTPxL)K(mnu$IF1dr?Wn{Tk_lW^2tVn@|l7ov^kV1 zx)z0HD3JWREU=SuQ_h;T(%ESI;wN#hXUm_tm+<@YrN}y7Hfr*-acx&$hKkxcSXZMK zDvRiR+lktz-ybdyzv7B%zIkT8c{NGAkW`V>Zq)5NTtw=eJ>|6625H_>4Oazj5f%YH z5G|-T6};*w?;PcYPK;(8`9EHj=1rkY^3M zbkE^d-;a`)A+9QmC5qJ$aXQFYbvA^HmYhnJq1prV-Ln7S)fj^2***g}tq{LblYnag9N; zV-uh+Q|vD_sZ2B!eBRN5$SW_U8ee0@y7Io29wM?SzZDO)w$h<>2vr}hmJYT(iP>c5 zFK7j#HBmT1xEx(#)==zhBzbo{XVuqOb>^~W?rNq8Yhhnhs0h~jG`g<3DtXwjv2X2q zdDLrw9oQx~9L}LV^h*r+Q+bxV30kc{Z?Rs|T1;vN}hHs7`an4m3WFEzJ6HPjkkf`aqYq z${?*}^HXz?FRQGQ*hp+~pgG6V>;8v5nX4#ystlokt%hNq-B-7Il2GF`Em>e#x~L23 zFskdyEL7DtaaC24_9^V$Hj1pCQd%FkwhAYmPIG}quARt6-&O4%mD)}jS&1c-daP>V z^a6DM)V7I}4Xq;AG}TIcC24`KCND;9BKOS#>x530YsbQlS?!yQO09$I#bw=1>P&42rMAmt zWo8_XcvacvL8``U+vCN-w=#&5PA3`7MIYJ(WA&=-zStg#bzHCPYVGG;Hjyt5jJQHu zb6sbi(`TCl?U!kHW}~UKPf;|6r3QIJX(cOF7#tpeFM5v+!!X~5C6qZ0Y?~IoNmvb!J)#+fmq)x>vYrlh!(X><-`1#938wL;;VWHB-C4P*YDdcz z*H)1m_KEbkGvPS`}n@TXmo>WvkNBGL1#khRRUeYzQkWn=pK(VC2?l#bF-r{VSCT z+5nx{Xi+k;Nki|_7EYKW1aB*#j%AR&4Rml{i`v?)&??`mMvoT_WP4j#*mg&qae5Yms#a{k`w~MLQJp08(0wCqJ(U)! zzV^0#Bi~3Icb3hpI-S+D)&z?wEv9U<#kM!C|CHry{KbQ|ZDCqi+CG3vER%|XqLgHUJLglmhEWUw7llrQn)?My2HU;6lllC4AyQO^D0T(p`*3umJHv8p9Y z0oB}{CwsptE$=3p;d}OWQ{J{j$#D)DlkPG92wBHs-Y9o$dWQ+ec7H_iRtUZk-x#mu9y{ zI(ec5r5!m9IZeIRo%XWdG*Y?qzIIwQ`PMffbS&)-Z`iUrq+T1P?L13uKw9ru&bQ$c zKH-~N>PQXRmUh(by&eY>$QgGv-`u{*4x9a-e!E5XMX^x=X{-0&m=zlRXZvWlfv}&SIaWhkgz)n zz9p+dNbwMQXV;2I3)YUd0WFnVs@&2$m0h*0sFu$oOM|wQwV~(3$rFQ3&^Ax_D;5|^ z7P*I( zsbQe?ZZG*tA8KmjQuBo6=;5YrOgtB4-fp#XD~v;bQ_);Ff8pZ7#q(!>w08P*^W5o$ z3k#n! zwYujw8W$f9m$JAK&;NAw`kMXj%-eb6!sfZ#OPB2+A9Pmj%axt7(H?!gGq~QkSZ3E( z<{KZbJp4)0xcceYPj?${FMRyr&0CG-2g&?)JZ#FI-;Gk-MMX+HS<_ zXD|NveZ8gq@mYW8^7*rkm0R7Rn(*=6t5@6h<-_;qttI)Dt;YEeA8cOO6vEp#%OC5F zo$C(-d1pRVOXly~e*eMbU`__pi=Ws89`}_%@{L_jcs81Bm90HQ4OQEI*D^gU`h0KL zwm<4=Q~78-H`;i6-&R$z-!7>(?vsXX#8;(|a^JS)J=IN~Cc`ZUkIhhP#$8+YJbyPX z+<~dz6DEFJD36Ov{b2FvOTwz4uP2Srben_i$p9bNUftG>7*Aw%4%LFuZZCv_QvTB(C&5hUnJ~LbT z3wK4U&HBT+dz=nze{W7Rdh-uQ+3;p}+3uxG_O0Eu^+Vc*sB&JtRtyQ-N)(j_6Dvn` zvM21iEZ=)pHHH;(7tfp>ua&~`T*n7ij$hZds!vhT#UE8o+s@X}T3l7d&ws+04?l3^#= z@T&=T-0D@ZO*az@3lC52C8{1DDJj`~`I)7G&CqS1X|<`I?G({X`<2#c_UYt-wiIk~ z)>>SvqE7a}-g!04x(cIZJ$%tuey?zreJf!i5On+d3$@jb)9Got*3xf(TQEF-;MZb1 zqBe{9THU@G-~F@Rw2n|tR|2)W&(Vw)e7^DBXz6)`@i6h*h?8g1+_tR3#x^EGsg`vW z3A(#ydfJ57%?q#kbnnnNA@%ZxHeSYE&I!co>S09+$q~q-}^%Mmesa{ zJ6o!!LZQ7sLwoJ(o5Xfs#3nu8<-{%#aEMhz`AY1B`dOjVs3w4V z2hDcjwp9n&IJHX~w@-JcLKtaj{G#p7Yhg{Pa}E{g?JS&n|9lG8{i}Cqx1} zJ%@B)H^4L{_-OQjs{`%l8yg!M$|KwA*Fxq%6SRA(v~5SRfhqm)kdyFjuWu0UnuRTU ze{?G>CA8@moaZATL;Wcrl`G z_Z!6?%=-~FZleW#s6&)nbvWHc(QO91)vPsyt+SOlHInp$?(KAR%g%2}X#!~3=xBx; z8udEg`YTUto>JP;!F+ShJH&UXUQhzvsKPazQAf1phCQdDj*s_#rMX9&WMP1oy~Rtt zw0hb=E!wFT!8R#{y{|-zPOXOOvA5CN`@;GrxAAYcMxW|n?_O%^Ajj=U6IU1Zk0yG- z$Nix(W)GMh+S#q!P%TvAZge}Up?sUx;Mi8&D?E_PuXe_=6Bbd)Px)ZF?*VDs{(r#Efq_doa#Dw}jCh z>AAYuHUk|luU2fW>XB+GC#ota9bcn=e`F4O)t0ZG5wyn-)Cb7uBtFVzCfax~p7tWtMd-1d$d)4}{5jPHO+BEDo zMkCzDXcW8lAjaf%+mb;8Mc~>pkFNNktGdxUqiL}h9%@|`b>>B|E$vfX@1MOWqhHs( z;MB6ASNDF~+UwTpUZVAzA4E;kbgCcg%rh|)uj+w6`?dE*HHVFNFze~O-e(%u`=YJy z9r+A&;ISU>MGZ_n8RA=kDuDGst&-rl@T`m7zv+tI17kHQwB4oWrsjr&dd=?pGY%1A z$0taC(~B1CU-oW2(-_uL&pr969U$FG_6?x!)}Y;JDG0RWYfkpHEg?2z?YcaSuBz~` z=Sx-l#NiRifAmM+I5yS1^Tr$hBso?OlJVI7D&zma!%+i0&pN$$Yh~&3^_97PyLvY2 z_@(hw6`rBeB(|mEd(ha(+Ip5knQFIT2}|EiN47|{)y;d;Rt7GImv3}#YD;U{AL*={ z8EJgl9lTygg^D%>?IFO)3PIU2+p&j%cQp}fYeRR(^+ao-59#hqbvpaLuTn|nvu$!{ zyG_N0o($0bry3INY--xFkGJB%Ty#xamUi2ur7hk1^FA zu8&x{sjovTZG~q)i!>#BTGVxA1ACk(dgu9MrZ*nUW{dXO126gVe@44We%DS>>CfaA zJG$MYNmD1o%Y_eE?;Y({e2|c&C2o+M`0K1ubT<}us%d{aWx!l{BZno zHr&nA?&c_Z_B7HH`llQE>r8#yeE-p#{mWI~_eR+}b|XYeHwy0he#wynAi!sy!5M1*bK~S4Mg)u~*ks&1(28{^RJ#@u|;`zW2tlU;e#g zUl#gyAVsnTzprBanbDt*BW~i~Qq)1{DdhMiJzZCCB<9(Ujkk$c)D?|hw{cOy-)r>S zjrj%t?mGWp+P#Mw&)@E-fk6oVboqyN9eB9;>$#4gxno&1s99Sr{v;HaT^=RT2e>D=Cy3EDn$1jDilNbHFF?^zX;_7G1 zR1^CbmQi+8SMH~zI-QKuQ4RFvX=z7MIDw)BW%)}x~;5hINKECZ){F4st@!?n-##S0QS4W?{4Vds+f@_YCY#$&s7Qklp0n~ z41Qxwn|_)fX7^_ak1PAoc%+3xYxaoL;QHQ9oH` zefC6ERJb;+9BssD;Hh8qlFg3Ko*X`*l;>2lZzewF*j>EoMK4c+a(Ead99bdh<&SRj zL^C_~Z?F7GKp(5+Q2Q-y?I_h6o+WkGdJ;PrqsQ&v)IEOX{$U*#i~s@%AbS}{kN*8Dcj;U(0tg_000IagfB*srAbd{}=|NRaJ;-d&4fB*srAb + Options -MultiViews + + RewriteEngine On @@ -18,9 +30,9 @@ DirectoryIndex app.php RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$ RewriteRule ^(.*) - [E=BASE:%1] - # Sets the HTTP_AUTHORIZATION header removed by apache + # Sets the HTTP_AUTHORIZATION header removed by Apache RewriteCond %{HTTP:Authorization} . - RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] + RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] # Redirect to URI without front controller to prevent duplicate content # (with and without `/app.php`). Only do this redirect on the initial @@ -34,15 +46,15 @@ DirectoryIndex app.php # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the # following RewriteCond (best solution) RewriteCond %{ENV:REDIRECT_STATUS} ^$ - RewriteRule ^app\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L] + RewriteRule ^app\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] # If the requested filename exists, simply serve it. # We only want to let Apache serve files and not directories. RewriteCond %{REQUEST_FILENAME} -f - RewriteRule .? - [L] + RewriteRule ^ - [L] # Rewrite all other queries to the front controller. - RewriteRule .? %{ENV:BASE}/app.php [L] + RewriteRule ^ %{ENV:BASE}/app.php [L] diff --git a/web/app.php b/web/app.php index cc2fefb5..5c5ee03b 100644 --- a/web/app.php +++ b/web/app.php @@ -6,7 +6,7 @@ use Symfony\Component\HttpFoundation\Request; * @var Composer\Autoload\ClassLoader */ $loader = require __DIR__.'/../app/autoload.php'; -include_once __DIR__.'/../app/bootstrap.php.cache'; +include_once __DIR__.'/../var/bootstrap.php.cache'; // Enable APC for autoloading to improve performance. // You should change the ApcClassLoader first argument to a unique prefix diff --git a/web/app_dev.php b/web/app_dev.php index 635bf7ac..8456754d 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -12,7 +12,7 @@ use Symfony\Component\Debug\Debug; // Feel free to remove this, extend it, or make something more sophisticated. if (isset($_SERVER['HTTP_CLIENT_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR']) - || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server') + || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server') ) { header('HTTP/1.0 403 Forbidden'); exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); diff --git a/web/robots.txt b/web/robots.txt index 77470cb3..214e4119 100644 --- a/web/robots.txt +++ b/web/robots.txt @@ -1,2 +1,4 @@ +# www.robotstxt.org/ +# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449 + User-agent: * -Disallow: / \ No newline at end of file -- 2.41.0