diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-04-13 10:11:24 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2016-04-13 10:11:24 +0200 |
| commit | 4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444 (patch) | |
| tree | f8110622ff6bd52b75a3c2eb6be1fcd37cf96522 /phpBB/phpbb/template | |
| parent | 560bee1be41b2c8ef37eebd4d1304e3fc03a383b (diff) | |
| parent | 5754cbfec445919dd8b7f261de33d75cbdc78fdd (diff) | |
| download | forums-4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444.tar forums-4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444.tar.gz forums-4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444.tar.bz2 forums-4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444.tar.xz forums-4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444.zip | |
Merge pull request #4236 from Nicofuma/ticket/13616
[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index 56c85c8d71..179412a2e3 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -50,20 +50,18 @@ class environment extends \Twig_Environment * @param \phpbb\config\config $phpbb_config The phpBB configuration * @param \phpbb\filesystem\filesystem $filesystem * @param \phpbb\path_helper $path_helper phpBB path helper - * @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 */ - public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, \Symfony\Component\DependencyInjection\ContainerInterface $container, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array()) + public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array()) { $this->phpbb_config = $phpbb_config; $this->filesystem = $filesystem; $this->phpbb_path_helper = $path_helper; $this->extension_manager = $extension_manager; - $this->container = $container; $this->phpbb_root_path = $this->phpbb_path_helper->get_phpbb_root_path(); $this->web_root_path = $this->phpbb_path_helper->get_web_root_path(); @@ -77,25 +75,10 @@ class environment extends \Twig_Environment 'autoescape' => false, ), $options); - return parent::__construct($loader, $options); + parent::__construct($loader, $options); } /** - * {@inheritdoc} - */ - public function getLexer() - { - if (null === $this->lexer) - { - $this->lexer = $this->container->get('template.twig.lexer'); - $this->lexer->set_environment($this); - } - - return $this->lexer; - } - - - /** * Get the list of enabled phpBB extensions * * Used in EVENT node |