Fold Session panel into Request panel

Having a separate for just session data seems redundant when session
data is always accessed through the request.

Author: markstory

src/Panel/RequestPanel.php

@@ -55,6 +55,7 @@ public function shutdown(EventInterface $event): void
             'data' => Debugger::exportVarAsNodes($request->getData(), $maxDepth),
             'cookie' => Debugger::exportVarAsNodes($request->getCookieParams(), $maxDepth),
             'get' => Debugger::exportVarAsNodes($_GET, $maxDepth),
+            'session' => Debugger::exportVarAsNodes($request->getSession()->read(), $maxDepth),
             'matchedRoute' => $request->getParam('_matchedRoute'),
             'headers' => [
                 'response' => headers_sent($file, $line),

src/Panel/SessionPanel.php

@@ -18,6 +18,7 @@
 use Cake\Error\Debugger;
 use Cake\Event\EventInterface;
 use DebugKit\DebugPanel;
+use function Cake\Core\deprecationWarning;
 
 /**
  * Provides debug information on the Session contents.
@@ -32,6 +33,7 @@ class SessionPanel extends DebugPanel
      */
     public function shutdown(EventInterface $event): void
     {
+        deprecationWarning('5.1.0', 'SessionPanel is deprecated. Remove it from your panel list, and use Request panel instead.');
         /** @var \Cake\Controller\Controller $controller */
         $controller = $event->getSubject();
         $request = $controller->getRequest();

src/ToolbarService.php

@@ -55,7 +55,6 @@ class ToolbarService
     protected array $_defaultConfig = [
         'panels' => [
             'DebugKit.Cache' => true,
-            'DebugKit.Session' => true,
             'DebugKit.Request' => true,
             'DebugKit.SqlLog' => true,
             'DebugKit.Timer' => true,

tests/TestCase/Middleware/DebugKitMiddlewareTest.php

@@ -126,10 +126,10 @@ public function testInvokeSaveData()
         $this->assertSame(200, $result->status_code);
         $this->assertGreaterThan(1, $result->panels);
 
-        $this->assertSame('SqlLog', $result->panels[11]->panel);
-        $this->assertSame('DebugKit.sql_log_panel', $result->panels[11]->element);
+        $this->assertSame('Timer', $result->panels[11]->panel);
+        $this->assertSame('DebugKit.timer_panel', $result->panels[11]->element);
         $this->assertNotNull($result->panels[11]->summary);
-        $this->assertSame('Sql Log', $result->panels[11]->title);
+        $this->assertSame('Timer', $result->panels[11]->title);
 
         $timeStamp = filectime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'inject-iframe.js');
 

tests/TestCase/Panel/RequestPanelTest.php

@@ -64,6 +64,10 @@ public function testShutdownSkipAttributes()
 
         $data = $this->panel->data();
         $this->assertArrayHasKey('attributes', $data);
+        $this->assertArrayHasKey('session', $data);
+        $this->assertArrayHasKey('params', $data);
+        $this->assertArrayHasKey('data', $data);
+        $this->assertArrayHasKey('cookie', $data);
         $this->assertEquals('string', $data['attributes']['ok']->getType());
         $this->assertStringContainsString('Could not serialize `closure`', $data['attributes']['closure']->getValue());
     }

tests/TestCase/ToolbarServiceTest.php

@@ -256,10 +256,13 @@ public function testSaveData()
         $this->assertSame(200, $result->status_code);
         $this->assertGreaterThan(1, $result->panels);
 
-        $this->assertSame('SqlLog', $result->panels[11]->panel);
-        $this->assertSame('DebugKit.sql_log_panel', $result->panels[11]->element);
-        $this->assertSame('0', $result->panels[11]->summary);
-        $this->assertSame('Sql Log', $result->panels[11]->title);
+        $this->assertSame('Timer', $result->panels[11]->panel);
+        $this->assertSame('DebugKit.timer_panel', $result->panels[11]->element);
+        $this->assertMatchesRegularExpression(
+            '/\d+\.\d+\s[ms]+\s+\/\s+\d+\.\d+\s+[mbMB]+/',
+            $result->panels[11]->summary
+        );
+        $this->assertSame('Timer', $result->panels[11]->title);
     }
 
     /**