makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11649] Fix coding style

Browse source 
PHPBB3-11649
This commit is contained in:
Tristan Darricau 2014-08-09 16:14:58 +02:00
parent 192b8e2568
commit 827510a418
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/phpbb/template/twig/environment.php
View file

@ -44,7 +44,8 @@ class environment extends \Twig_Environment
* *
* @param \phpbb\config\config $phpbb_config The phpBB configuration * @param \phpbb\config\config $phpbb_config The phpBB configuration
* @param \phpbb\path_helper $path_helper phpBB path helper * @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 \phpbb\extension\manager $extension_manager phpBB extension manager
* @param \Twig_LoaderInterface $loader Twig loader interface * @param \Twig_LoaderInterface $loader Twig loader interface
* @param array $options Array of options to pass to Twig * @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(); $this->web_root_path = $this->phpbb_path_helper->get_web_root_path();
$options = array_merge(array( $options = array_merge(array(
'cache' => (defined('IN_INSTALL')) ? false : $cache_path, 'cache' => (defined('IN_INSTALL')) ? false : $cache_path,
'debug' => defined('DEBUG'), 'debug' => defined('DEBUG'),
'auto_reload' => (bool) $this->phpbb_config['load_tplcompile'], 'auto_reload' => (bool) $this->phpbb_config['load_tplcompile'],
'autoescape' => false, 'autoescape' => false,
), $options); ), $options);
return parent::__construct($loader, $options); return parent::__construct($loader, $options);
} }
@ -75,7 +76,8 @@ class environment extends \Twig_Environment
*/ */
public function getLexer() public function getLexer()
{ {
if (null === $this->lexer) { if (null === $this->lexer)
{
$this->lexer = $this->container->get('template.twig.lexer'); $this->lexer = $this->container->get('template.twig.lexer');
} }