tests: compatibility with Latte master

nette · May 18, 2016 · 54c618b · 54c618b
1 parent 9a288ab
commit 54c618b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Bridges/CacheLatte/CacheMacro.php b/src/Bridges/CacheLatte/CacheMacro.php
@@ -52,10 +52,10 @@ public function finalize()
 	public function nodeOpened(Latte\MacroNode $node)
 	{
 		if ($node->modifiers) {
-			throw new Latte\CompileException("Modifiers are not allowed in {{$node->name}}");
+			throw new Latte\CompileException('Modifiers are not allowed in ' . Latte\Helpers::formatNotation($node));
 		}
 		$this->used = TRUE;
-		$node->isEmpty = FALSE;
+		$node->empty = FALSE;
 		$node->openingCode = Latte\PhpWriter::using($node)
 			->write('<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($this->global->cacheStorage, %var, $this->global->cacheStack, %node.array?)) { ?>',
 				Nette\Utils\Random::generate()

diff --git a/tests/Bridges.Latte/expected/CacheMacro.cache.phtml b/tests/Bridges.Latte/expected/CacheMacro.cache.phtml
@@ -15,11 +15,14 @@ Noncached content
 
 %A%
 		if (Nette\Bridges\CacheLatte\CacheMacro::createCache($this->global->cacheStorage, '%[\w]+%', $this->global->cacheStack, [$id, 'tags' => 'mytag'])) {
-			?>
+?>
 
 <h1><?php echo %a% ?></h1>
 
-<?php $this->createTemplate('include.cache.latte', ['localvar' => 11] + $this->params, "include")->renderToContentType('html') ?>
+<?php
+			/* line 7 */
+			$this->createTemplate('include.cache.latte', ['localvar' => 11] + $this->params, "include")->renderToContentType('html');
+?>
 
 <?php
 			$_tmp = array_pop($this->global->cacheStack);