Merge branch 'hotfix/220'

Close #220 Fixes #219
zendframework · Sep 8, 2016 · 011eb67 · 011eb67
2 parents 3231228 + aa23d88
commit 011eb67
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#217](https://github.com/zendframework/ZendDeveloperTools/pull/217) adds
   support in the `SerializableException` for PHP 7 Throwables, including Error
   types.
+- [#220](https://github.com/zendframework/ZendDeveloperTools/pull/220) adds
+  support for displaying matched route parameters other than just the controller
+  and action.
 
 ### Deprecated
 

diff --git a/src/Collector/RequestCollector.php b/src/Collector/RequestCollector.php
@@ -71,7 +71,10 @@ public function collect(MvcEvent $mvcEvent)
             'status'     => $mvcEvent->getResponse()->getStatusCode(),
             'route'      => ($match === null) ? 'N/A' : $match->getMatchedRouteName(),
             'action'     => ($match === null) ? 'N/A' : $match->getParam('action', 'N/A'),
-            'controller' => ($match === null) ? 'N/A' : $match->getParam('controller', 'N/A')
+            'controller' => ($match === null) ? 'N/A' : $match->getParam('controller', 'N/A'),
+            'other_route_parameters' => ($match === null) ? 'N/A' : array_filter($match->getParams(), function ($key) {
+                return ! in_array($key, ['action', 'controller']);
+            }, ARRAY_FILTER_USE_KEY),
         ];
     }
 
@@ -141,6 +144,15 @@ public function getControllerName()
         return $this->data['controller'];
     }
 
+    /**
+     * Returns parameters except controller and actions
+     * @return array
+     */
+    public function getOtherParameters()
+    {
+        return $this->data['other_route_parameters'];
+    }
+
     /**
      * Returns the controller and action name if possible, otherwise N/A.
      *

diff --git a/view/zend-developer-tools/toolbar/request.phtml b/view/zend-developer-tools/toolbar/request.phtml
@@ -18,25 +18,29 @@ $color = ($statusCode < 400)
         </span>
     </div>
     <div class="zdt-toolbar-detail zdt-toolbar-detail-overflow">
-        <span class="zdt-toolbar-info zdt-toolbar-info-redundant">
+        <span class="zdt-toolbar-info">
             <span class="zdt-detail-label">Status code</span>
             <span class="zdt-detail-value zdt-toolbar-bold zdt-toolbar-color-<?php echo $color; ?>">
                 <?php echo $statusCode; ?>
             </span>
         </span>
-        <span class="zdt-toolbar-info">
+       <span class="zdt-toolbar-info">
             <span class="zdt-detail-label">Method</span>
             <span class="zdt-detail-value"><?php echo $this->collector->getMethod(); ?></span>
         </span>
-        <span class="zdt-toolbar-info zdt-toolbar-extra-info-redundant">
+        <span class="zdt-toolbar-info">
             <span class="zdt-detail-label">Controller</span>
             <span class="zdt-detail-value"><?php echo $this->collector->getControllerName(); ?></span>
         </span>
-        <span class="zdt-toolbar-info zdt-toolbar-extra-info-redundant">
+        <span class="zdt-toolbar-info">
             <span class="zdt-detail-label">Action</span>
             <span class="zdt-detail-value"><?php echo $this->collector->getActionName(); ?></span>
         </span>
-        <span class="zdt-toolbar-info zdt-toolbar-extra-info-redundant">
+        <span class="zdt-toolbar-info">
+            <span class="zdt-detail-label">Other Route Parameters</span>
+            <span class="zdt-detail-value"><?php var_dump( $this->collector->getOtherParameters() ); ?></span>
+        </span>
+        <span class="zdt-toolbar-info">
             <span class="zdt-detail-label">Route</span>
             <span class="zdt-detail-value"><?php echo $this->collector->getRouteName(); ?></span>
         </span>