Commit 588c52a0 authored by Fabien Potencier's avatar Fabien Potencier

removed a bunch of unneeded isset calls

parent 53f39cfa
...@@ -32,7 +32,7 @@ class HttpCacheServiceProvider implements ServiceProviderInterface, EventListene ...@@ -32,7 +32,7 @@ class HttpCacheServiceProvider implements ServiceProviderInterface, EventListene
$app['http_cache'] = function ($app) { $app['http_cache'] = function ($app) {
$app['http_cache.options'] = array_replace( $app['http_cache.options'] = array_replace(
array( array(
'debug' => isset($app['debug']) ? $app['debug'] : false, 'debug' => $app['debug'],
), $app['http_cache.options'] ), $app['http_cache.options']
); );
......
...@@ -32,7 +32,7 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface, EventList ...@@ -32,7 +32,7 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface, EventList
public function register(Container $app) public function register(Container $app)
{ {
$app['fragment.handler'] = function ($app) { $app['fragment.handler'] = function ($app) {
return new FragmentHandler($app['fragment.renderers'], isset($app['debug']) ? $app['debug'] : false, $app['request_stack']); return new FragmentHandler($app['fragment.renderers'], $app['debug'], $app['request_stack']);
}; };
$app['fragment.renderer.inline'] = function ($app) { $app['fragment.renderer.inline'] = function ($app) {
...@@ -43,7 +43,7 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface, EventList ...@@ -43,7 +43,7 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface, EventList
}; };
$app['fragment.renderer.hinclude'] = function ($app) { $app['fragment.renderer.hinclude'] = function ($app) {
$renderer = new HIncludeFragmentRenderer(null, $app['uri_signer'], $app['fragment.renderer.hinclude.global_template'], isset($app['charset']) ? $app['charset'] : 'UTF-8'); $renderer = new HIncludeFragmentRenderer(null, $app['uri_signer'], $app['fragment.renderer.hinclude.global_template'], $app['charset']);
$renderer->setFragmentPath($app['fragment.path']); $renderer->setFragmentPath($app['fragment.path']);
return $renderer; return $renderer;
......
...@@ -49,7 +49,7 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid ...@@ -49,7 +49,7 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
$log->pushHandler($app['monolog.handler']); $log->pushHandler($app['monolog.handler']);
if (isset($app['debug']) && $app['debug'] && isset($app['monolog.handler.debug'])) { if ($app['debug'] && isset($app['monolog.handler.debug'])) {
$log->pushHandler($app['monolog.handler.debug']); $log->pushHandler($app['monolog.handler.debug']);
} }
......
...@@ -52,16 +52,16 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -52,16 +52,16 @@ class TwigServiceProvider implements ServiceProviderInterface
$app['twig'] = function ($app) { $app['twig'] = function ($app) {
$app['twig.options'] = array_replace( $app['twig.options'] = array_replace(
array( array(
'charset' => isset($app['charset']) ? $app['charset'] : 'UTF-8', 'charset' => $app['charset'],
'debug' => isset($app['debug']) ? $app['debug'] : false, 'debug' => $app['debug'],
'strict_variables' => isset($app['debug']) ? $app['debug'] : false, 'strict_variables' => $app['debug'],
), $app['twig.options'] ), $app['twig.options']
); );
$twig = $app['twig.environment_factory']($app); $twig = $app['twig.environment_factory']($app);
$twig->addGlobal('app', $app['twig.app_variable']); $twig->addGlobal('app', $app['twig.app_variable']);
if (isset($app['debug']) && $app['debug']) { if ($app['debug']) {
$twig->addExtension(new \Twig_Extension_Debug()); $twig->addExtension(new \Twig_Extension_Debug());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment