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

* p/ticket/10355:
  [ticket/10355] Correctly end output buffering in template tests.

1 files changed, 16 insertions, 2 deletions

diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index e475e4012f..7cf995f194 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -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)