Amendment to previous merge (possibly fubared something)

Author: igorw

src/Igorw/CgiHttpKernel/CgiHttpKernel.php

@@ -10,7 +10,6 @@
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Process\ProcessBuilder;
-use \RuntimeException;
 
 class CgiHttpKernel implements HttpKernelInterface
 {
@@ -72,11 +71,12 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
 
         $processOutput = $process->getOutput();
 
-        list($headerList, $body) = explode("\r\n\r\n", $processOutput, 2) + array(1 => '');
-        $headers = $this->getHeaderMap($headerList);
-        unset($headers['Cookie']);
+        list($headerList, $body) = explode("\r\n\r\n", $processOutput, 2);
+        $headerMap = $this->getHeaderMap($headerList);
+        $cookies = $this->getCookies($headerMap);
 
-        $cookies = $this->getCookies($headers);
+        $headers = $this->flattenHeaderMap($headerMap);
+        unset($headers['Cookie']);
         $status = $this->getStatusCode($headers);
 
         $response = new Response($body, $status, $headers);
@@ -103,43 +103,48 @@ private function getStatusCode(array $headers)
 
     private function getHeaderMap($headerListRaw)
     {
-        $headerMap   = array();
-        if (!strlen($headerListRaw)) {
-            return $headerMap;
+        if (0 === strlen($headerListRaw)) {
+            return array();
         }
+
+        $headerMap = array();
+
         $headerList  = preg_replace('~\xD\xA[\t ]~', ' ', $headerListRaw);
         $headerLines = explode("\r\n", $headerList);
         foreach ($headerLines as $headerLine) {
-            list($name, $value) = explode(':', $headerLine, 2) + array(1 => NULL);
-            if (NULL === $value) {
-                throw new RuntimeException('Unable to parse header line, name missing');
-            }
-            $name             = implode('-', array_map('ucwords', explode('-', $name)));
-            $value            = trim($value, "\t ");
-            switch($name) {
-                case 'Set-Cookie':
-                    $headerMap[$name][] = $value;
-                    break;
-
-                default:
-                    if (isset($headerMap[$name])) {
-                        $value = $headerMap[$name] . ',' . $value;
-                    }
-                    $headerMap[$name] = $value;
+            if (false === strpos($headerLine, ':')) {
+                throw new \RuntimeException('Unable to parse header line, name missing');
             }
+
+            list($name, $value) = explode(':', $headerLine, 2);
+
+            $name  = implode('-', array_map('ucwords', explode('-', $name)));
+            $value = trim($value, "\t ");
+
+            $headerMap[$name][] = $value;
         }
+
         return $headerMap;
     }
 
-    private function getCookies(array $headerList)
+    private function flattenHeaderMap(array $headerMap)
+    {
+        $flatHeaderMap = array();
+        foreach ($headerMap as $name => $values) {
+            $flatHeaderMap[$name] = implode(', ', $values);
+        }
+        return $flatHeaderMap;
+    }
+
+    private function getCookies(array $headerMap)
     {
-        if (!isset($headerList['Set-Cookie'])) {
+        if (!isset($headerMap['Set-Cookie'])) {
             return array();
         }
 
         return array_map(
             array($this, 'cookieFromResponseHeaderValue'),
-            $headerList['Set-Cookie']
+            $headerMap['Set-Cookie']
         );
     }
 

tests/functional/CgiHttpKernelTest.php

@@ -260,4 +260,14 @@ public function doubleCrlfResponseBodyShouldBeDecodedProperly()
         $expected = "foo\r\n\r\nbar";
         $this->assertSame($expected, $response->getContent());
     }
+
+    /** @test */
+    public function emptyResponseShouldWorkFine()
+    {
+        $request = Request::create('/empty.php');
+        $response = $this->kernel->handle($request);
+
+        $expected = '';
+        $this->assertSame($expected, $response->getContent());
+    }
 }