mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
[feature/merging-style-components] Moving template initialization out of style
Moving template initialization out of style constructor PHPBB3-10632
This commit is contained in:
@@ -73,8 +73,8 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
|
||||
$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
|
||||
$this->style_resource_locator = new phpbb_style_path_provider();
|
||||
$this->style_provider = new phpbb_style_path_provider();
|
||||
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
|
||||
$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
|
||||
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
|
||||
$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
|
||||
$this->template = $this->style->template;
|
||||
}
|
||||
}
|
||||
|
@@ -66,9 +66,9 @@ class phpbb_template_template_test_case extends phpbb_test_case
|
||||
$this->template_path = dirname(__FILE__) . '/templates';
|
||||
$this->style_resource_locator = new phpbb_style_path_provider();
|
||||
$this->style_provider = new phpbb_style_path_provider();
|
||||
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
|
||||
$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
|
||||
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
|
||||
$this->style->set_custom_style('tests', $this->template_path, '');
|
||||
$this->template = $this->style->template;
|
||||
}
|
||||
|
||||
protected function setUp()
|
||||
|
Reference in New Issue
Block a user