aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-23 21:59:40 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-04-03 16:23:16 +0200
commit663e3bc64238668ec139b53ccfb2f82a1d306601 (patch)
treed8d921e7a60b75c75d88884cd759198aebb09d7e /tests/template
parent4070d1e06f677ea43b55c04e67b031a96dd22434 (diff)
downloadforums-663e3bc64238668ec139b53ccfb2f82a1d306601.tar
forums-663e3bc64238668ec139b53ccfb2f82a1d306601.tar.gz
forums-663e3bc64238668ec139b53ccfb2f82a1d306601.tar.bz2
forums-663e3bc64238668ec139b53ccfb2f82a1d306601.tar.xz
forums-663e3bc64238668ec139b53ccfb2f82a1d306601.zip
[ticket/13616] Updates direct call to twig environment constructor
PHPBB3-13616
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/template_allfolder_test.php3
-rw-r--r--tests/template/template_events_test.php3
-rw-r--r--tests/template/template_includecss_test.php3
-rw-r--r--tests/template/template_test_case.php3
-rw-r--r--tests/template/template_test_case_with_tree.php3
5 files changed, 5 insertions, 10 deletions
diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php
index 9a0f1f512e..9a0a42fabd 100644
--- a/tests/template/template_allfolder_test.php
+++ b/tests/template/template_allfolder_test.php
@@ -64,7 +64,6 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
$config,
$filesystem,
$path_helper,
- $container,
$cache_path,
$this->extension_manager,
$loader,
@@ -76,7 +75,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
)
);
$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager);
- $container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+ $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template_path = $this->test_path . '/templates';
$this->ext_template_path = 'tests/extension/ext/vendor4/bar/styles/all/template';
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index 54e08652a1..e245c90aee 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -158,7 +158,6 @@ Zeta test event in all',
$config,
$filesystem,
$path_helper,
- $container,
$cache_path,
$this->extension_manager,
$loader,
@@ -170,7 +169,7 @@ Zeta test event in all',
)
);
$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager);
- $container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+ $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path));
}
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
index ac62e820ae..764652c9c2 100644
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -50,7 +50,6 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$config,
$filesystem,
$this->phpbb_path_helper,
- $container,
$cache_path,
null,
$loader,
@@ -80,7 +79,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
)
)
);
- $container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+ $twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
}
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index cda0623dcb..e52d3b76dd 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -102,7 +102,6 @@ class phpbb_template_template_test_case extends phpbb_test_case
$config,
$filesystem,
$path_helper,
- $container,
$cache_path,
null,
$loader,
@@ -114,7 +113,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
)
);
$this->template = new phpbb\template\twig\twig($path_helper, $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->template->set_custom_style('tests', $this->template_path);
}
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index bf5de6b85e..ff35d16120 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -45,7 +45,6 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
$config,
$filesystem,
$this->phpbb_path_helper,
- $container,
$cache_path,
null,
$loader,
@@ -57,7 +56,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
)
);
$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $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->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
}
}