Merge pull request #683 from cakephp/issue-682

Don't proxy invalid configuration

Author: markstory

src/Panel/CachePanel.php

@@ -41,12 +41,14 @@ public function initialize()
             $config = Cache::getConfig($name);
             if (isset($config['className']) && $config['className'] instanceof DebugEngine) {
                 $instance = $config['className'];
-            } else {
+            } elseif (isset($config['className'])) {
                 Cache::drop($name);
                 $instance = new DebugEngine($config);
                 Cache::setConfig($name, $instance);
             }
-            $this->_instances[$name] = $instance;
+            if (isset($instance)) {
+                $this->_instances[$name] = $instance;
+            }
         }
     }
 

tests/TestCase/Panel/CachePanelTest.php

@@ -48,6 +48,7 @@ public function tearDown()
     {
         parent::tearDown();
         Cache::drop('debug_kit_test');
+        Cache::drop('incomplete');
     }
 
     /**
@@ -64,6 +65,21 @@ public function testInitialize()
         $this->assertArrayHasKey('_cake_model_', $result['metrics']);
     }
 
+    /**
+     * test initialize incomplete data
+     *
+     * @return void
+     */
+    public function testInitializeNoProxyIncompleteConfig()
+    {
+        $data = ['duration' => '+2 seconds'];
+        Cache::setConfig('incomplete', $data);
+        $this->panel->initialize();
+
+        $config = Cache::getConfig('incomplete');
+        $this->assertSame($data, $config);
+    }
+
     /**
      * test initialize incomplete data
      *