Browse Source

Merge pull request #4733 from cakephp/3.0-extract-cache

Removing magic cache prefix as APP_DIR is always src
Mark Story 11 years ago
parent
commit
5e8ef1500d

+ 0 - 4
src/Cache/Engine/ApcEngine.php

@@ -16,7 +16,6 @@ namespace Cake\Cache\Engine;
 
 use APCIterator;
 use Cake\Cache\CacheEngine;
-use Cake\Utility\Inflector;
 
 /**
  * APC storage engine for cache
@@ -41,9 +40,6 @@ class ApcEngine extends CacheEngine {
  * @return bool True if the engine has been successfully initialized, false if not
  */
 	public function init(array $config = []) {
-		if (!isset($config['prefix'])) {
-			$config['prefix'] = Inflector::slug(APP_DIR) . '_';
-		}
 		parent::init($config);
 		return function_exists('apc_dec');
 	}

+ 0 - 5
src/Cache/Engine/MemcachedEngine.php

@@ -15,7 +15,6 @@
 namespace Cake\Cache\Engine;
 
 use Cake\Cache\CacheEngine;
-use Cake\Utility\Inflector;
 use InvalidArgumentException;
 use Memcached;
 
@@ -102,10 +101,6 @@ class MemcachedEngine extends CacheEngine {
 			return false;
 		}
 
-		if (!isset($config['prefix'])) {
-			$config['prefix'] = Inflector::slug(APP_DIR) . '_';
-		}
-
 		$this->_serializers = [
 			'igbinary' => Memcached::SERIALIZER_IGBINARY,
 			'json' => Memcached::SERIALIZER_JSON,

+ 0 - 4
src/Cache/Engine/WincacheEngine.php

@@ -15,7 +15,6 @@
 namespace Cake\Cache\Engine;
 
 use Cake\Cache\CacheEngine;
-use Cake\Utility\Inflector;
 
 /**
  * Wincache storage engine for cache
@@ -41,9 +40,6 @@ class WincacheEngine extends CacheEngine {
  * @return bool True if the engine has been successfully initialized, false if not
  */
 	public function init(array $config = []) {
-		if (!isset($config['prefix'])) {
-			$config['prefix'] = Inflector::slug(APP_DIR) . '_';
-		}
 		parent::init($config);
 		return function_exists('wincache_ucache_info');
 	}

+ 0 - 4
src/Cache/Engine/XcacheEngine.php

@@ -15,7 +15,6 @@
 namespace Cake\Cache\Engine;
 
 use Cake\Cache\CacheEngine;
-use Cake\Utility\Inflector;
 
 /**
  * Xcache storage engine for cache
@@ -58,9 +57,6 @@ class XcacheEngine extends CacheEngine {
  */
 	public function init(array $config = []) {
 		if (php_sapi_name() !== 'cli') {
-			if (!isset($config['prefix'])) {
-				$config['prefix'] = Inflector::slug(APP_DIR) . '_';
-			}
 			parent::init($config);
 			return function_exists('xcache_info');
 		}