Template: passes the template to the latte instead of just parameters.

Automatically will register methods as latte custom functions
nette · Apr 2, 2020 · 2fd8987 · 2fd8987
1 parent 194891c
commit 2fd8987
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
 	"conflict": {
 		"nette/di": "<3.0-stable",
 		"nette/forms": "<3.0",
-		"latte/latte": "<2.6",
+		"latte/latte": "<2.7.1",
 		"tracy/tracy": "<2.5"
 	},
 	"autoload": {

diff --git a/src/Bridges/ApplicationLatte/Template.php b/src/Bridges/ApplicationLatte/Template.php
@@ -42,7 +42,8 @@ final public function getLatte(): Latte\Engine
 	 */
 	public function render(string $file = null, array $params = []): void
 	{
-		$this->latte->render($file ?: $this->file, $params + $this->getParameters());
+		Nette\Utils\Arrays::toObject($params, $this);
+		$this->latte->render($file ?: $this->file, $this);
 	}
 
 
@@ -51,7 +52,8 @@ public function render(string $file = null, array $params = []): void
 	 */
 	public function renderToString(string $file = null, array $params = []): string
 	{
-		return $this->latte->renderToString($file ?: $this->file, $params + $this->getParameters());
+		Nette\Utils\Arrays::toObject($params, $this);
+		return $this->latte->renderToString($file ?: $this->file, $this);
 	}