bug symfony#20652 Fixed getRouteParams() when no parameters are available (wouterj)

nicolas-grekas · nicolas-grekas · commit cb03103570fc · 2016-11-27T12:54:20.000+01:00
This PR was merged into the 3.2 branch. Discussion ---------- Fixed getRouteParams() when no parameters are available | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#20650 | License | MIT | Doc PR | - Commits ------- 040da81 Fixed getRouteParams() when no parameters are available
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -276,8 +276,13 @@ public function getRouteParams()
         }
 
         $data = $this->data['request_attributes']['_route_params'];
+        $rawData = $data->getRawData();
+        if (!isset($rawData[1])) {
+            return array();
+        }
+
         $params = array();
-        foreach ($data->getRawData()[1] as $k => $v) {
+        foreach ($rawData[1] as $k => $v) {
             $params[$k] = $data->seek($k);
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -59,6 +59,16 @@ public function testCollect()
         $this->assertSame('application/json', $c->getContentType());
     }
 
+    public function testCollectWithoutRouteParams()
+    {
+        $request = $this->createRequest(array());
+
+        $c = new RequestDataCollector();
+        $c->collect($request, $this->createResponse());
+
+        $this->assertEquals(array(), $c->getRouteParams());
+    }
+
     public function testKernelResponseDoesNotStartSession()
     {
         $kernel = $this->getMock(HttpKernelInterface::class);
@@ -197,12 +207,12 @@ public function testItIgnoresInvalidCallables()
         $this->assertSame('n/a', $c->getController());
     }
 
-    protected function createRequest()
+    protected function createRequest($routeParams = array('name' => 'foo'))
     {
         $request = Request::create('http://test.com/foo?bar=baz');
         $request->attributes->set('foo', 'bar');
         $request->attributes->set('_route', 'foobar');
-        $request->attributes->set('_route_params', array('name' => 'foo'));
+        $request->attributes->set('_route_params', $routeParams);
         $request->attributes->set('resource', fopen(__FILE__, 'r'));
         $request->attributes->set('object', new \stdClass());
 

Original file line number	Diff line number	Diff line change
`@@ -276,8 +276,13 @@ public function getRouteParams()`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`$data = $this->data['request_attributes']['_route_params'];`
	`279`	`+ $rawData = $data->getRawData();`
	`280`	`+ if (!isset($rawData[1])) {`
	`281`	`+ return array();`
	`282`	`+ }`
	`283`	`+`
`279`	`284`	`$params = array();`
`280`		`- foreach ($data->getRawData()[1] as $k => $v) {`
	`285`	`+ foreach ($rawData[1] as $k => $v) {`
`281`	`286`	`$params[$k] = $data->seek($k);`
`282`	`287`	`}`
`283`	`288`