Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Renaming unconfig to drop.

  • Loading branch information...
commit 70820e2e968523aebd30fb67bf091555b4e33a1a 1 parent caedbdf
@markstory markstory authored
Showing with 7 additions and 7 deletions.
  1. +2 −2 cake/libs/cache.php
  2. +5 −5 cake/tests/cases/libs/cache.test.php
View
4 cake/libs/cache.php
@@ -133,14 +133,14 @@ function configured() {
}
/**
- * 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;
View
10 cake/tests/cases/libs/cache.test.php
@@ -90,8 +90,8 @@ function testConfigWithLibAndPluginEngines() {
$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 @@ function testUnconfig() {
'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 @@ function testUnconfig() {
));
$this->assertTrue(Cache::isInitialized('TestAppCache'));
- $this->assertTrue(Cache::unconfig('unconfigTest'));
+ $this->assertTrue(Cache::drop('unconfigTest'));
$this->assertFalse(Cache::isInitialized('TestAppCache'));
Cache::config('tests', $_testsConfig);
Please sign in to comment.
Something went wrong with that request. Please try again.