diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-09 16:14:58 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-09 16:14:58 +0200 |
| commit | 827510a4185ae8ef6fbf0d0f2fbeb92bf63ccace (patch) | |
| tree | abc1927c287de7cbd0d827c787206938cb75813e /phpBB/phpbb/template/twig/environment.php | |
| parent | 192b8e2568f499aa2ead98a24d8dd5541b1f315a (diff) | |
| download | forums-827510a4185ae8ef6fbf0d0f2fbeb92bf63ccace.tar forums-827510a4185ae8ef6fbf0d0f2fbeb92bf63ccace.tar.gz forums-827510a4185ae8ef6fbf0d0f2fbeb92bf63ccace.tar.bz2 forums-827510a4185ae8ef6fbf0d0f2fbeb92bf63ccace.tar.xz forums-827510a4185ae8ef6fbf0d0f2fbeb92bf63ccace.zip | |
[ticket/11649] Fix coding style
PHPBB3-11649
Diffstat (limited to 'phpBB/phpbb/template/twig/environment.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index df586af9e5..f6d9b73178 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -44,7 +44,8 @@ class environment extends \Twig_Environment * * @param \phpbb\config\config $phpbb_config The phpBB configuration * @param \phpbb\path_helper $path_helper phpBB path helper - * @param \Symfony\Component\DependencyInjection\ContainerInterface $container + * @param \Symfony\Component\DependencyInjection\ContainerInterface $container The dependency injection container + * @param string $cache_path The path to the cache directory * @param \phpbb\extension\manager $extension_manager phpBB extension manager * @param \Twig_LoaderInterface $loader Twig loader interface * @param array $options Array of options to pass to Twig @@ -61,11 +62,11 @@ class environment extends \Twig_Environment $this->web_root_path = $this->phpbb_path_helper->get_web_root_path(); $options = array_merge(array( - 'cache' => (defined('IN_INSTALL')) ? false : $cache_path, - 'debug' => defined('DEBUG'), - 'auto_reload' => (bool) $this->phpbb_config['load_tplcompile'], - 'autoescape' => false, - ), $options); + 'cache' => (defined('IN_INSTALL')) ? false : $cache_path, + 'debug' => defined('DEBUG'), + 'auto_reload' => (bool) $this->phpbb_config['load_tplcompile'], + 'autoescape' => false, + ), $options); return parent::__construct($loader, $options); } @@ -75,7 +76,8 @@ class environment extends \Twig_Environment */ public function getLexer() { - if (null === $this->lexer) { + if (null === $this->lexer) + { $this->lexer = $this->container->get('template.twig.lexer'); } |