Merge pull request #16 from dg/extension

CacheExtension: used aliases

Author: dg

composer.json

@@ -20,6 +20,7 @@
 	},
 	"require-dev": {
 		"nette/tester": "~1.0",
+		"nette/di": "~2.3",
 		"latte/latte": "~2.2.2"
 	},
 	"conflict": {

src/Bridges/CacheDI/CacheExtension.php

@@ -31,26 +31,18 @@ public function loadConfiguration()
 	{
 		$container = $this->getContainerBuilder();
 
-		$container->addDefinition('nette.cacheJournal')
+		$container->addDefinition($this->prefix('journal'))
 			->setClass('Nette\Caching\Storages\IJournal')
 			->setFactory('Nette\Caching\Storages\FileJournal', array($this->tempDir));
 
-		$container->addDefinition('cacheStorage') // no namespace for back compatibility
+		$container->addDefinition($this->prefix('storage'))
 			->setClass('Nette\Caching\IStorage')
 			->setFactory('Nette\Caching\Storages\FileStorage', array($this->tempDir . '/cache'));
 
-		if (class_exists('Nette\Caching\Storages\PhpFileStorage')) {
-			$container->addDefinition('nette.templateCacheStorage')
-				->setClass('Nette\Caching\Storages\PhpFileStorage', array($this->tempDir . '/cache'))
-				->addSetup('::trigger_error', array('Service templateCacheStorage is deprecated.', E_USER_DEPRECATED))
-				->setAutowired(FALSE);
+		if ($this->name === 'cache') {
+			$container->addAlias('nette.cacheJournal', $this->prefix('journal'));
+			$container->addAlias('cacheStorage', $this->prefix('storage'));
 		}
-
-		$container->addDefinition('nette.cache')
-			->setClass('Nette\Caching\Cache', array(1 => $container::literal('$namespace')))
-			->addSetup('::trigger_error', array('Service cache is deprecated.', E_USER_DEPRECATED))
-			->setParameters(array('namespace' => NULL))
-			->setAutowired(FALSE);
 	}
 
 

tests/Caching.DI/CacheExtension.phpt

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Test: CacheExtension.
+ */
+
+use Nette\DI,
+	Nette\Bridges\CacheDI\CacheExtension,
+	Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test(function() {
+	$compiler = new DI\Compiler;
+	$compiler->addExtension('cache', new CacheExtension(TEMP_DIR));
+
+	eval($compiler->compile(array(), 'Container1'));
+
+	$container = new Container1;
+	$container->initialize();
+
+	$journal = $container->getService('cache.journal');
+	Assert::type('Nette\Caching\Storages\FileJournal', $journal);
+
+	$storage = $container->getService('cache.storage');
+	Assert::type('Nette\Caching\Storages\FileStorage', $storage);
+
+	// aliases
+	Assert::same($journal, $container->getService('nette.cacheJournal'));
+	Assert::same($storage, $container->getService('cacheStorage'));
+});

tests/bootstrap.php

@@ -18,3 +18,9 @@
 define('TEMP_DIR', __DIR__ . '/tmp/' . getmypid());
 @mkdir(dirname(TEMP_DIR)); // @ - directory may already exist
 Tester\Helpers::purge(TEMP_DIR);
+
+
+function test(\Closure $function)
+{
+	$function();
+}