Merge pull request #802 from cakephp/fix-801

Preserve cache configuration better.
cakephp · Nov 27, 2020 · ca09b72 · ca09b72
2 parents fb2d1a6 + 7a263e5
commit ca09b72
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Panel/CachePanel.php b/src/Panel/CachePanel.php
@@ -56,7 +56,8 @@ public function initialize()
             } elseif (isset($config['className'])) {
                 Cache::drop($name);
                 $instance = new DebugEngine($config, $name, $this->logger);
-                Cache::setConfig($name, $instance);
+                $config['className'] = $instance;
+                Cache::setConfig($name, $config);
             }
             if (isset($instance)) {
                 $this->instances[$name] = $instance;

diff --git a/tests/TestCase/Panel/CachePanelTest.php b/tests/TestCase/Panel/CachePanelTest.php
@@ -37,7 +37,7 @@ public function setUp(): void
     {
         parent::setUp();
         $this->panel = new CachePanel();
-        Cache::setConfig('debug_kit_test', ['className' => 'Null']);
+        Cache::setConfig('debug_kit_test', ['className' => 'Null', 'path' => TMP]);
     }
 
     /**
@@ -110,4 +110,11 @@ public function testInitializeTwiceNoDoubleProxy()
         $result2 = Cache::engine('debug_kit_test');
         $this->assertSame($result2, $result);
     }
+
+    public function testInitializePreserveGlobalConfig()
+    {
+        $this->panel->initialize();
+        $result = Cache::getConfig('debug_kit_test');
+        $this->assertEquals($result['path'], TMP);
+    }
 }