Easier memcache configuration

* Minimum version of kdyby/doctrine-cache upped to 2.1

composer.json

@@ -18,9 +18,10 @@
 	"require": {
 		"nette/nette": "@dev",
 		"doctrine/orm": "~2.4",
-		"kdyby/events": "@dev",
-		"kdyby/console": "@dev",
-		"kdyby/annotations": "@dev"
+		"kdyby/events": "~2.0",
+		"kdyby/console": "~2.0",
+		"kdyby/annotations": "~2.0",
+		"kdyby/doctrine-cache": "~2.1"
 	},
 	"require-dev": {
 		"nette/tester": "@dev",

src/Kdyby/Doctrine/DI/OrmExtension.php

@@ -114,7 +114,7 @@ class OrmExtension extends Nette\DI\CompilerExtension
 		'default' => 'Kdyby\DoctrineCache\Cache',
 		'apc' => 'Doctrine\Common\Cache\ApcCache',
 		'array' => 'Doctrine\Common\Cache\ArrayCache',
-		'memcache' => 'Doctrine\Common\Cache\MemcacheCache',
+		'memcache' => 'Kdyby\DoctrineCache\MemcacheCache',
 		'redis' => 'Doctrine\Common\Cache\RedisCache',
 		'xcache' => 'Doctrine\Common\Cache\XcacheCache',
 	);
@@ -463,7 +463,7 @@ protected function processMetadataDriver(Nette\DI\ServiceDefinition $metadataDri
 		$serviceName = $this->prefix($prefix . '.driver.' . str_replace('\\', '_', $namespace) . '.' . $impl . 'Impl');
 
 		$this->getContainerBuilder()->addDefinition($serviceName)
-			->setClass($driver->entity)
+			->setClass('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver')
 			->setFactory($driver->entity, $driver->arguments)
 			->setAutowired(FALSE)
 			->setInject(FALSE);
@@ -496,7 +496,7 @@ protected function processCache($cache, $suffix)
 		}
 
 		$def = $builder->addDefinition($serviceName = $this->prefix('cache.' . $suffix))
-			->setClass($cache->entity)
+			->setClass('Doctrine\Common\Cache\Cache')
 			->setFactory($cache->entity, $cache->arguments)
 			->setAutowired(FALSE)
 			->setInject(FALSE);