exception handler can throw exception [Closes #307]

nette · Nov 8, 2023 · dfb3f3f · dfb3f3f
1 parent 520178e
commit dfb3f3f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/src/Latte/Essential/Nodes/TryNode.php b/src/Latte/Essential/Nodes/TryNode.php
@@ -46,12 +46,11 @@ public function print(PrintContext $context): string
 				try %line {
 					%node
 				} catch (Throwable $ʟ_e) {
-					ob_end_clean();
+					ob_clean();
 					if (!($ʟ_e instanceof Latte\Essential\RollbackException) && isset($this->global->coreExceptionHandler)) {
 						($this->global->coreExceptionHandler)($ʟ_e, $this);
 					}
 					%node
-					ob_start();
 				} finally {
 					echo ob_get_clean();
 					$iterator = $ʟ_it = $ʟ_try[%0.dump][0];

diff --git a/src/Latte/Sandbox/Nodes/SandboxNode.php b/src/Latte/Sandbox/Nodes/SandboxNode.php
@@ -44,15 +44,15 @@ public function print(PrintContext $context): string
 				ob_start(fn() => '');
 				try {
 					$this->createTemplate(%node, %node, 'sandbox')->renderToContentType(%dump) %line;
-					echo ob_get_clean();
 				} catch (\Throwable $ʟ_e) {
 					if (isset($this->global->coreExceptionHandler)) {
-						ob_end_clean();
+						ob_clean();
 						($this->global->coreExceptionHandler)($ʟ_e, $this);
 					} else {
-						echo ob_get_clean();
 						throw $ʟ_e;
 					}
+				} finally {
+					echo ob_get_clean();
 				}
 
 

diff --git a/tests/sandbox/exceptionHandler.phpt b/tests/sandbox/exceptionHandler.phpt
@@ -44,3 +44,10 @@ Assert::match(
 );
 Assert::type(Latte\SecurityViolationException::class, $args[0]);
 Assert::type(Latte\Runtime\Template::class, $args[1]);
+
+
+$latte->setExceptionHandler(fn(Throwable $e) => throw $e);
+Assert::exception(
+	fn() => $latte->renderToString('main'),
+	Latte\SecurityViolationException::class,
+);
diff --git a/tests/tags/expected/general.n-attributes.php b/tests/tags/expected/general.n-attributes.php
@@ -323,11 +323,10 @@ public function main(array $ʟ_args): void
 			echo "\n";
 
 		} catch (Throwable $ʟ_e) {
-			ob_end_clean();
+			ob_clean();
 			if (!($ʟ_e instanceof Latte\Essential\RollbackException) && isset($this->global->coreExceptionHandler)) {
 				($this->global->coreExceptionHandler)($ʟ_e, $this);
 			}
-			ob_start();
 		} finally {
 			echo ob_get_clean();
 			$iterator = $ʟ_it = $ʟ_try[6][0];

diff --git a/tests/tags/expected/try.php b/tests/tags/expected/try.php
@@ -10,14 +10,13 @@
 ';
 
 		} catch (Throwable $ʟ_e) {
-			ob_end_clean();
+			ob_clean();
 			if (!($ʟ_e instanceof Latte\Essential\RollbackException) && isset($this->global->coreExceptionHandler)) {
 				($this->global->coreExceptionHandler)($ʟ_e, $this);
 			}
 			echo '	c
 ';
 
-			ob_start();
 		} finally {
 			echo ob_get_clean();
 			$iterator = $ʟ_it = $ʟ_try[0][0];

diff --git a/tests/tags/try.handler.phpt b/tests/tags/try.handler.phpt
@@ -40,6 +40,20 @@ Assert::type(CustomException::class, $args[0]);
 Assert::type(Latte\Runtime\Template::class, $args[1]);
 
 
+Assert::exception(
+	fn() => $latte->renderToString('{try}{=error()}{else}{=error()}{/try}'),
+	CustomException::class,
+);
+
+
 $args = null;
 $latte->renderToString('{try}{rollback}{/try}');
 Assert::null($args);
+
+
+$latte->setExceptionHandler(fn(Throwable $e) => throw $e);
+
+Assert::exception(
+	fn() => $latte->renderToString('{try}{=error()}{/try}'),
+	CustomException::class,
+);