CacheMacros: uses Latte provider 'cacheStorage' (and 'cacheStack')

Author: dg

src/Bridges/CacheLatte/CacheMacro.php

@@ -40,7 +40,7 @@ public function initialize()
 	public function finalize()
 	{
 		if ($this->used) {
-			return ['Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this, $this->global);'];
+			return ['Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);'];
 		}
 	}
 
@@ -57,7 +57,7 @@ public function nodeOpened(Latte\MacroNode $node)
 		$this->used = TRUE;
 		$node->isEmpty = FALSE;
 		$node->openingCode = Latte\PhpWriter::using($node)
-			->write('<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, %var, $this->global->caches, %node.array?)) { ?>',
+			->write('<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($this->global->cacheStorage, %var, $this->global->cacheStack, %node.array?)) { ?>',
 				Nette\Utils\Random::generate()
 			);
 	}
@@ -69,7 +69,7 @@ public function nodeOpened(Latte\MacroNode $node)
 	 */
 	public function nodeClosed(Latte\MacroNode $node)
 	{
-		$node->closingCode = '<?php $_tmp = array_pop($this->global->caches); if (!$_tmp instanceof stdClass) $_tmp->end(); } ?>';
+		$node->closingCode = '<?php $_tmp = array_pop($this->global->cacheStack); if (!$_tmp instanceof stdClass) $_tmp->end(); } ?>';
 	}
 
 
@@ -79,12 +79,12 @@ public function nodeClosed(Latte\MacroNode $node)
 	/**
 	 * @return void
 	 */
-	public static function initRuntime(Latte\Template $template, $global)
+	public static function initRuntime(Latte\Template $template)
 	{
-		if (!empty($global->caches)) {
+		if (!empty($template->global->cacheStack)) {
 			$file = (new \ReflectionClass($template))->getFileName();
 			if (@is_file($file)) { // @ - may trigger error
-				end($global->caches)->dependencies[Cache::FILES][] = $file;
+				end($template->global->cacheStack)->dependencies[Cache::FILES][] = $file;
 			}
 		}
 	}

tests/Bridges.DI/CacheExtension.phpt

@@ -16,9 +16,9 @@ test(function () {
 	$compiler = new DI\Compiler;
 	$compiler->addExtension('cache', new CacheExtension(TEMP_DIR));
 
-	eval($compiler->compile([], 'Container1'));
+	eval($compiler->compile());
 
-	$container = new Container1;
+	$container = new Container;
 	$container->initialize();
 
 	$journal = $container->getService('cache.journal');

tests/Bridges.Latte/CacheMacro.cache.phpt

@@ -14,8 +14,8 @@ require __DIR__ . '/../bootstrap.php';
 $latte = new Latte\Engine;
 $latte->setTempDirectory(TEMP_DIR);
 $latte->addMacro('cache', new CacheMacro($latte->getCompiler()));
+$latte->addProvider('cacheStorage', new Nette\Caching\Storages\DevNullStorage);
 
-$params['netteCacheStorage'] = new Nette\Caching\Storages\DevNullStorage;
 $params['title'] = 'Hello';
 $params['id'] = 456;
 

tests/Bridges.Latte/expected/CacheMacro.cache.inc.phtml

@@ -8,14 +8,14 @@ class Template%a% extends Latte\Template
 	{
 %A%
 		// prolog Nette\Bridges\CacheLatte\CacheMacro
-		Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this, $this->global);
+		Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);
 
 %A%
-		if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, '%[\w]+%', $this->global->caches)) {
+		if (Nette\Bridges\CacheLatte\CacheMacro::createCache($this->global->cacheStorage, '%[\w]+%', $this->global->cacheStack)) {
 			?>	<?php echo %a% ?>
 
 <?php
-			$_tmp = array_pop($this->global->caches);
+			$_tmp = array_pop($this->global->cacheStack);
 			if (!$_tmp instanceof stdClass) $_tmp->end();
 		}
 

tests/Bridges.Latte/expected/CacheMacro.cache.phtml

@@ -8,21 +8,21 @@ class Template%a% extends Latte\Template
 	{
 %A%
 		// prolog Nette\Bridges\CacheLatte\CacheMacro
-		Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this, $this->global);
+		Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);
 
 %A%
 Noncached content
 
 %A%
-		if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, '%[\w]+%', $this->global->caches, [$id, 'tags' => 'mytag'])) {
+		if (Nette\Bridges\CacheLatte\CacheMacro::createCache($this->global->cacheStorage, '%[\w]+%', $this->global->cacheStack, [$id, 'tags' => 'mytag'])) {
 			?>
 
 <h1><?php echo %a% ?></h1>
 
-<?php $this->createTemplate('include.cache.latte', ['localvar' => 11] + $this->params, "include", 'html')->render() ?>
+<?php $this->createTemplate('include.cache.latte', ['localvar' => 11] + $this->params, "include")->renderToContentType('html') ?>
 
 <?php
-			$_tmp = array_pop($this->global->caches);
+			$_tmp = array_pop($this->global->cacheStack);
 			if (!$_tmp instanceof stdClass) $_tmp->end();
 		}