Merge remote-tracking branch 'p/ticket/10685' into develop

* p/ticket/10685:
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.

2 files changed, 13 insertions, 5 deletions

diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index b637166ba6..6987ae6c73 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -62,9 +62,12 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
 		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
 	}
 
-	protected function setup_engine()
+	protected function setup_engine(array $new_config = array())
 	{
-		global $phpbb_root_path, $phpEx, $config, $user;
+		global $phpbb_root_path, $phpEx, $user;
+
+		$defaults = $this->config_defaults();
+		$config = new phpbb_config(array_merge($defaults, $new_config));
 
 		$this->template_path = dirname(__FILE__) . '/templates';
 		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index a78837516b..5b60785fee 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -46,15 +46,20 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		return str_replace("\n\n", "\n", implode("\n", array_map('trim', explode("\n", trim($result)))));
 	}
 
-	protected function setup_engine(array $new_config = array())
+	protected function config_defaults()
 	{
-		global $phpbb_root_path, $phpEx, $user;
-
 		$defaults = array(
 			'load_tplcompile'	=> true,
 			'tpl_allow_php'		=> false,
 		);
+		return $defaults;
+	}
+
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx, $user;
 
+		$defaults = $this->config_defaults();
 		$config = new phpbb_config(array_merge($defaults, $new_config));
 
 		$this->template_path = dirname(__FILE__) . '/templates';