Merge pull request #27 from matej21/fix/snippets_includeblock

Snippets: do not render snippets from template which is included using includeblock macro

Author: dg

src/Bridges/ApplicationLatte/UIMacros.php

@@ -47,7 +47,7 @@ public function finalize()
 	{
 		$prolog = '
 // snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode)) {
+if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
 	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
 }';
 		return [$prolog, ''];

tests/Bridges.Latte/UIMacros.renderSnippets4.phpt

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Test: UIMacros and renderSnippets with blocks included using includeblock
+ */
+
+use Nette\Bridges\ApplicationLatte\UIMacros;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class TestPresenter extends Nette\Application\UI\Presenter
+{
+
+	public function render()
+	{
+		$latte = new Latte\Engine;
+		UIMacros::install($latte->getCompiler());
+		$params['_control'] = $this;
+		$latte->render(__DIR__ . '/templates/snippets.includeblock.latte', $params);
+	}
+}
+
+
+$presenter = new TestPresenter;
+$presenter->snippetMode = TRUE;
+$presenter->redrawControl();
+$presenter->render();
+Assert::same([
+	'snippets' => [
+		'snippet--test' => 'bar',
+	],
+], (array) $presenter->payload);

tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.alt.phtml

@@ -41,7 +41,7 @@ if ($_l->extends) { ob_start(function () {});}
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
 
 // snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode)) {
+if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
 	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
 }
 

tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.phtml

@@ -31,7 +31,7 @@ if ($_l->extends) { ob_start(function () {});}
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
 
 // snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode)) {
+if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
 	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
 }
 

tests/Bridges.Latte/expected/UIMacros.snippet.alt.phtml

@@ -38,7 +38,7 @@ if ($_l->extends) { ob_start(function () {});}
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
 
 // snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode)) {
+if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
 	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
 }
 

tests/Bridges.Latte/templates/snippets.includeblock.latte

@@ -0,0 +1,6 @@
+{extends "snippets.includeblock.layout.latte"}
+{includeblock "snippets.includeblock.sub.latte"}
+{includeblock "snippets.includeblock.sub2.latte"}
+{snippet test}
+{include #bar}
+{/snippet}

tests/Bridges.Latte/templates/snippets.includeblock.layout.latte

@@ -0,0 +1 @@
+{block bar}bar{/block}