makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* p/ticket/10355:
  [ticket/10355] Correctly end output buffering in template tests.
This commit is contained in:
Igor Wiedler 2011-09-05 08:51:17 +02:00
commit 6f9df6199c
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/template/template_test_case.php
View file

@ -21,8 +21,22 @@ class phpbb_template_template_test_case extends phpbb_test_case
protected function display($handle)
{
ob_start();
$this->assertTrue($this->template->display($handle));
return self::trim_template_result(ob_get_clean());
try
{
$this->assertTrue($this->template->display($handle, false));
}
catch (Exception $exception)
{
// reset output buffering even when an error occured
// PHPUnit turns trigger_error into exceptions as well
ob_end_clean();
throw $exception;
}
$result = self::trim_template_result(ob_get_clean());
return $result;
}
protected static function trim_template_result($result)