Browse Source

Don't replace engine() with getEngine()

There is no setter for engines, so there is no need for a setter.

Refs #10576
Mark Story 8 years ago
parent
commit
96d46af7d8
2 changed files with 10 additions and 25 deletions
  1. 0 15
      src/Cache/Cache.php
  2. 10 10
      tests/TestCase/Cache/CacheTest.php

+ 0 - 15
src/Cache/Cache.php

@@ -189,26 +189,11 @@ class Cache
      * If the cache engine & configuration are missing an error will be
      * triggered.
      *
-     * @deprecated 3.5 Use getEngine() instead.
      * @param string $config The configuration name you want an engine for.
      * @return \Cake\Cache\CacheEngine When caching is disabled a null engine will be returned.
      */
     public static function engine($config)
     {
-        return static::getEngine($config);
-    }
-
-    /**
-     * Fetch the engine attached to a specific configuration name.
-     *
-     * If the cache engine & configuration are missing an error will be
-     * triggered.
-     *
-     * @param string $config The configuration name you want an engine for.
-     * @return \Cake\Cache\CacheEngine When caching is disabled a null engine will be returned.
-     */
-    public static function getEngine($config)
-    {
         if (!static::$_enabled) {
             return new NullEngine();
         }

+ 10 - 10
tests/TestCase/Cache/CacheTest.php

@@ -89,7 +89,7 @@ class CacheTest extends TestCase
         $this->_configCache();
         Cache::disable();
 
-        $result = Cache::getEngine('tests');
+        $result = Cache::engine('tests');
         $this->assertInstanceOf('Cake\Cache\Engine\NullEngine', $result);
     }
 
@@ -105,7 +105,7 @@ class CacheTest extends TestCase
         Cache::setConfig('tests', [
             'className' => '\StdClass'
         ]);
-        Cache::getEngine('tests');
+        Cache::engine('tests');
     }
 
     /**
@@ -122,7 +122,7 @@ class CacheTest extends TestCase
         Cache::setConfig('tests', [
             'engine' => $mock
         ]);
-        Cache::getEngine('tests');
+        Cache::engine('tests');
     }
 
     /**
@@ -137,12 +137,12 @@ class CacheTest extends TestCase
 
         $config = ['engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_'];
         Cache::setConfig('libEngine', $config);
-        $engine = Cache::getEngine('libEngine');
+        $engine = Cache::engine('libEngine');
         $this->assertInstanceOf('TestApp\Cache\Engine\TestAppCacheEngine', $engine);
 
         $config = ['engine' => 'TestPlugin.TestPluginCache', 'path' => TMP, 'prefix' => 'cake_test_'];
         $result = Cache::setConfig('pluginLibEngine', $config);
-        $engine = Cache::getEngine('pluginLibEngine');
+        $engine = Cache::engine('pluginLibEngine');
         $this->assertInstanceOf('TestPlugin\Cache\Engine\TestPluginCacheEngine', $engine);
 
         Cache::drop('libEngine');
@@ -217,7 +217,7 @@ class CacheTest extends TestCase
         $this->assertNotContains('test', Cache::configured(), 'test config should not exist.');
         Cache::setConfig('tests', $config);
 
-        $engine = Cache::getEngine('tests');
+        $engine = Cache::engine('tests');
         $this->assertInstanceOf('Cake\Cache\Engine\FileEngine', $engine);
         $this->assertContains('tests', Cache::configured());
     }
@@ -232,7 +232,7 @@ class CacheTest extends TestCase
     {
         $config = ['engine' => 'Imaginary'];
         Cache::setConfig('test', $config);
-        Cache::getEngine('test');
+        Cache::engine('test');
     }
 
     /**
@@ -249,7 +249,7 @@ class CacheTest extends TestCase
         Cache::setConfig('test', [
             'engine' => '\RubbishEngine'
         ]);
-        Cache::getEngine('tests');
+        Cache::engine('tests');
     }
 
     /**
@@ -296,7 +296,7 @@ class CacheTest extends TestCase
             'prefix' => 'cache_value_'
         ]);
 
-        $engine = Cache::getEngine('cache.dotted');
+        $engine = Cache::engine('cache.dotted');
         $this->assertContains('cache.dotted', Cache::configured());
         $this->assertNotContains('dotted', Cache::configured());
         $this->assertInstanceOf('Cake\Cache\Engine\FileEngine', $engine);
@@ -411,7 +411,7 @@ class CacheTest extends TestCase
         ]);
         $this->assertInstanceOf(
             'TestApp\Cache\Engine\TestAppCacheEngine',
-            Cache::getEngine('unconfigTest')
+            Cache::engine('unconfigTest')
         );
         $this->assertTrue(Cache::drop('unconfigTest'));
     }