Merge pull request #855 from cakephp/add-attributes

add attributes to request tab

Author: markstory

src/Panel/RequestPanel.php

@@ -34,7 +34,7 @@ public function shutdown(EventInterface $event)
         $controller = $event->getSubject();
         $request = $controller->getRequest();
         $this->_data = [
-            'params' => $request->getAttribute('params'),
+            'attributes' => $request->getAttributes(),
             'query' => $request->getQueryParams(),
             'data' => $request->getData(),
             'cookie' => $request->getCookieParams(),

templates/element/request_panel.php

@@ -19,47 +19,53 @@
 /**
  * @var \DebugKit\View\AjaxView $this
  * @var array $headers
- * @var array $params
+ * @var array $attributes
  * @var array $data
  * @var array $query
  * @var array $cookie
  * @var string $matchedRoute
  */
 ?>
-<?php if (!empty($headers) && $headers['response']): ?>
+<?php if (!empty($headers) && $headers['response']) : ?>
 <h4><?= __d('debug_kit', 'Warning') ?></h4>
     <?= '<p class="warning">' . __d('debug_kit', 'Headers already sent at file {0} and line {1}.', [$headers['file'], $headers['line']]) . '</p>' ?>
 <?php endif; ?>
 
-<h4><?= __d('debug_kit', 'Routing Params') ?></h4>
-<?= $this->Toolbar->dump($params) ?>
+<h4><?= __d('debug_kit', 'Attributes') ?></h4>
+<?php
+if (empty($attributes)) :
+    echo '<p class="info">' . __d('debug_kit', 'No attributes data.') . '</p>';
+else :
+    echo $this->Toolbar->dump($attributes);
+endif;
+?>
 
 <h4><?= __d('debug_kit', 'Post data') ?></h4>
 <?php
-if (empty($data)):
+if (empty($data)) :
     echo '<p class="info">' . __d('debug_kit', 'No post data.') . '</p>';
-else:
+else :
     echo $this->Toolbar->dump($data);
 endif;
 ?>
 
 <h4>Query string</h4>
 <?php
-if (empty($query)):
+if (empty($query)) :
     echo '<p class="info">' . __d('debug_kit', 'No querystring data.') . '</p>';
-else:
+else :
     echo $this->Toolbar->dump($query);
 endif;
 ?>
 
 <h4>Cookie</h4>
-<?php if (isset($cookie)): ?>
+<?php if (isset($cookie)) : ?>
     <?= $this->Toolbar->dump($cookie) ?>
-<?php else: ?>
+<?php else : ?>
     <p class="info"><?= __d('debug_kit', 'No Cookie data.') ?></p>
 <?php endif; ?>
 
-<?php if (!empty($matchedRoute)): ?>
+<?php if (!empty($matchedRoute)) : ?>
 <h4><?= __d('debug_kit', 'Matched Route') ?></h4>
     <p><?= $this->Toolbar->dump(['template' => $matchedRoute]) ?></p>
 <?php endif; ?>

tests/TestCase/Controller/PanelsControllerTest.php

@@ -83,7 +83,7 @@ public function testView()
 
         $this->assertResponseOk();
         $this->assertResponseContains('Request</h2>');
-        $this->assertResponseContains('Routing Params</h4>');
+        $this->assertResponseContains('Attributes</h4>');
     }
 
     /**

tests/TestCase/FixtureFactoryTrait.php

@@ -32,12 +32,14 @@ protected function makePanel($request, $name = 'DebugKit.Request', $title = 'Req
     {
         if ($content === null) {
             $content = [
-                'params' => [
-                    'plugin' => null,
-                    'controller' => 'Tasks',
-                    'action' => 'add',
-                    '_ext' => null,
-                    'pass' => [],
+                'attributes' => [
+                    'params' => [
+                        'plugin' => null,
+                        'controller' => 'Tasks',
+                        'action' => 'add',
+                        '_ext' => null,
+                        'pass' => [],
+                    ],
                 ],
                 'query' => [],
                 'data' => [],