UIMacros: initialization moved to UIRuntime::initialize()

Author: dg

src/Bridges/ApplicationLatte/UIMacros.php

@@ -45,12 +45,7 @@ public static function install(Latte\Compiler $compiler)
 	 */
 	public function finalize()
 	{
-		$prolog = '
-// snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}';
-		return [$prolog, ''];
+		return ['if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $_b)) return;', ''];
 	}
 
 

src/Bridges/ApplicationLatte/UIRuntime.php

@@ -9,6 +9,7 @@
 
 use Nette;
 use Nette\Application\UI;
+use Latte;
 
 
 /**
@@ -19,6 +20,21 @@ class UIRuntime
 {
 	use Nette\StaticClass;
 
+
+	/**
+	 * @return bool
+	 */
+	public static function initialize(Latte\Template $template, \stdClass $blocks = NULL)
+	{
+		// snippet support
+		$params = $template->params;
+		if (empty($params['_l']->extends) && !empty($params['_control']->snippetMode) && empty($params['_g']->includingBlock)) {
+			self::renderSnippets($params['_control'], $blocks, $params);
+			return TRUE;
+		};
+	}
+
+
 	public static function renderSnippets(UI\Control $control, \stdClass $local = NULL, array $params = [])
 	{
 		$control->snippetMode = FALSE;

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

@@ -13,11 +13,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $_b)) return;
 
 // main template
 if (Latte\Macros\BlockMacrosRuntime::progress($this, get_defined_vars())) return ?>

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

@@ -12,11 +12,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $_b)) return;
 
 // main template
 if (Latte\Macros\BlockMacrosRuntime::progress($this, get_defined_vars())) return ?>

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

@@ -14,11 +14,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $_b)) return;
 
 // main template
 ?>	<div class="test"<?php echo ' id="' . $_control->getSnippetId('outer') . '"' ?>>

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

@@ -16,11 +16,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $_b)) return;
 
 // main template
 ?>