Fix config deprecations in Cache/

tests/TestCase/Cache/CacheTest.php

@@ -411,6 +411,28 @@ class CacheTest extends TestCase
     /**
      * Test reading configuration.
      *
+     * @group deprecated
+     * @return void
+     */
+    public function testConfigReadCompat()
+    {
+        $this->deprecated(function () {
+            $config = [
+                'engine' => 'File',
+                'path' => TMP,
+                'prefix' => 'cake_'
+            ];
+            Cache::config('tests', $config);
+            $expected = $config;
+            $expected['className'] = $config['engine'];
+            unset($expected['engine']);
+            $this->assertEquals($expected, Cache::config('tests'));
+        });
+    }
+
+    /**
+     * Test reading configuration.
+     *
      * @return void
      */
     public function testConfigRead()
@@ -424,7 +446,7 @@ class CacheTest extends TestCase
         $expected = $config;
         $expected['className'] = $config['engine'];
         unset($expected['engine']);
-        $this->assertEquals($expected, Cache::config('tests'));
+        $this->assertEquals($expected, Cache::getConfig('tests'));
     }
 
     /**
@@ -453,7 +475,7 @@ class CacheTest extends TestCase
     public function testGroupConfigs()
     {
         Cache::drop('test');
-        Cache::config('latest', [
+        Cache::setConfig('latest', [
             'duration' => 300,
             'engine' => 'File',
             'groups' => ['posts', 'comments'],
@@ -470,7 +492,7 @@ class CacheTest extends TestCase
         $result = Cache::groupConfigs('posts');
         $this->assertEquals(['posts' => ['latest']], $result);
 
-        Cache::config('page', [
+        Cache::setConfig('page', [
             'duration' => 86400,
             'engine' => 'File',
             'groups' => ['posts', 'archive'],
@@ -706,7 +728,7 @@ class CacheTest extends TestCase
         Cache::clear(false, 'test_cache_disable_1');
 
         Cache::disable();
-        Cache::config('test_cache_disable_2', [
+        Cache::setConfig('test_cache_disable_2', [
             'engine' => 'File',
             'path' => TMP . 'tests'
         ]);
@@ -734,11 +756,11 @@ class CacheTest extends TestCase
      */
     public function testClearAll()
     {
-        Cache::config('configTest', [
+        Cache::setConfig('configTest', [
             'engine' => 'File',
             'path' => TMP . 'tests'
         ]);
-        Cache::config('anotherConfigTest', [
+        Cache::setConfig('anotherConfigTest', [
             'engine' => 'File',
             'path' => TMP . 'tests'
         ]);

tests/TestCase/Cache/Engine/FileEngineTest.php

@@ -65,7 +65,7 @@ class FileEngineTest extends TestCase
             'path' => TMP . 'tests',
         ];
         Cache::drop('file_test');
-        Cache::config('file_test', array_merge($defaults, $config));
+        Cache::setConfig('file_test', array_merge($defaults, $config));
     }
 
     /**
@@ -331,7 +331,7 @@ class FileEngineTest extends TestCase
      */
     public function testRemoveWindowsSlashesFromCache()
     {
-        Cache::config('windows_test', [
+        Cache::setConfig('windows_test', [
             'engine' => 'File',
             'isWindows' => true,
             'prefix' => null,
@@ -388,7 +388,7 @@ class FileEngineTest extends TestCase
         $this->assertSame(Cache::read('App.singleQuoteTest', 'file_test'), "'this is a quoted string'");
 
         Cache::drop('file_test');
-        Cache::config('file_test', [
+        Cache::setConfig('file_test', [
             'className' => 'File',
             'isWindows' => true,
             'path' => TMP . 'tests'
@@ -412,7 +412,7 @@ class FileEngineTest extends TestCase
         $dir = TMP . 'tests/autocreate-' . microtime(true);
 
         Cache::drop('file_test');
-        Cache::config('file_test', [
+        Cache::setConfig('file_test', [
             'engine' => 'File',
             'path' => $dir
         ]);
@@ -435,7 +435,7 @@ class FileEngineTest extends TestCase
         $dir = TMP . 'tests/autocreate-' . microtime(true);
 
         Cache::drop('file_test');
-        Cache::config('file_test', [
+        Cache::setConfig('file_test', [
             'engine' => 'File',
             'path' => $dir
         ]);
@@ -457,7 +457,7 @@ class FileEngineTest extends TestCase
         if (DS === '\\') {
             $this->markTestSkipped('File permission testing does not work on Windows.');
         }
-        Cache::config('mask_test', ['engine' => 'File', 'path' => TMP . 'tests']);
+        Cache::setConfig('mask_test', ['engine' => 'File', 'path' => TMP . 'tests']);
         $data = 'This is some test content';
         $write = Cache::write('masking_test', $data, 'mask_test');
         $result = substr(sprintf('%o', fileperms(TMP . 'tests/cake_masking_test')), -4);
@@ -466,7 +466,7 @@ class FileEngineTest extends TestCase
         Cache::delete('masking_test', 'mask_test');
         Cache::drop('mask_test');
 
-        Cache::config('mask_test', ['engine' => 'File', 'mask' => 0666, 'path' => TMP . 'tests']);
+        Cache::setConfig('mask_test', ['engine' => 'File', 'mask' => 0666, 'path' => TMP . 'tests']);
         Cache::write('masking_test', $data, 'mask_test');
         $result = substr(sprintf('%o', fileperms(TMP . 'tests/cake_masking_test')), -4);
         $expected = '0666';
@@ -474,7 +474,7 @@ class FileEngineTest extends TestCase
         Cache::delete('masking_test', 'mask_test');
         Cache::drop('mask_test');
 
-        Cache::config('mask_test', ['engine' => 'File', 'mask' => 0644, 'path' => TMP . 'tests']);
+        Cache::setConfig('mask_test', ['engine' => 'File', 'mask' => 0644, 'path' => TMP . 'tests']);
         Cache::write('masking_test', $data, 'mask_test');
         $result = substr(sprintf('%o', fileperms(TMP . 'tests/cake_masking_test')), -4);
         $expected = '0644';
@@ -482,7 +482,7 @@ class FileEngineTest extends TestCase
         Cache::delete('masking_test', 'mask_test');
         Cache::drop('mask_test');
 
-        Cache::config('mask_test', ['engine' => 'File', 'mask' => 0640, 'path' => TMP . 'tests']);
+        Cache::setConfig('mask_test', ['engine' => 'File', 'mask' => 0640, 'path' => TMP . 'tests']);
         Cache::write('masking_test', $data, 'mask_test');
         $result = substr(sprintf('%o', fileperms(TMP . 'tests/cake_masking_test')), -4);
         $expected = '0640';
@@ -498,7 +498,7 @@ class FileEngineTest extends TestCase
      */
     public function testGroupsReadWrite()
     {
-        Cache::config('file_groups', [
+        Cache::setConfig('file_groups', [
             'engine' => 'File',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b']
@@ -517,7 +517,7 @@ class FileEngineTest extends TestCase
      */
     public function testClearingWithRepeatWrites()
     {
-        Cache::config('repeat', [
+        Cache::setConfig('repeat', [
             'engine' => 'File',
             'groups' => ['users']
         ]);
@@ -547,7 +547,7 @@ class FileEngineTest extends TestCase
      */
     public function testGroupDelete()
     {
-        Cache::config('file_groups', [
+        Cache::setConfig('file_groups', [
             'engine' => 'File',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b']
@@ -566,17 +566,17 @@ class FileEngineTest extends TestCase
      */
     public function testGroupClear()
     {
-        Cache::config('file_groups', [
+        Cache::setConfig('file_groups', [
             'engine' => 'File',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b']
         ]);
-        Cache::config('file_groups2', [
+        Cache::setConfig('file_groups2', [
             'engine' => 'File',
             'duration' => 3600,
             'groups' => ['group_b']
         ]);
-        Cache::config('file_groups3', [
+        Cache::setConfig('file_groups3', [
             'engine' => 'File',
             'duration' => 3600,
             'groups' => ['group_b'],
@@ -609,7 +609,7 @@ class FileEngineTest extends TestCase
      */
     public function testGroupClearNoPrefix()
     {
-        Cache::config('file_groups', [
+        Cache::setConfig('file_groups', [
             'className' => 'File',
             'duration' => 3600,
             'prefix' => '',

tests/TestCase/Cache/Engine/MemcachedEngineTest.php

@@ -58,7 +58,7 @@ class MemcachedEngineTest extends TestCase
             'duration' => 3600
         ];
         Cache::drop('memcached');
-        Cache::config('memcached', array_merge($defaults, $config));
+        Cache::setConfig('memcached', array_merge($defaults, $config));
     }
 
     /**
@@ -85,7 +85,7 @@ class MemcachedEngineTest extends TestCase
      */
     public function testConfig()
     {
-        $config = Cache::engine('memcached')->config();
+        $config = Cache::engine('memcached')->getConfig();
         unset($config['path']);
         $expecting = [
             'prefix' => 'cake_',
@@ -386,7 +386,7 @@ class MemcachedEngineTest extends TestCase
         $Memcached = new MemcachedEngine();
         $Memcached->init(['engine' => 'Memcached', 'servers' => $servers]);
 
-        $config = $Memcached->config();
+        $config = $Memcached->getConfig();
         $this->assertEquals($config['servers'], $servers);
         Cache::drop('dual_server');
     }
@@ -648,7 +648,7 @@ class MemcachedEngineTest extends TestCase
      */
     public function testDecrementCompressedKeys()
     {
-        Cache::config('compressed_memcached', [
+        Cache::setConfig('compressed_memcached', [
             'engine' => 'Memcached',
             'duration' => '+2 seconds',
             'servers' => ['127.0.0.1:11211'],
@@ -725,7 +725,7 @@ class MemcachedEngineTest extends TestCase
      */
     public function testIncrementCompressedKeys()
     {
-        Cache::config('compressed_memcached', [
+        Cache::setConfig('compressed_memcached', [
             'engine' => 'Memcached',
             'duration' => '+2 seconds',
             'servers' => ['127.0.0.1:11211'],
@@ -757,12 +757,12 @@ class MemcachedEngineTest extends TestCase
      */
     public function testConfigurationConflict()
     {
-        Cache::config('long_memcached', [
+        Cache::setConfig('long_memcached', [
             'engine' => 'Memcached',
             'duration' => '+3 seconds',
             'servers' => ['127.0.0.1:11211'],
         ]);
-        Cache::config('short_memcached', [
+        Cache::setConfig('short_memcached', [
             'engine' => 'Memcached',
             'duration' => '+2 seconds',
             'servers' => ['127.0.0.1:11211'],
@@ -792,7 +792,7 @@ class MemcachedEngineTest extends TestCase
      */
     public function testClear()
     {
-        Cache::config('memcached2', [
+        Cache::setConfig('memcached2', [
             'engine' => 'Memcached',
             'prefix' => 'cake2_',
             'duration' => 3600
@@ -836,13 +836,13 @@ class MemcachedEngineTest extends TestCase
      */
     public function testGroupReadWrite()
     {
-        Cache::config('memcached_groups', [
+        Cache::setConfig('memcached_groups', [
             'engine' => 'Memcached',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b'],
             'prefix' => 'test_'
         ]);
-        Cache::config('memcached_helper', [
+        Cache::setConfig('memcached_helper', [
             'engine' => 'Memcached',
             'duration' => 3600,
             'prefix' => 'test_'
@@ -868,7 +868,7 @@ class MemcachedEngineTest extends TestCase
      */
     public function testGroupDelete()
     {
-        Cache::config('memcached_groups', [
+        Cache::setConfig('memcached_groups', [
             'engine' => 'Memcached',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b']
@@ -887,7 +887,7 @@ class MemcachedEngineTest extends TestCase
      */
     public function testGroupClear()
     {
-        Cache::config('memcached_groups', [
+        Cache::setConfig('memcached_groups', [
             'engine' => 'Memcached',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b']

tests/TestCase/Cache/Engine/RedisEngineTest.php

@@ -72,7 +72,7 @@ class RedisEngineTest extends TestCase
             'duration' => 3600
         ];
         Cache::drop('redis');
-        Cache::config('redis', array_merge($defaults, $config));
+        Cache::setConfig('redis', array_merge($defaults, $config));
     }
 
     /**
@@ -82,7 +82,7 @@ class RedisEngineTest extends TestCase
      */
     public function testConfig()
     {
-        $config = Cache::engine('redis')->config();
+        $config = Cache::engine('redis')->getConfig();
         $expecting = [
             'prefix' => 'cake_',
             'duration' => 3600,
@@ -107,11 +107,11 @@ class RedisEngineTest extends TestCase
      */
     public function testConfigDsn()
     {
-        Cache::config('redis_dsn', [
+        Cache::setConfig('redis_dsn', [
             'url' => 'redis://localhost:6379?database=1&prefix=redis_'
         ]);
 
-        $config = Cache::engine('redis_dsn')->config();
+        $config = Cache::engine('redis_dsn')->getConfig();
         $expecting = [
             'prefix' => 'redis_',
             'duration' => 3600,
@@ -140,7 +140,7 @@ class RedisEngineTest extends TestCase
     public function testConnect()
     {
         $Redis = new RedisEngine();
-        $this->assertTrue($Redis->init(Cache::engine('redis')->config()));
+        $this->assertTrue($Redis->init(Cache::engine('redis')->getConfig()));
     }
 
     /**
@@ -150,14 +150,14 @@ class RedisEngineTest extends TestCase
      */
     public function testMultiDatabaseOperations()
     {
-        Cache::config('redisdb0', [
+        Cache::setConfig('redisdb0', [
             'engine' => 'Redis',
             'prefix' => 'cake2_',
             'duration' => 3600,
             'persistent' => false,
         ]);
 
-        Cache::config('redisdb1', [
+        Cache::setConfig('redisdb1', [
             'engine' => 'Redis',
             'database' => 1,
             'prefix' => 'cake2_',
@@ -388,7 +388,7 @@ class RedisEngineTest extends TestCase
      */
     public function testClear()
     {
-        Cache::config('redis2', [
+        Cache::setConfig('redis2', [
             'engine' => 'Redis',
             'prefix' => 'cake2_',
             'duration' => 3600
@@ -432,13 +432,13 @@ class RedisEngineTest extends TestCase
      */
     public function testGroupReadWrite()
     {
-        Cache::config('redis_groups', [
+        Cache::setConfig('redis_groups', [
             'engine' => 'Redis',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b'],
             'prefix' => 'test_'
         ]);
-        Cache::config('redis_helper', [
+        Cache::setConfig('redis_helper', [
             'engine' => 'Redis',
             'duration' => 3600,
             'prefix' => 'test_'
@@ -464,7 +464,7 @@ class RedisEngineTest extends TestCase
      */
     public function testGroupDelete()
     {
-        Cache::config('redis_groups', [
+        Cache::setConfig('redis_groups', [
             'engine' => 'Redis',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b']
@@ -483,7 +483,7 @@ class RedisEngineTest extends TestCase
      */
     public function testGroupClear()
     {
-        Cache::config('redis_groups', [
+        Cache::setConfig('redis_groups', [
             'engine' => 'Redis',
             'duration' => 3600,
             'groups' => ['group_a', 'group_b']

tests/TestCase/Cache/Engine/XcacheEngineTest.php

@@ -37,7 +37,7 @@ class XcacheEngineTest extends TestCase
             $this->markTestSkipped('Xcache is not installed or configured properly');
         }
         Cache::enable();
-        Cache::config('xcache', ['engine' => 'Xcache', 'prefix' => 'cake_']);
+        Cache::setConfig('xcache', ['engine' => 'Xcache', 'prefix' => 'cake_']);
     }
 
     /**
@@ -53,7 +53,7 @@ class XcacheEngineTest extends TestCase
             'prefix' => 'cake_',
         ];
         Cache::drop('xcache');
-        Cache::config('xcache', array_merge($defaults, $config));
+        Cache::setConfig('xcache', array_merge($defaults, $config));
     }
 
     /**
@@ -250,7 +250,7 @@ class XcacheEngineTest extends TestCase
      */
     public function testGroupsReadWrite()
     {
-        Cache::config('xcache_groups', [
+        Cache::setConfig('xcache_groups', [
             'engine' => 'Xcache',
             'duration' => 0,
             'groups' => ['group_a', 'group_b'],
@@ -277,7 +277,7 @@ class XcacheEngineTest extends TestCase
      */
     public function testGroupDelete()
     {
-        Cache::config('xcache_groups', [
+        Cache::setConfig('xcache_groups', [
             'engine' => 'Xcache',
             'duration' => 0,
             'groups' => ['group_a', 'group_b'],
@@ -297,7 +297,7 @@ class XcacheEngineTest extends TestCase
      */
     public function testGroupClear()
     {
-        Cache::config('xcache_groups', [
+        Cache::setConfig('xcache_groups', [
             'engine' => 'Xcache',
             'duration' => 0,
             'groups' => ['group_a', 'group_b'],

tests/TestCase/Core/ConfigureTest.php

@@ -416,7 +416,7 @@ class ConfigureTest extends TestCase
     public function testStoreAndRestore()
     {
         Cache::enable();
-        Cache::config('configure', [
+        Cache::setConfig('configure', [
             'className' => 'File',
             'path' => TMP . 'tests'
         ]);
@@ -442,7 +442,7 @@ class ConfigureTest extends TestCase
     public function testStoreAndRestoreWithData()
     {
         Cache::enable();
-        Cache::config('configure', [
+        Cache::setConfig('configure', [
             'className' => 'File',
             'path' => TMP . 'tests'
         ]);