Template: blocks initialization moved to BlockMacrosRuntime

nette · Apr 28, 2016 · 87a79a9 · 87a79a9
1 parent 273a3f8
commit 87a79a9
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 19 deletions.
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
@@ -88,7 +88,7 @@ public function finalize()
 			}
 			$compiler->addProperty('blocks', array_merge_recursive($functions, $this->blockTypes));
 
-			$prolog = 'Latte\Macros\BlockMacrosRuntime::initialize($this)';
+			$prolog = 'Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)';
 			if (!$this->namedBlocks) {
 				$epilog = 'if (Latte\Macros\BlockMacrosRuntime::progress($this, get_defined_vars())) return;';
 			}

diff --git a/src/Latte/Macros/BlockMacrosRuntime.php b/src/Latte/Macros/BlockMacrosRuntime.php
@@ -22,8 +22,13 @@ class BlockMacrosRuntime
 	/**
 	 * @return void
 	 */
-	public static function initialize(Latte\Template $template)
+	public static function initialize(Latte\Template $template, \stdClass $blocks)
 	{
+		foreach ($template->blocks as $name => $info) {
+			$blocks->blocks[$name][] = [$template, $info[0]];
+			self::checkType($info[1], $blocks->types, $name);
+		}
+
 		if ($template->params['_l']->extends = $template->getExtends()) {
 			ob_start(function () {});
 		}

diff --git a/src/Latte/Template.php b/src/Latte/Template.php
@@ -28,9 +28,6 @@ class Template
 	/** @var Filters */
 	protected $filters;
 
-	/** @var array */
-	protected $blocks = [];
-
 
 	public function __construct(Engine $engine, Filters $filters, $name)
 	{
@@ -77,10 +74,6 @@ public function initialize($contentType)
 		} else {
 			$block = new \stdClass;
 		}
-		foreach ($this->blocks as $name => $info) {
-			$block->blocks[$name][] = [$this, $info[0]];
-			Macros\BlockMacrosRuntime::checkType($info[1], $block->types, $name);
-		}
 
 		// global storage
 		if (!isset($this->params['_g'])) {

diff --git a/tests/Latte/expected/macros.defineblock.phtml b/tests/Latte/expected/macros.defineblock.phtml
@@ -12,7 +12,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template
 ?>

diff --git a/tests/Latte/expected/macros.dynamicblock.phtml b/tests/Latte/expected/macros.dynamicblock.phtml
@@ -12,7 +12,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template
 $var = 10 ?>

diff --git a/tests/Latte/expected/macros.general.html.phtml b/tests/Latte/expected/macros.general.html.phtml
@@ -16,7 +16,7 @@ class Template%a% extends Latte\Template
 list($_b, $_g, $_l) = $this->initialize('html')
 ;
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template
 ?>

diff --git a/tests/Latte/expected/macros.general.xhtml.phtml b/tests/Latte/expected/macros.general.xhtml.phtml
@@ -16,7 +16,7 @@ class Template%a% extends Latte\Template
 list($_b, $_g, $_l) = $this->initialize('xhtml')
 ;
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template
 ?>

diff --git a/tests/Latte/expected/macros.includeblock.inc.phtml b/tests/Latte/expected/macros.includeblock.inc.phtml
@@ -12,7 +12,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template
 if (Latte\Macros\BlockMacrosRuntime::progress($this, get_defined_vars())) return;

diff --git a/tests/Latte/expected/macros.inheritance.child1.child.phtml b/tests/Latte/expected/macros.inheritance.child1.child.phtml
@@ -13,7 +13,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template ?>
 

diff --git a/tests/Latte/expected/macros.inheritance.child1.parent.phtml b/tests/Latte/expected/macros.inheritance.child1.parent.phtml
@@ -17,7 +17,7 @@ class Template%a% extends Latte\Template
 list($_b, $_g, $_l) = $this->initialize('html')
 ;
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template
 extract(['class' => NULL, 'namespace' => NULL, 'top' => TRUE], EXTR_SKIP) ?>

diff --git a/tests/Latte/expected/macros.inheritance.child2.phtml b/tests/Latte/expected/macros.inheritance.child2.phtml
@@ -14,7 +14,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template ?>
 

diff --git a/tests/Latte/expected/macros.inheritance.child5.phtml b/tests/Latte/expected/macros.inheritance.child5.phtml
@@ -12,7 +12,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template ?>
 

diff --git a/tests/Latte/expected/macros.inheritance.child6.phtml b/tests/Latte/expected/macros.inheritance.child6.phtml
@@ -11,7 +11,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Latte\Macros\BlockMacros
-Latte\Macros\BlockMacrosRuntime::initialize($this)
+Latte\Macros\BlockMacrosRuntime::initialize($this, $_b)
 ;
 // main template ?>
 This should be erased