Merge pull request #133 from matej21/fix/variabletemplate

Latte bridge: fixed missing $template variable

Author: dg

src/Bridges/ApplicationLatte/UIMacros.php

@@ -60,7 +60,7 @@ public function initialize()
 	 */
 	public function finalize()
 	{
-		return ['if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return;', ''];
+		return ['if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return; $template = $this->params["template"];', ''];
 	}
 
 

tests/Bridges.Latte/VariableTemplate.phpt

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * VariableTemplate
+ */
+
+use Nette\Bridges\ApplicationLatte\UIMacros;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class TestPresenter extends Nette\Application\UI\Presenter
+{
+
+}
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader());
+UIMacros::install($latte->getCompiler());
+Assert::match('3', $latte->renderToString('{$template->length($bar)}', ['bar' => 'aaa', '_control' => new TestPresenter()]));

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

@@ -14,6 +14,7 @@ class Template%a% extends Latte\Template
 %A%
 		// prolog Nette\Bridges\ApplicationLatte\UIMacros
 		if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return;
+		$template = $this->params["template"];
 
 		// main template
 		if ($this->tryRenderParent(get_defined_vars())) return;

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

@@ -13,6 +13,7 @@ class Template%a% extends Latte\Template
 %A%
 		// prolog Nette\Bridges\ApplicationLatte\UIMacros
 		if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return;
+		$template = $this->params["template"];
 
 		// main template
 		if ($this->tryRenderParent(get_defined_vars())) return;

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

@@ -15,6 +15,7 @@ class Template%a% extends Latte\Template
 %A%
 		// prolog Nette\Bridges\ApplicationLatte\UIMacros
 		if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return;
+		$template = $this->params["template"];
 
 		// main template
 		?>	<div class="test"<?php echo ' id="' . $_control->getSnippetId('outer') . '"' ?>>

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

@@ -17,6 +17,7 @@ class Template%a% extends Latte\Template
 %A%
 		// prolog Nette\Bridges\ApplicationLatte\UIMacros
 		if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return;
+		$template = $this->params["template"];
 
 		// main template
 		if ($this->tryRenderParent(get_defined_vars())) return;