merged branch fabpot/router-webprofiler (PR #8894)

fabpot · fabpot · commit a5dcb3276083 · 2013-08-31T08:13:13.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8867 | License | MIT | Doc PR | n/a Commits ------- c931eb7 [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -51,10 +51,14 @@ public function collect(Request $request, Response $response, \Exception $except
         $attributes = array();
         foreach ($request->attributes->all() as $key => $value) {
             if ('_route' == $key && is_object($value)) {
-                $value = $value->getPath();
+                $attributes['_route'] = $this->varToString($value->getPath());
+            } elseif ('_route_params' == $key) {
+                foreach ($value as $key => $v) {
+                    $attributes['_route_params'][$key] = $this->varToString($v);
+                }
+            } else {
+                $attributes[$key] = $this->varToString($value);
             }
-
-            $attributes[$key] = $this->varToString($value);
         }
 
         $content = null;
