TexyNode: fixed compatibility with Latte 3.0.14

dg · Mar 19, 2024 · 21f9138 · 21f9138
1 parent bb922d4
commit 21f9138
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -16,9 +16,12 @@
 	"require-dev": {
 		"nette/tester": "^2.0",
 		"tracy/tracy": "^2.4",
-		"latte/latte": "^2.6 || ^3.0.2",
+		"latte/latte": "^2.6 || ^3.0.14",
 		"phpstan/phpstan": "^0.12"
 	},
+	"conflict": {
+		"latte/latte": ">=3.0.0 <3.0.14"
+	},
 	"replace": {
 		"dg/texy": "*"
 	},

diff --git a/src/Bridges/Latte/TexyNode.php b/src/Bridges/Latte/TexyNode.php
@@ -38,7 +38,7 @@ public static function create(Tag $tag, TemplateParser $parser, callable $proces
 
 		$lexer = $parser->getLexer();
 		$savedC = $parser->getContentType();
-		$savedD = [$lexer->openDelimiter, $lexer->closeDelimiter];
+		$syntax = false;
 
 		$node = new static;
 		$node->args = $tag->parser->parseArguments();
@@ -47,6 +47,7 @@ public static function create(Tag $tag, TemplateParser $parser, callable $proces
 			if ($arg->key instanceof IdentifierNode && $arg->key->name === 'syntax') {
 				array_splice($node->args->items, $i, 1);
 				$lexer->setSyntax(NodeHelpers::toValue($arg->value), $tag->name);
+				$syntax = true;
 				break;
 			}
 		}
@@ -56,7 +57,9 @@ public static function create(Tag $tag, TemplateParser $parser, callable $proces
 		[$node->content] = yield;
 
 		$parser->setContentType($savedC);
-		[$lexer->openDelimiter, $lexer->closeDelimiter] = $savedD;
+		if ($syntax) {
+			$lexer->popSyntax();
+		}
 
 		$text = NodeHelpers::toText($node->content);
 		if ($text !== null) {