PhpWriter: fixed invalid code for ternary [Closes #210]

nette · Jan 14, 2020 · 8e1ae5f · 8e1ae5f
1 parent bdf2d8d
commit 8e1ae5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
@@ -254,7 +254,7 @@ public function shortTernaryPass(MacroTokens $tokens): MacroTokens
 		$inTernary = $tmp = [];
 		$errors = 0;
 		while ($tokens->nextToken()) {
-			if ($tokens->isCurrent('?') && $tokens->isNext() && !$tokens->isNext(':', ',', ')', ']', '|')) {
+			if ($tokens->isCurrent('?') && $tokens->isNext() && !$tokens->isNext(',', ')', ']', '|')) {
 				$inTernary[] = $tokens->depth;
 				$tmp[] = $tokens->isNext('[');
 

diff --git a/tests/Latte/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt
@@ -63,6 +63,8 @@ test(function () { // short ternary operators
 	Assert::same("'a'?", formatArgs('a?')); // value must exists
 	Assert::same('$a ?(1) : null', formatArgs('$a?(1)')); // with braces
 	Assert::same('$a ? \Foo::BAR : null', formatArgs('$a ? \Foo::BAR'));
+	Assert::same('$c ?: ($a ?: $b)', formatArgs('$c ?: ($a ?: $b)'));
+	Assert::same('$c ? ($a ?: $b) : null', formatArgs('$c ? ($a ?: $b)'));
 });