aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-04-24 21:18:18 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-04-24 21:18:18 -0400
commita2c75f60537ccf6a424c7f066eafbffc13c0c38d (patch)
treeffb6dbac52bbb4fd3fc8eca94450ac4d9e7387ab /tests/template
parent81962d1d8ff083dd366c77e7d3858fd2c9ed7d43 (diff)
downloadforums-a2c75f60537ccf6a424c7f066eafbffc13c0c38d.tar
forums-a2c75f60537ccf6a424c7f066eafbffc13c0c38d.tar.gz
forums-a2c75f60537ccf6a424c7f066eafbffc13c0c38d.tar.bz2
forums-a2c75f60537ccf6a424c7f066eafbffc13c0c38d.tar.xz
forums-a2c75f60537ccf6a424c7f066eafbffc13c0c38d.zip
[feature/template-engine] Deleted $template from phpbb_template_compile class.
phpbb_template_compile is now much simpler. It takes complete file paths as inputs, either source template path or source template path and output compiled template path. The number of methods also went down to two - compile template and returned compiled text or compile and write to file. phpbb_compile class is responsible for determining source and compiled paths. It already had all the data necessary for this, now the code is in the same place as the data it uses. PHPBB3-9726
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/template_test.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index a7c49927f1..e549c9a0c8 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -275,7 +275,7 @@ class phpbb_template_template_test extends phpbb_test_case
$this->template->set_filenames(array('test' => $filename));
$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
- $expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path . '/../') . '/templates/' . $filename);
+ $expecting = sprintf('_source_file_for_handle(): File %s does not exist', realpath($this->template_path . '/../') . '/templates/' . $filename);
$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
$this->display('test');
@@ -530,4 +530,3 @@ EOT
}
}
-