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

Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632

2 files changed, 5 insertions, 8 deletions

diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index e2a2ac2261..2c67b38641 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -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');
 	}
 }
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 8eea11e84f..a0e980621d 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -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');
 	}