aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMáté Bartus <mate.bartus@gmail.com>2016-04-13 10:11:24 +0200
committerMáté Bartus <mate.bartus@gmail.com>2016-04-13 10:11:24 +0200
commit4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444 (patch)
treef8110622ff6bd52b75a3c2eb6be1fcd37cf96522 /tests/controller
parentMerge pull request #4284 from CHItA/ticket/14589 (diff)
parent[ticket/13616] Fix CS + constant in the core extension (diff)
downloadphpbb-4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444.tar.gz
phpbb-4c257d47a6e4ddd6a5057b77c83ad78d3b8bd444.tar.bz2
phpbb-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 'tests/controller')
-rw-r--r--tests/controller/common_helper_route.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php
index 9d3d81963b..367c15a667 100644
--- a/tests/controller/common_helper_route.php
+++ b/tests/controller/common_helper_route.php
@@ -111,7 +111,6 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
$this->config,
$this->filesystem,
$this->phpbb_path_helper,
- $container,
$cache_path,
null,
$loader,
@@ -123,7 +122,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
)
);
$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)));
- $container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+ $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',