diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-22 13:00:37 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-15 09:35:38 +0100 |
commit | 5c895a7fd15822856fb407910264c5d95e1e223c (patch) | |
tree | a850ff9ccfd8067d4f8cdd341a2dda4324008afa /web | |
parent | 619cc45359ead519b64129181a07e14160fbbfcb (diff) | |
download | wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.gz wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.zst wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.zip |
Update bundle & stock file
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
Diffstat (limited to 'web')
-rw-r--r-- | web/app.php | 12 | ||||
-rw-r--r-- | web/app_dev.php | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/web/app.php b/web/app.php index c5c26409..cc2fefb5 100644 --- a/web/app.php +++ b/web/app.php | |||
@@ -1,23 +1,23 @@ | |||
1 | <?php | 1 | <?php |
2 | 2 | ||
3 | use Symfony\Component\ClassLoader\ApcClassLoader; | ||
4 | use Symfony\Component\HttpFoundation\Request; | 3 | use Symfony\Component\HttpFoundation\Request; |
5 | 4 | ||
6 | $loader = require_once __DIR__.'/../app/bootstrap.php.cache'; | 5 | /** |
6 | * @var Composer\Autoload\ClassLoader | ||
7 | */ | ||
8 | $loader = require __DIR__.'/../app/autoload.php'; | ||
9 | include_once __DIR__.'/../app/bootstrap.php.cache'; | ||
7 | 10 | ||
8 | // Enable APC for autoloading to improve performance. | 11 | // Enable APC for autoloading to improve performance. |
9 | // You should change the ApcClassLoader first argument to a unique prefix | 12 | // You should change the ApcClassLoader first argument to a unique prefix |
10 | // in order to prevent cache key conflicts with other applications | 13 | // in order to prevent cache key conflicts with other applications |
11 | // also using APC. | 14 | // also using APC. |
12 | /* | 15 | /* |
13 | $apcLoader = new ApcClassLoader(sha1(__FILE__), $loader); | 16 | $apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader); |
14 | $loader->unregister(); | 17 | $loader->unregister(); |
15 | $apcLoader->register(true); | 18 | $apcLoader->register(true); |
16 | */ | 19 | */ |
17 | 20 | ||
18 | require_once __DIR__.'/../app/AppKernel.php'; | ||
19 | //require_once __DIR__.'/../app/AppCache.php'; | ||
20 | |||
21 | $kernel = new AppKernel('prod', false); | 21 | $kernel = new AppKernel('prod', false); |
22 | $kernel->loadClassCache(); | 22 | $kernel->loadClassCache(); |
23 | //$kernel = new AppCache($kernel); | 23 | //$kernel = new AppCache($kernel); |
diff --git a/web/app_dev.php b/web/app_dev.php index e0279c2a..635bf7ac 100644 --- a/web/app_dev.php +++ b/web/app_dev.php | |||
@@ -4,7 +4,8 @@ use Symfony\Component\HttpFoundation\Request; | |||
4 | use Symfony\Component\Debug\Debug; | 4 | use Symfony\Component\Debug\Debug; |
5 | 5 | ||
6 | // If you don't want to setup permissions the proper way, just uncomment the following PHP line | 6 | // If you don't want to setup permissions the proper way, just uncomment the following PHP line |
7 | // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information | 7 | // read http://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup |
8 | // for more information | ||
8 | //umask(0000); | 9 | //umask(0000); |
9 | 10 | ||
10 | // This check prevents access to debug front controllers that are deployed by accident to production servers. | 11 | // This check prevents access to debug front controllers that are deployed by accident to production servers. |
@@ -17,11 +18,12 @@ if (isset($_SERVER['HTTP_CLIENT_IP']) | |||
17 | exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); | 18 | exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); |
18 | } | 19 | } |
19 | 20 | ||
20 | $loader = require_once __DIR__.'/../app/bootstrap.php.cache'; | 21 | /** |
22 | * @var Composer\Autoload\ClassLoader $loader | ||
23 | */ | ||
24 | $loader = require __DIR__.'/../app/autoload.php'; | ||
21 | Debug::enable(); | 25 | Debug::enable(); |
22 | 26 | ||
23 | require_once __DIR__.'/../app/AppKernel.php'; | ||
24 | |||
25 | $kernel = new AppKernel('dev', true); | 27 | $kernel = new AppKernel('dev', true); |
26 | $kernel->loadClassCache(); | 28 | $kernel->loadClassCache(); |
27 | $request = Request::createFromGlobals(); | 29 | $request = Request::createFromGlobals(); |