CacheMacro: refactoring

Author: dg

src/Bridges/CacheLatte/CacheMacro.php

@@ -8,6 +8,7 @@
 namespace Nette\Bridges\CacheLatte;
 
 use Nette;
+use Nette\Caching\Cache;
 use Latte;
 
 
@@ -39,7 +40,7 @@ public function initialize()
 	public function finalize()
 	{
 		if ($this->used) {
-			return ['Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this, $_g);'];
+			return ['Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);'];
 		}
 	}
 
@@ -56,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, $_g->caches, %node.array?)) { ?>',
+			->write('<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, %var, $this->global->caches, %node.array?)) { ?>',
 				Nette\Utils\Random::generate()
 			);
 	}
@@ -68,7 +69,7 @@ public function nodeOpened(Latte\MacroNode $node)
 	 */
 	public function nodeClosed(Latte\MacroNode $node)
 	{
-		$node->closingCode = '<?php $_l->tmp = array_pop($_g->caches); if (!$_l->tmp instanceof stdClass) $_l->tmp->end(); } ?>';
+		$node->closingCode = '<?php $_tmp = array_pop($this->global->caches); if (!$_tmp instanceof stdClass) $_tmp->end(); } ?>';
 	}
 
 
@@ -78,10 +79,10 @@ public function nodeClosed(Latte\MacroNode $node)
 	/**
 	 * @return void
 	 */
-	public static function initRuntime(Latte\Template $template, \stdClass $global)
+	public static function initRuntime(Latte\Template $template)
 	{
-		if (!empty($global->caches) && $template->getEngine()->getLoader() instanceof Latte\Loaders\FileLoader) {
-			end($global->caches)->dependencies[Nette\Caching\Cache::FILES][] = $template->getName();
+		if (!empty($template->global->caches) && $template->getEngine()->getLoader() instanceof Latte\Loaders\FileLoader) {
+			end($template->global->caches)->dependencies[Nette\Caching\Cache::FILES][] = $template->getName();
 		}
 	}
 
@@ -103,10 +104,10 @@ public static function createCache(Nette\Caching\IStorage $cacheStorage, $key, &
 			$key = array_merge([$key], array_intersect_key($args, range(0, count($args))));
 		}
 		if ($parents) {
-			end($parents)->dependencies[Nette\Caching\Cache::ITEMS][] = $key;
+			end($parents)->dependencies[Cache::ITEMS][] = $key;
 		}
 
-		$cache = new Nette\Caching\Cache($cacheStorage, 'Nette.Templating.Cache');
+		$cache = new Cache($cacheStorage, 'Nette.Templating.Cache');
 		if ($helper = $cache->start($key)) {
 			if (isset($args['dependencies'])) {
 				$args += call_user_func($args['dependencies']);
@@ -115,8 +116,8 @@ public static function createCache(Nette\Caching\IStorage $cacheStorage, $key, &
 				$args['expiration'] = $args['expire']; // back compatibility
 			}
 			$helper->dependencies = [
-				Nette\Caching\Cache::TAGS => isset($args['tags']) ? $args['tags'] : NULL,
-				Nette\Caching\Cache::EXPIRATION => isset($args['expiration']) ? $args['expiration'] : '+ 7 days',
+				$cache::TAGS => isset($args['tags']) ? $args['tags'] : NULL,
+				$cache::EXPIRATION => isset($args['expiration']) ? $args['expiration'] : '+ 7 days',
 			];
 			$parents[] = $helper;
 		}

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

@@ -8,16 +8,16 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\CacheLatte\CacheMacro
-Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this, $_g);
+Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);
 
 // main template
 ?>
 <p>Included file (<?php echo LFilters::escapeHtmlText($localvar) ?>)</p>
 
-<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, '%[\w]+%', $_g->caches)) { ?>
+<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, '%[\w]+%', $this->global->caches)) { ?>
 	<?php echo LFilters::escapeHtmlText(call_user_func($this->filters->lower, $title)) ?>
 
-<?php $_l->tmp = array_pop($_g->caches); if (!$_l->tmp instanceof stdClass) $_l->tmp->end(); }
+<?php $_tmp = array_pop($this->global->caches); if (!$_tmp instanceof stdClass) $_tmp->end(); }
 	}
 
 }

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

@@ -8,19 +8,19 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\CacheLatte\CacheMacro
-Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this, $_g);
+Nette\Bridges\CacheLatte\CacheMacro::initRuntime($this);
 
 // main template
 ?>
 Noncached content
 
-<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, '%[\w]+%', $_g->caches, [$id, 'tags' => 'mytag'])) { ?>
+<?php if (Nette\Bridges\CacheLatte\CacheMacro::createCache($netteCacheStorage, '%[\w]+%', $this->global->caches, [$id, 'tags' => 'mytag'])) { ?>
 
 <h1><?php echo LFilters::escapeHtmlText(call_user_func($this->filters->upper, $title)) ?></h1>
 
-<?php $this->createChild('include.cache.latte', ['localvar' => 11] + $this->params, "include")->render() ?>
+<?php $this->createTemplate('include.cache.latte', ['localvar' => 11] + $this->params, "include", 'html')->render() ?>
 
-<?php $_l->tmp = array_pop($_g->caches); if (!$_l->tmp instanceof stdClass) $_l->tmp->end(); }
+<?php $_tmp = array_pop($this->global->caches); if (!$_tmp instanceof stdClass) $_tmp->end(); }
 	}
 
 }