Improve set-cookie parsing

Author: igorw

src/Igorw/CgiHttpKernel/CgiHttpKernel.php

@@ -106,30 +106,37 @@ private function getCookies(array $headerList)
 
     private function cookieFromResponseHeaderValue($value)
     {
-        preg_match_all('/(?P<names>[^=]+)=(?P<values>[^\;]*)(;\s)?/im', $value, $cookieParts);
+        $cookieParts = preg_split('/;\s?/', $value);
         $cookieMap = array();
-        foreach ($cookieParts['names'] as $key => $name) {
-            $cookieMap[$name] = $cookieParts['values'][$key];
+        foreach ($cookieParts as $part) {
+            preg_match('/(\w+)(?:=(.*)|)/', $part, $capture);
+            $name = $capture[1];
+            $value = isset($capture[2]) ? $capture[2] : '';
+
+            $cookieMap[$name] = $value;
         }
 
         $firstKey = key($cookieMap);
 
+        $cookieMap = array_merge($cookieMap, array(
+            'secure'    => isset($cookieMap['secure']),
+            'httponly'  => isset($cookieMap['httponly']),
+        ));
+
         $cookieMap = array_merge(array(
-            'expire' => 0,
+            'expires' => 0,
             'path' => '/',
             'domain' => null,
-            'secure' => false,
-            'httpOnly' => true,
         ), $cookieMap);
 
         return new Cookie(
             $firstKey,
             $cookieMap[$firstKey],
-            $cookieMap['expire'],
+            $cookieMap['expires'],
             $cookieMap['path'],
             $cookieMap['domain'],
             $cookieMap['secure'],
-            $cookieMap['httpOnly']
+            $cookieMap['httponly']
         );
     }
 

tests/Igorw/CgiHttpKernel/CgiHttpKernelTest.php

@@ -158,6 +158,31 @@ public function isShouldParseMultipleCookiesFromResponse()
         $this->assertSame('quux', $cookies[1]->getValue());
     }
 
+    /** @test */
+    public function isShouldParseEmptyCookieValue()
+    {
+        $request = Request::create('/cookie-set-empty.php');
+        $response = $this->kernel->handle($request);
+
+        $cookies = $response->headers->getCookies();
+        $this->assertSame('foo', $cookies[0]->getName());
+        $this->assertSame('', $cookies[0]->getValue());
+    }
+
+    /** @test */
+    public function isShouldParseFullCookieValue()
+    {
+        $request = Request::create('/cookie-set-full.php');
+        $response = $this->kernel->handle($request);
+
+        $cookies = $response->headers->getCookies();
+        $this->assertSame('foo', $cookies[0]->getName());
+        $this->assertSame('bar', $cookies[0]->getValue());
+        $this->assertSame(1353842823, $cookies[0]->getExpiresTime());
+        $this->assertSame('/baz', $cookies[0]->getPath());
+        $this->assertSame('example.com', $cookies[0]->getDomain());
+    }
+
     /** @test */
     public function itShouldSetHttpAuth()
     {

tests/Igorw/CgiHttpKernel/Fixtures/cookie-set-empty.php

@@ -0,0 +1,3 @@
+<?php
+
+setcookie('foo');

tests/Igorw/CgiHttpKernel/Fixtures/cookie-set-full.php

@@ -0,0 +1,3 @@
+<?php
+
+setcookie('foo', 'bar', 1353842823, '/baz', 'example.com', true, true);