compatibility with latte/latte 3.0

Author: dg

composer.json

@@ -29,15 +29,15 @@
 		"nette/forms": "^3.0",
 		"nette/robot-loader": "^2.4.2 || ^3.0",
 		"nette/security": "^3.0",
-		"latte/latte": "^2.4.3",
+		"latte/latte": "^3.0",
 		"tracy/tracy": "^2.4",
 		"mockery/mockery": "^1.0"
 	},
 	"conflict": {
 		"nette/nette": "<2.2",
 		"nette/di": "<2.4",
 		"nette/forms": "<3.0",
-		"nette/latte": "<2.4"
+		"nette/latte": "<3.0"
 	},
 	"autoload": {
 		"classmap": ["src/"],

src/Bridges/ApplicationLatte/SnippetBridge.php

@@ -35,39 +35,39 @@ public function __construct(Control $control)
 	}
 
 
-	public function isSnippetMode()
+	public function isSnippetMode(): bool
 	{
-		return $this->control->snippetMode;
+		return (bool) $this->control->snippetMode;
 	}
 
 
-	public function setSnippetMode($snippetMode)
+	public function setSnippetMode(bool $snippetMode)
 	{
 		$this->control->snippetMode = $snippetMode;
 	}
 
 
-	public function needsRedraw($name)
+	public function needsRedraw(string $name): bool
 	{
 		return $this->control->isControlInvalid($name);
 	}
 
 
-	public function markRedrawn($name)
+	public function markRedrawn(string $name): void
 	{
 		if ($name !== '') {
 			$this->control->redrawControl($name, FALSE);
 		}
 	}
 
 
-	public function getHtmlId($name)
+	public function getHtmlId(string $name): string
 	{
 		return $this->control->getSnippetId($name);
 	}
 
 
-	public function addSnippet($name, $content)
+	public function addSnippet(string $name, string $content): void
 	{
 		if ($this->payload === NULL) {
 			$this->payload = $this->control->getPresenter()->getPayload();
@@ -76,7 +76,7 @@ public function addSnippet($name, $content)
 	}
 
 
-	public function renderChildren()
+	public function renderChildren(): void
 	{
 		$queue = [$this->control];
 		do {

tests/Bridges.Latte/UIMacros.control.phpt

@@ -18,11 +18,11 @@ UIMacros::install($compiler);
 
 // {control ...}
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->render(); ?>',  $compiler->expandMacro('control', 'form', '')->openingCode);
-Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->render(); echo call_user_func($this->filters->filter, %a%); ?>',  $compiler->expandMacro('control', 'form', 'filter')->openingCode);
+Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->render(); echo ($this->filters->filter)(%a%); ?>',  $compiler->expandMacro('control', 'form', 'filter')->openingCode);
 Assert::match('<?php %a% if (is_object($form)) %a% else %a% $this->global->uiControl->getComponent($form); %a%->render(); ?>',  $compiler->expandMacro('control', '$form', '')->openingCode);
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->renderType(); ?>',  $compiler->expandMacro('control', 'form:type', '')->openingCode);
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->{"render$type"}(); ?>',  $compiler->expandMacro('control', 'form:$type', '')->openingCode);
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->renderType(\'param\'); ?>',  $compiler->expandMacro('control', 'form:type param', '')->openingCode);
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->renderType([\'param\' => 123]); ?>',  $compiler->expandMacro('control', 'form:type param => 123', '')->openingCode);
 Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->renderType([\'param\' => 123]); ?>',  $compiler->expandMacro('control', 'form:type, param => 123', '')->openingCode);
-Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->render(); echo call_user_func($this->filters->striptags, %a%); ?>',  $compiler->expandMacro('control', 'form', 'striptags')->openingCode);
+Assert::match('<?php %a% $this->global->uiControl->getComponent("form"); %a%->render(); echo ($this->filters->striptags)(%a%); ?>',  $compiler->expandMacro('control', 'form', 'striptags')->openingCode);

tests/Bridges.Latte/UIMacros.link.phpt

@@ -19,7 +19,7 @@ UIMacros::install($compiler);
 
 // {link ...}
 Assert::same('<?php echo $this->global->uiControl->link("p") ?>',  $compiler->expandMacro('link', 'p', '')->openingCode);
-Assert::same('<?php echo call_user_func($this->filters->filter, $this->global->uiControl->link("p")) ?>',  $compiler->expandMacro('link', 'p', 'filter')->openingCode);
+Assert::same('<?php echo ($this->filters->filter)($this->global->uiControl->link("p")) ?>',  $compiler->expandMacro('link', 'p', 'filter')->openingCode);
 Assert::same('<?php echo $this->global->uiControl->link("p:a") ?>',  $compiler->expandMacro('link', 'p:a', '')->openingCode);
 Assert::same('<?php echo $this->global->uiControl->link($dest) ?>',  $compiler->expandMacro('link', '$dest', '')->openingCode);
 Assert::same('<?php echo $this->global->uiControl->link($p:$a) ?>',  $compiler->expandMacro('link', '$p:$a', '')->openingCode);