UIMacros: source of parent name is $parentName property instead of getParentName()

dg · dg · commit 5d63a8de0d9c · 2016-05-05T21:22:28.000+02:00
diff --git a/src/Bridges/ApplicationLatte/UIMacros.php b/src/Bridges/ApplicationLatte/UIMacros.php
@@ -24,6 +24,9 @@
  */
 class UIMacros extends Latte\Macros\MacroSet
 {
+	/** @var bool */
+	private $extends;
+
 
 	public static function install(Latte\Compiler $compiler)
 	{
@@ -47,10 +50,7 @@ public static function install(Latte\Compiler $compiler)
 	 */
 	public function initialize()
 	{
-		$this->getCompiler()->addMethod('getParentName', '
-		return $this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
-			? $this->params["_control"]->findLayoutTemplateFile() : NULL;
-		');
+		$this->extends = FALSE;
 	}
 
 
@@ -60,7 +60,12 @@ public function initialize()
 	 */
 	public function finalize()
 	{
-		return ['if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return; $template = $this->params["template"];', ''];
+		return [
+			'if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return; $template = $this->params["template"];',
+			'',
+			$this->extends ? '' : '$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
+				? $this->params["_control"]->findLayoutTemplateFile() : NULL);',
+		];
 	}
 
 
@@ -123,10 +128,11 @@ 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;
 		}
-		$this->getCompiler()->addMethod('getParentName', 'return $this->params["_presenter"]->findLayoutTemplateFile();');
+		return $writer->write('$this->parentName = $this->params["_presenter"]->findLayoutTemplateFile();');
 	}
 
 
diff --git a/tests/Bridges.Latte/Template.getParentName().phpt b/tests/Bridges.Latte/Template.getParentName().phpt
@@ -24,46 +24,54 @@ $template = $latte->createTemplate(
 	'',
 	['_control' => new MockPresenter]
 );
+$template->prepare();
 Assert::null($template->getParentName());
 
 $template = $latte->createTemplate(
 	'{block}...{/block}',
 	['_control' => new MockPresenter]
 );
+$template->prepare();
 Assert::null($template->getParentName());
 
 $template = $latte->createTemplate(
 	'{block name}...{/block}',
 	['_control' => new MockPresenter]
 );
+$template->prepare();
 Assert::same('layout.latte', $template->getParentName());
 
 $template = $latte->createTemplate(
 	'{extends "file.latte"} {block name}...{/block}',
 	['_control' => new MockPresenter]
 );
+$template->prepare();
 Assert::same('file.latte', $template->getParentName());
 
 $template = $latte->createTemplate(
 	'{extends "file.latte"}',
 	['_control' => new MockPresenter]
 );
+$template->prepare();
 Assert::same('file.latte', $template->getParentName());
 
 $template = $latte->createTemplate(
 	'{extends $file} {block name}...{/block}',
 	['_control' => new MockPresenter, 'file' => 'file.latte']
 );
+$template->prepare();
 Assert::same('file.latte', $template->getParentName());
 
 $template = $latte->createTemplate(
 	'{extends none}',
 	['_control' => new MockPresenter]
 );
+$template->prepare();
 Assert::null($template->getParentName());
 
 $template = $latte->createTemplate(
 	'{extends auto}',
 	['_presenter' => new MockPresenter]
 );
+$template->prepare();
 Assert::same('layout.latte', $template->getParentName());
diff --git a/tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.alt.phtml b/tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.alt.phtml
@@ -29,9 +29,12 @@ class Template%a% extends Latte\Template
 	}
 
 
-	function getParentName()
+	function prepare()
 	{
-		%A%
+		extract($this->params);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
+		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		return get_defined_vars();
 	}
 
 
diff --git a/tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.phtml b/tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.phtml
@@ -25,9 +25,12 @@ class Template%a% extends Latte\Template
 	}
 
 
-	function getParentName()
+	function prepare()
 	{
-		%A%
+		extract($this->params);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
+		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		return get_defined_vars();
 	}
 
 
diff --git a/tests/Bridges.Latte/expected/UIMacros.snippet.alt.phtml b/tests/Bridges.Latte/expected/UIMacros.snippet.alt.phtml
@@ -41,9 +41,12 @@ class Template%a% extends Latte\Template
 	}
 
 
-	function getParentName()
+	function prepare()
 	{
-		%A%
+		extract($this->params);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
+		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		return get_defined_vars();
 	}
 
 
diff --git a/tests/Bridges.Latte/expected/UIMacros.snippet.phtml b/tests/Bridges.Latte/expected/UIMacros.snippet.phtml
@@ -47,9 +47,12 @@ class Template%a% extends Latte\Template
 	}
 
 
-	function getParentName()
+	function prepare()
 	{
-		%A%
+		extract($this->params);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
+		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		return get_defined_vars();
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@`
`24`	`24`	`*/`
`25`	`25`	`class UIMacros extends Latte\Macros\MacroSet`
`26`	`26`	`{`
	`27`	`+ /** @var bool */`
	`28`	`+ private $extends;`
	`29`	`+`
`27`	`30`
`28`	`31`	`public static function install(Latte\Compiler $compiler)`
`29`	`32`	`{`
`@@ -47,10 +50,7 @@ public static function install(Latte\Compiler $compiler)`
`47`	`50`	`*/`
`48`	`51`	`public function initialize()`
`49`	`52`	`{`
`50`		`- $this->getCompiler()->addMethod('getParentName', '`
`51`		`- return $this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
`52`		`- ? $this->params["_control"]->findLayoutTemplateFile() : NULL;`
`53`		`- ');`
	`53`	`+ $this->extends = FALSE;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`
`@@ -60,7 +60,12 @@ public function initialize()`
`60`	`60`	`*/`
`61`	`61`	`public function finalize()`
`62`	`62`	`{`
`63`		`- return ['if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return; $template = $this->params["template"];', ''];`
	`63`	`+ return [`
	`64`	`+ 'if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return; $template = $this->params["template"];',`
	`65`	`+ '',`
	`66`	`+ $this->extends ? '' : '$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
	`67`	`+ ? $this->params["_control"]->findLayoutTemplateFile() : NULL);',`
	`68`	`+ ];`
`64`	`69`	`}`
`65`	`70`
`66`	`71`
`@@ -123,10 +128,11 @@ public function macroIfCurrent(MacroNode $node, PhpWriter $writer)`
`123`	`128`	`*/`
`124`	`129`	`public function macroExtends(MacroNode $node, PhpWriter $writer)`
`125`	`130`	`{`
	`131`	`+ $this->extends = TRUE;`
`126`	`132`	`if ($node->modifiers \|\| $node->parentNode \|\| $node->args !== 'auto') {`
`127`	`133`	`return FALSE;`
`128`	`134`	`}`
`129`		`- $this->getCompiler()->addMethod('getParentName', 'return $this->params["_presenter"]->findLayoutTemplateFile();');`
	`135`	`+ return $writer->write('$this->parentName = $this->params["_presenter"]->findLayoutTemplateFile();');`
`130`	`136`	`}`
`131`	`137`
`132`	`138`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,12 @@ class Template%a% extends Latte\Template`
`29`	`29`	`}`
`30`	`30`
`31`	`31`
`32`		`- function getParentName()`
	`32`	`+ function prepare()`
`33`	`33`	`{`
`34`		`- %A%`
	`34`	`+ extract($this->params);`
	`35`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
	`36`	`+ ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`37`	`+ return get_defined_vars();`
`35`	`38`	`}`
`36`	`39`
`37`	`40`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,12 @@ class Template%a% extends Latte\Template`
`25`	`25`	`}`
`26`	`26`
`27`	`27`
`28`		`- function getParentName()`
	`28`	`+ function prepare()`
`29`	`29`	`{`
`30`		`- %A%`
	`30`	`+ extract($this->params);`
	`31`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
	`32`	`+ ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`33`	`+ return get_defined_vars();`
`31`	`34`	`}`
`32`	`35`
`33`	`36`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,12 @@ class Template%a% extends Latte\Template`
`41`	`41`	`}`
`42`	`42`
`43`	`43`
`44`		`- function getParentName()`
	`44`	`+ function prepare()`
`45`	`45`	`{`
`46`		`- %A%`
	`46`	`+ extract($this->params);`
	`47`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
	`48`	`+ ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`49`	`+ return get_defined_vars();`
`47`	`50`	`}`
`48`	`51`
`49`	`52`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,12 @@ class Template%a% extends Latte\Template`
`47`	`47`	`}`
`48`	`48`
`49`	`49`
`50`		`- function getParentName()`
	`50`	`+ function prepare()`
`51`	`51`	`{`
`52`		`- %A%`
	`52`	`+ extract($this->params);`
	`53`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
	`54`	`+ ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`55`	`+ return get_defined_vars();`
`53`	`56`	`}`
`54`	`57`
`55`	`58`