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

nette · Jan 14, 2020 · bdf2d8d · bdf2d8d
1 parent 574bba7
commit bdf2d8d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
@@ -302,7 +302,7 @@ public function optionalChainingPass(MacroTokens $tokens): MacroTokens
 
 			do {
 				if ($tokens->nextToken('?')) {
-					if ($tokens->isNext() && (!$tokens->isNext($tokens::T_CHAR) || $tokens->isNext('(', '[', '{', ':', '!', '@'))) {  // is it ternary operator?
+					if ($tokens->isNext() && (!$tokens->isNext($tokens::T_CHAR) || $tokens->isNext('(', '[', '{', ':', '!', '@', '\\'))) {  // is it ternary operator?
 						$expr->append($addBraces . ' ?');
 						break;
 					}

diff --git a/tests/Latte/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt
@@ -62,6 +62,7 @@ test(function () { // short ternary operators
 	Assert::same("fce() ?? 'a'", formatArgs('fce() ?? a')); // null coalesce is ignored
 	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'));
 });
 
 

diff --git a/tests/Latte/PhpWriter.optionalChainingPass().phpt b/tests/Latte/PhpWriter.optionalChainingPass().phpt
@@ -75,4 +75,6 @@ test(function () { // ternary
 	Assert::same('(($_tmp = $a ?? null) === null ? null : $_tmp->foo) ? [1, 2, ([3 ? 2 : 1])] : $b', optionalChaining('$a?->foo ? [1, 2, ([3 ? 2 : 1])] : $b'));
 	Assert::same('(($_tmp = $a ?? null) === null ? null : ($_tmp->foo ?? null)) ? [1, 2, ([3 ? 2 : 1])] : $b', optionalChaining('$a?->foo? ? [1, 2, ([3 ? 2 : 1])] : $b'));
 	Assert::same('($a->foo ?? null) ? [1, 2, ([3 ? 2 : 1])] : $b', optionalChaining('$a->foo? ? [1, 2, ([3 ? 2 : 1])] : $b'));
+
+	Assert::same('$a ? \Foo::BAR : \Foo::BAR', optionalChaining('$a ? \Foo::BAR : \Foo::BAR'));
 });