diff --git a/cake/libs/cache.php b/cake/libs/cache.php index 46d6af7fc..956832962 100644 --- a/cake/libs/cache.php +++ b/cake/libs/cache.php @@ -133,14 +133,14 @@ class Cache { } /** - * Unconfigures a cache engine. Deletes the cache configuration information + * Drops a cache engine. Deletes the cache configuration information * If the deleted configuration is the last configuration using an certain engine, * the Engine instance is also unset. * * @param string $name A currently configured cache config you wish to remove. * @return boolen success of the removal, returns false when the config does not exist. **/ - function unconfig($name) { + function drop($name) { $_this = Cache::getInstance(); if (!isset($_this->__config[$name])) { return false; diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php index 732dac8aa..c440b0e58 100644 --- a/cake/tests/cases/libs/cache.test.php +++ b/cake/tests/cases/libs/cache.test.php @@ -90,8 +90,8 @@ class CacheTest extends CakeTestCase { $result = Cache::config('pluginLibEngine', $settings); $this->assertEqual($result, Cache::config('pluginLibEngine')); - Cache::unconfig('libEngine'); - Cache::unconfig('pluginLibEngine'); + Cache::drop('libEngine'); + Cache::drop('pluginLibEngine'); App::build(); } @@ -211,11 +211,11 @@ class CacheTest extends CakeTestCase { 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) ), true); - $result = Cache::unconfig('some_config_that_does_not_exist'); + $result = Cache::drop('some_config_that_does_not_exist'); $this->assertFalse($result); $_testsConfig = Cache::config('tests'); - $result = Cache::unconfig('tests'); + $result = Cache::drop('tests'); $this->assertTrue($result); Cache::config('unconfigTest', array( @@ -223,7 +223,7 @@ class CacheTest extends CakeTestCase { )); $this->assertTrue(Cache::isInitialized('TestAppCache')); - $this->assertTrue(Cache::unconfig('unconfigTest')); + $this->assertTrue(Cache::drop('unconfigTest')); $this->assertFalse(Cache::isInitialized('TestAppCache')); Cache::config('tests', $_testsConfig);