[HttpKernel] Fix exception when serializing request attributes

nicolas-grekas · nicolas-grekas · commit fd92e9ffffe0 · 2016-11-24T17:53:50.000+01:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
@@ -87,7 +87,7 @@ private function getTraces(RequestDataCollector $request, $method)
         $traceRequest = Request::create(
             $request->getPathInfo(),
             $request->getRequestServer(true)->get('REQUEST_METHOD'),
-            $request->getRequestAttributes(true)->all(),
+            array(),
             $request->getRequestCookies(true)->all(),
             array(),
             $request->getRequestServer(true)->all()
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -127,7 +127,7 @@ public function collect(Request $request, Response $response, \Exception $except
             if ('request_headers' === $key || 'response_headers' === $key) {
                 $value = array_map(function ($v) { return isset($v[1]) ? $v : $v[0]; }, $value);
             }
-            if ('request_server' !== $key && 'request_attributes' !== $key && 'request_cookies' !== $key) {
+            if ('request_server' !== $key && 'request_cookies' !== $key) {
                 $this->data[$key] = array_map(array($this, 'cloneVar'), $value);
             }
         }
@@ -190,9 +190,9 @@ public function getRequestCookies($raw = false)
         return new ParameterBag($raw ? $this->data['request_cookies'] : array_map(array($this, 'cloneVar'), $this->data['request_cookies']));
     }
 
-    public function getRequestAttributes($raw = false)
+    public function getRequestAttributes()
     {
-        return new ParameterBag($raw ? $this->data['request_attributes'] : array_map(array($this, 'cloneVar'), $this->data['request_attributes']));
+        return new ParameterBag($this->data['request_attributes']);
     }
 
     public function getResponseHeaders()
@@ -271,7 +271,17 @@ public function getIdentifier()
      */
     public function getRouteParams()
     {
-        return isset($this->data['request_attributes']['_route_params']) ? array_map(array($this, 'cloneVar'), $this->data['request_attributes']['_route_params']) : array();
+        if (!isset($this->data['request_attributes']['_route_params'])) {
+            return array();
+        }
+
+        $data = $this->data['request_attributes']['_route_params'];
+        $params = array();
+        foreach ($data->getRawData()[1] as $k => $v) {
+            $params[$k] = $data->seek($k);
+        }
+
+        return $params;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function collect(Request $request, Response $response, \Exception $except`
`127`	`127`	`if ('request_headers' === $key \|\| 'response_headers' === $key) {`
`128`	`128`	`$value = array_map(function ($v) { return isset($v[1]) ? $v : $v[0]; }, $value);`
`129`	`129`	`}`
`130`		`- if ('request_server' !== $key && 'request_attributes' !== $key && 'request_cookies' !== $key) {`
	`130`	`+ if ('request_server' !== $key && 'request_cookies' !== $key) {`
`131`	`131`	`$this->data[$key] = array_map(array($this, 'cloneVar'), $value);`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -190,9 +190,9 @@ public function getRequestCookies($raw = false)`
`190`	`190`	`return new ParameterBag($raw ? $this->data['request_cookies'] : array_map(array($this, 'cloneVar'), $this->data['request_cookies']));`
`191`	`191`	`}`
`192`	`192`
`193`		`- public function getRequestAttributes($raw = false)`
	`193`	`+ public function getRequestAttributes()`
`194`	`194`	`{`
`195`		`- return new ParameterBag($raw ? $this->data['request_attributes'] : array_map(array($this, 'cloneVar'), $this->data['request_attributes']));`
	`195`	`+ return new ParameterBag($this->data['request_attributes']);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`public function getResponseHeaders()`
`@@ -271,7 +271,17 @@ public function getIdentifier()`
`271`	`271`	`*/`
`272`	`272`	`public function getRouteParams()`
`273`	`273`	`{`
`274`		`- return isset($this->data['request_attributes']['_route_params']) ? array_map(array($this, 'cloneVar'), $this->data['request_attributes']['_route_params']) : array();`
	`274`	`+ if (!isset($this->data['request_attributes']['_route_params'])) {`
	`275`	`+ return array();`
	`276`	`+ }`
	`277`	`+`
	`278`	`+ $data = $this->data['request_attributes']['_route_params'];`
	`279`	`+ $params = array();`
	`280`	`+ foreach ($data->getRawData()[1] as $k => $v) {`
	`281`	`+ $params[$k] = $data->seek($k);`
	`282`	`+ }`
	`283`	`+`
	`284`	`+ return $params;`
`275`	`285`	`}`
`276`	`286`
`277`	`287`	`/**`