Merge pull request #3162 from nickvergessen/ticket/13359

[ticket/13359] Add phpbb\template\twig\environment to template constructor
This commit is contained in:
Marc Alexander 2014-11-22 09:39:05 +01:00
commit ece3ebc61b

View file

@ -15,6 +15,12 @@ require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree
{
/** @var \phpbb\path_helper */
protected $phpbb_path_helper;
/** @var string */
protected $parent_template_path;
protected function setup_engine(array $new_config = array())
{
global $phpbb_root_path, $phpEx, $user;
@ -34,11 +40,32 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$this->template_path = $this->test_path . '/templates';
$this->parent_template_path = $this->test_path . '/parent_templates';
$container = new phpbb_mock_container_builder();
$cache_path = $phpbb_root_path . 'cache/twig';
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$twig = new \phpbb\template\twig\environment(
$config,
$this->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(
$this->phpbb_path_helper,
$config,
$user,
new phpbb\template\context(),
$context,
$twig,
$cache_path,
array(new \phpbb\template\twig\extension($context, $this->user)),
new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
array(
@ -50,6 +77,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
)
)
);
$container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
}