Merge pull request #355 from snelg/issue-354

Issue #354 fix - Fallback for unbuffered queries in VariablesPanel

Author: markstory

Diff for: src/Panel/VariablesPanel.php

@@ -72,7 +72,12 @@ public function shutdown(Event $event)
 
         $walker = function (&$item) use (&$walker) {
             if ($item instanceof Query || $item instanceof ResultSet) {
-                $item = $item->toArray();
+                try {
+                    $item = $item->toArray();
+                } catch (\Cake\Database\Exception $e) {
+                    //Likely issue is unbuffered query; fall back to __debugInfo
+                    $item = array_map($walker, $item->__debugInfo());
+                }
             } elseif ($item instanceof Closure ||
                 $item instanceof PDO ||
                 $item instanceof SimpleXmlElement

Diff for: tests/TestCase/Panel/VariablesPanelTest.php

@@ -58,10 +58,13 @@ public function testShutdown()
         $requests = TableRegistry::get('Requests');
         $query = $requests->find('all');
         $result = $requests->find()->all();
+        $unbufferedQuery = $requests->find('all')->bufferResults(false);
+        $unbufferedQuery->toArray(); //toArray call would normally happen somewhere in View, usually implicitly
 
         $controller = new \StdClass();
         $controller->viewVars = [
             'query' => $query,
+            'unbufferedQuery' => $unbufferedQuery,
             'result set' => $result,
             'string' => 'yes',
             'array' => ['some' => 'key']
@@ -76,6 +79,7 @@ public function testShutdown()
             'Original value should not be mutated'
         );
         $this->assertInternalType('array', $output['content']['query']);
+        $this->assertInternalType('array', $output['content']['unbufferedQuery']);
         $this->assertInternalType('array', $output['content']['result set']);
         $this->assertEquals($controller->viewVars['string'], $output['content']['string']);
         $this->assertEquals($controller->viewVars['array'], $output['content']['array']);