mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

[feature/merging-style-components] Initializing locator and provider separately

Browse Source 
Moving locator and path provider initialization out of style class

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin
2012-03-31 17:38:30 +03:00
parent 9611997552
commit 360312f599
7 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/template/template_inheritance_test.php
View File

@@ -71,7 +71,9 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
$this->template_path = dirname(__FILE__) . '/templates';
$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
$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->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
$this->template = $this->style->template;
}

6
tests/template/template_test_case.php
View File

@@ -15,6 +15,8 @@ class phpbb_template_template_test_case extends phpbb_test_case
protected $style;
protected $template;
protected $template_path;
protected $style_resource_locator;
protected $style_provider;
// Keep the contents of the cache for debugging?
const PRESERVE_CACHE = true;
@@ -62,7 +64,9 @@ class phpbb_template_template_test_case extends phpbb_test_case
$config = new phpbb_config(array_merge($defaults, $new_config));
$this->template_path = dirname(__FILE__) . '/templates';
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
$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->style->set_custom_style('tests', $this->template_path, '');
$this->template = $this->style->template;
}