bug #20747 [HttpKernel] Fixed RequestDataCollector handling of null header values. (Gabriel Moreira)

fabpot · fabpot · commit 456e68bae52a · 2016-12-05T14:20:31.000+01:00
This PR was submitted for the master branch but it was merged into the 3.2 branch instead (closes #20747). Discussion ---------- [HttpKernel] Fixed RequestDataCollector handling of null header values. | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This PR references this [discussion](symfony/http-kernel@1fee784#commitcomment-20028839). Commits ------- adc4a26 [HttpKernel] Fixed RequestDataCollector handling of null header values.
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -125,7 +125,7 @@ public function collect(Request $request, Response $response, \Exception $except
                 continue;
             }
             if ('request_headers' === $key || 'response_headers' === $key) {
-                $value = array_map(function ($v) { return isset($v[1]) ? $v : $v[0]; }, $value);
+                $value = array_map(function ($v) { return isset($v[0]) && !isset($v[1]) ? $v[0] : $v; }, $value);
             }
             if ('request_server' !== $key && 'request_cookies' !== $key) {
                 $this->data[$key] = array_map(array($this, 'cloneVar'), $value);
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -234,6 +234,7 @@ protected function createResponse()
         $response = new Response();
         $response->setStatusCode(200);
         $response->headers->set('Content-Type', 'application/json');
+        $response->headers->set('X-Foo-Bar', null);
         $response->headers->setCookie(new Cookie('foo', 'bar', 1, '/foo', 'localhost', true, true));
         $response->headers->setCookie(new Cookie('bar', 'foo', new \DateTime('@946684800')));
         $response->headers->setCookie(new Cookie('bazz', 'foo', '2000-12-12'));

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function collect(Request $request, Response $response, \Exception $except`
`125`	`125`	`continue;`
`126`	`126`	`}`
`127`	`127`	`if ('request_headers' === $key \|\| 'response_headers' === $key) {`
`128`		`- $value = array_map(function ($v) { return isset($v[1]) ? $v : $v[0]; }, $value);`
	`128`	`+ $value = array_map(function ($v) { return isset($v[0]) && !isset($v[1]) ? $v[0] : $v; }, $value);`
`129`	`129`	`}`
`130`	`130`	`< 8000 div class="diff-text-inner"> if ('request_server' !== $key && 'request_cookies' !== $key) {`
`131`	`131`	`$this->data[$key] = array_map(array($this, 'cloneVar'), $value);`