UIMacros: uses getParameter()

dg · dg · commit 9dbfd533cdc1 · 2016-05-09T17:38:20.000+02:00
diff --git a/src/Bridges/ApplicationLatte/UIMacros.php b/src/Bridges/ApplicationLatte/UIMacros.php
@@ -63,8 +63,8 @@ public function finalize()
 		return [
 			'if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return;',
 			'',
-			$this->extends ? '' : '$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
-				? $this->params["_control"]->findLayoutTemplateFile() : NULL);',
+			$this->extends ? '' : '$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter
+				? $this->getParameter("_control")->findLayoutTemplateFile() : NULL);',
 		];
 	}
 
@@ -132,7 +132,7 @@ public function macroExtends(MacroNode $node, PhpWriter $writer)
 		if ($node->modifiers || $node->parentNode || $node->args !== 'auto') {
 			return FALSE;
 		}
-		return $writer->write('$this->parentName = $this->params["_presenter"]->findLayoutTemplateFile();');
+		return $writer->write('$this->parentName = $this->getParameter("_presenter")->findLayoutTemplateFile();');
 	}
 
 
diff --git a/tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.alt.phtml b/tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.alt.phtml
@@ -31,8 +31,8 @@ class Template%a% extends Latte\Template
 	function prepare()
 	{
 		extract($this->params);
-		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
-		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter
+		? $this->getParameter("_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
@@ -27,8 +27,8 @@ class Template%a% extends Latte\Template
 	function prepare()
 	{
 		extract($this->params);
-		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
-		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter
+		? $this->getParameter("_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
@@ -43,8 +43,8 @@ class Template%a% extends Latte\Template
 	function prepare()
 	{
 		extract($this->params);
-		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
-		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter
+		? $this->getParameter("_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
@@ -49,8 +49,8 @@ class Template%a% extends Latte\Template
 	function prepare()
 	{
 		extract($this->params);
-		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter
-		? $this->params["_control"]->findLayoutTemplateFile() : NULL);
+		$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter
+		? $this->getParameter("_control")->findLayoutTemplateFile() : NULL);
 		return get_defined_vars();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ public function finalize()`
`63`	`63`	`return [`
`64`	`64`	`'if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->blockQueue)) return;',`
`65`	`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);',`
	`66`	`+ $this->extends ? '' : '$this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter`
	`67`	`+ ? $this->getParameter("_control")->findLayoutTemplateFile() : NULL);',`
`68`	`68`	`];`
`69`	`69`	`}`
`70`	`70`
`@@ -132,7 +132,7 @@ public function macroExtends(MacroNode $node, PhpWriter $writer)`
`132`	`132`	`if ($node->modifiers \|\| $node->parentNode \|\| $node->args !== 'auto') {`
`133`	`133`	`return FALSE;`
`134`	`134`	`}`
`135`		`- return $writer->write('$this->parentName = $this->params["_presenter"]->findLayoutTemplateFile();');`
	`135`	`+ return $writer->write('$this->parentName = $this->getParameter("_presenter")->findLayoutTemplateFile();');`
`136`	`136`	`}`
`137`	`137`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ class Template%a% extends Latte\Template`
`31`	`31`	`function prepare()`
`32`	`32`	`{`
`33`	`33`	`extract($this->params);`
`34`		`- $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
`35`		`- ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`34`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter`
	`35`	`+ ? $this->getParameter("_control")->findLayoutTemplateFile() : NULL);`
`36`	`36`	`return get_defined_vars();`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ class Template%a% extends Latte\Template`
`27`	`27`	`function prepare()`
`28`	`28`	`{`
`29`	`29`	`extract($this->params);`
`30`		`- $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
`31`		`- ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`30`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter`
	`31`	`+ ? $this->getParameter("_control")->findLayoutTemplateFile() : NULL);`
`32`	`32`	`return get_defined_vars();`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ class Template%a% extends Latte\Template`
`43`	`43`	`function prepare()`
`44`	`44`	`{`
`45`	`45`	`extract($this->params);`
`46`		`- $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
`47`		`- ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`46`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter`
	`47`	`+ ? $this->getParameter("_control")->findLayoutTemplateFile() : NULL);`
`48`	`48`	`return get_defined_vars();`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ class Template%a% extends Latte\Template`
`49`	`49`	`function prepare()`
`50`	`50`	`{`
`51`	`51`	`extract($this->params);`
`52`		`- $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->params["_control"] instanceof Nette\Application\UI\Presenter`
`53`		`- ? $this->params["_control"]->findLayoutTemplateFile() : NULL);`
	`52`	`+ $this->parentName = $this->parentName ?: ($this->blocks && !$this->getReferringTemplate() && $this->getParameter("_control") instanceof Nette\Application\UI\Presenter`
	`53`	`+ ? $this->getParameter("_control")->findLayoutTemplateFile() : NULL);`
`54`	`54`	`return get_defined_vars();`
`55`	`55`	`}`
`56`	`56`