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

[feature/merging-style-components] Creating style class

Browse Source 
Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin
2012-03-15 13:13:21 +02:00
parent 39944a08b9
commit 3997ffac2a
7 changed files with 106 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/template/template_inheritance_test.php
View File

@@ -71,9 +71,8 @@ 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->template_locator = new phpbb_style_locator();
$this->template_provider = new phpbb_style_path_provider();
$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->template_locator, $this->template_provider);
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
$this->template = $this->style->template;
$this->template->set_custom_template($this->template_path, 'tests', $this->parent_template_path, 'parent');
}
}

8
tests/template/template_test_case.php
View File

@@ -12,10 +12,9 @@ require_once dirname(__FILE__) . '/../mock/extension_manager.php';
class phpbb_template_template_test_case extends phpbb_test_case
{
protected $style;
protected $template;
protected $template_path;
protected $template_locator;
protected $template_provider;
// Keep the contents of the cache for debugging?
const PRESERVE_CACHE = true;
@@ -63,9 +62,8 @@ 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->template_locator = new phpbb_style_locator();
$this->template_provider = new phpbb_style_path_provider();
$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->template_locator, $this->template_provider);
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
$this->template = $this->style->template;
$this->template->set_custom_template($this->template_path, 'tests');
}