Compiler::writeAttrsMacro() better exception messages for empty macros

nette · Apr 26, 2016 · 7b72549 · 7b72549
1 parent 3f53a79
commit 7b72549
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Latte/Compiler.php b/src/Latte/Compiler.php
@@ -510,7 +510,9 @@ public function writeAttrsMacro($html)
 					};
 				} else {
 					array_unshift($right, function () use ($name, $attrs, $attrName) {
-						$this->openMacro($name, $attrs[$attrName], NULL, NULL, MacroNode::PREFIX_INNER);
+						if ($this->openMacro($name, $attrs[$attrName], NULL, NULL, MacroNode::PREFIX_INNER)->isEmpty) {
+							throw new CompileException("Unable to use empty macro as n:$attrName.");
+						}
 					});
 				}
 				unset($attrs[$attrName]);
@@ -521,7 +523,9 @@ public function writeAttrsMacro($html)
 			$attrName = MacroNode::PREFIX_TAG . "-$name";
 			if (isset($attrs[$attrName])) {
 				$left[] = function () use ($name, $attrs, $attrName) {
-					$this->openMacro($name, $attrs[$attrName], NULL, NULL, MacroNode::PREFIX_TAG);
+					if ($this->openMacro($name, $attrs[$attrName], NULL, NULL, MacroNode::PREFIX_TAG)->isEmpty) {
+						throw new CompileException("Unable to use empty macro as n:$attrName.");
+					}
 				};
 				array_unshift($right, function () use ($name) {
 					$this->closeMacro($name, '', NULL, NULL, MacroNode::PREFIX_TAG);

diff --git a/tests/Latte/Compiler.macro.empty.phpt b/tests/Latte/Compiler.macro.empty.phpt
@@ -56,8 +56,8 @@ Assert::match(
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<div n:inner-one>@</div>');
-}, 'Latte\CompileException', 'Unexpected </div> for n:inner-one');
+}, 'Latte\CompileException', 'Unable to use empty macro as n:inner-one.');
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<div n:tag-one>@</div>');
-}, 'Latte\CompileException', 'Unexpected </div> for n:tag-one');
+}, 'Latte\CompileException', 'Unable to use empty macro as n:tag-one.');