aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extension
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-08-02 19:09:42 +0200
committerTristan Darricau <github@nicofuma.fr>2014-08-09 16:13:22 +0200
commit192b8e2568f499aa2ead98a24d8dd5541b1f315a (patch)
tree0371c204bba34dd9eb480292de6144dbc021fa50 /tests/extension
parent56ca276dcf080972ad2c5ae411b37c392ffed24d (diff)
downloadforums-192b8e2568f499aa2ead98a24d8dd5541b1f315a.tar
forums-192b8e2568f499aa2ead98a24d8dd5541b1f315a.tar.gz
forums-192b8e2568f499aa2ead98a24d8dd5541b1f315a.tar.bz2
forums-192b8e2568f499aa2ead98a24d8dd5541b1f315a.tar.xz
forums-192b8e2568f499aa2ead98a24d8dd5541b1f315a.zip
[ticket/11649] Expose Twig through the container
PHPBB3-11649
Diffstat (limited to 'tests/extension')
-rw-r--r--tests/extension/metadata_manager_test.php38
1 files changed, 26 insertions, 12 deletions
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 535e4fe0d5..fdb9deda53 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -47,20 +47,35 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$this->user = new \phpbb\user();
$this->table_prefix = 'phpbb_';
- $this->template = new \phpbb\template\twig\twig(
- new \phpbb\path_helper(
- new \phpbb\symfony_request(
- new phpbb_mock_request()
- ),
- new \phpbb\filesystem(),
- $this->getMock('\phpbb\request\request'),
- $this->phpbb_root_path,
- $this->phpEx
+ $container = new phpbb_mock_container_builder();
+ $cache_path = $this->phpbb_root_path . 'cache/twig';
+ $context = new \phpbb\template\context();
+ $loader = new \phpbb\template\twig\loader('');
+ $phpbb_path_helper =new \phpbb\path_helper(
+ new \phpbb\symfony_request(
+ new phpbb_mock_request()
),
+ new \phpbb\filesystem(),
+ $this->getMock('\phpbb\request\request'),
+ $this->phpbb_root_path,
+ $this->phpEx
+ );
+ $twig = new \phpbb\template\twig\environment(
$this->config,
- $this->user,
- new \phpbb\template\context()
+ $phpbb_path_helper,
+ $container,
+ $cache_path,
+ null,
+ $loader,
+ array(
+ 'cache' => false,
+ 'debug' => false,
+ 'auto_reload' => true,
+ 'autoescape' => false,
+ )
);
+ $this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $this->user, $context, $twig, $cache_path, array(new \phpbb\template\twig\extension($context, $this->user)));
+ $container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
$this->migrator = new \phpbb\db\migrator(
$this->config,
@@ -73,7 +88,6 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
array(),
new \phpbb\db\migration\helper()
);
- $container = new phpbb_mock_container_builder();
$container->set('migrator', $this->migrator);
$this->extension_manager = new \phpbb\extension\manager(