UIMacro: parent template retrieving moved to UIRuntime

Author: dg

src/Bridges/ApplicationLatte/UIMacros.php

@@ -60,13 +60,7 @@ public function initialize()
 	 */
 	public function finalize()
 	{
-		return [
-			'Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this)',
-			'',
-			$this->extends ? '' : '$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate()
-				&& isset($this->global->uiControl) && $this->global->uiControl instanceof Nette\Application\UI\Presenter
-				? $this->global->uiControl->findLayoutTemplateFile() : NULL);',
-		];
+		return [$this->extends . 'Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->parentName, $this->blocks);'];
 	}
 
 
@@ -146,11 +140,10 @@ public function macroIfCurrent(MacroNode $node, PhpWriter $writer)
 	 */
 	public function macroExtends(MacroNode $node, PhpWriter $writer)
 	{
-		$this->extends = TRUE;
 		if ($node->modifiers || $node->parentNode || $node->args !== 'auto') {
-			return FALSE;
+			return $this->extends = FALSE;
 		}
-		return $writer->write('$this->parentName = $this->global->uiPresenter->findLayoutTemplateFile();');
+		$this->extends = $writer->write('$this->parentName = $this->global->uiPresenter->findLayoutTemplateFile();');
 	}
 
 

src/Bridges/ApplicationLatte/UIRuntime.php

@@ -8,7 +8,6 @@
 namespace Nette\Bridges\ApplicationLatte;
 
 use Nette;
-use Nette\Application\UI;
 use Latte;
 
 
@@ -21,19 +20,26 @@ class UIRuntime
 	use Nette\StaticClass;
 
 	/**
-	 * @return bool
+	 * @return void
 	 */
-	public static function initialize(Latte\Runtime\Template $template)
+	public static function initialize(Latte\Runtime\Template $template, & $parentName, array $blocks)
 	{
+		$providers = $template->global;
+		if (!$parentName && $blocks && !$template->getReferringTemplate()
+			&& isset($providers->uiControl) && $providers->uiControl instanceof Nette\Application\UI\Presenter
+		) {
+			$parentName = $providers->uiControl->findLayoutTemplateFile();
+		}
+
 		// back compatiblity
 		$params = $template->getParameters();
-		if (empty($template->global->uiControl) && isset($params['_control'])) {
+		if (empty($providers->uiControl) && isset($params['_control'])) {
 			trigger_error('Replace template variable $_control with provider: $latte->addProvider("uiControl", ...)', E_USER_DEPRECATED);
-			$template->global->uiControl = $params['_control'];
+			$providers->uiControl = $params['_control'];
 		}
-		if (empty($template->global->uiPresenter) && isset($params['_presenter'])) {
+		if (empty($providers->uiPresenter) && isset($params['_presenter'])) {
 			trigger_error('Replace template variable $_presenter with provider: $latte->addProvider("uiPresenter", ...)', E_USER_DEPRECATED);
-			$template->global->uiPresenter = $params['_presenter'];
+			$providers->uiPresenter = $params['_presenter'];
 		}
 	}