compatibility with nette/latte v3

Author: dg

composer.json

@@ -22,7 +22,7 @@
 	"require-dev": {
 		"nette/tester": "^2.0",
 		"nette/di": "^2.4 || ~3.0.0",
-		"latte/latte": "^2.4",
+		"latte/latte": "^3.0",
 		"tracy/tracy": "^2.4"
 	},
 	"suggest": {

src/Bridges/CacheLatte/CacheMacro.php

@@ -27,9 +27,8 @@ final class CacheMacro implements Latte\IMacro
 
 	/**
 	 * Initializes before template parsing.
-	 * @return void
 	 */
-	public function initialize()
+	public function initialize(): void
 	{
 		$this->used = false;
 	}
@@ -39,19 +38,16 @@ public function initialize()
 	 * Finishes template parsing.
 	 * @return array(prolog, epilog)
 	 */
-	public function finalize()
+	public function finalize(): ?array
 	{
-		if ($this->used) {
-			return ['Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);'];
-		}
+		return $this->used ? ['Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);'] : null;
 	}
 
 
 	/**
 	 * New node is found.
-	 * @return bool
 	 */
-	public function nodeOpened(Latte\MacroNode $node)
+	public function nodeOpened(Latte\MacroNode $node): ?bool
 	{
 		if ($node->modifiers) {
 			throw new Latte\CompileException('Modifiers are not allowed in ' . $node->getNotation());
@@ -62,14 +58,14 @@ public function nodeOpened(Latte\MacroNode $node)
 			->write('<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($this->global->cacheStorage, %var, $this->global->cacheStack, %node.array?)) { ?>',
 				Nette\Utils\Random::generate()
 			);
+		return null;
 	}
 
 
 	/**
 	 * Node is closed.
-	 * @return void
 	 */
-	public function nodeClosed(Latte\MacroNode $node)
+	public function nodeClosed(Latte\MacroNode $node): void
 	{
 		$node->closingCode = Latte\PhpWriter::using($node)
 			->write('<?php Nette\Bridges\CacheLatte\CacheMacro::endCache($this->global->cacheStack, %node.array?); } ?>');