Parse cookie for request object

Author: legionth

src/RequestHeaderParser.php

@@ -118,6 +118,11 @@ private function parseRequest($data)
         );
         $request = $request->withRequestTarget($target);
 
+        $cookies = ServerRequest::parseCookie($request->getHeaderLine('Cookie'));
+        if ($cookies !== false) {
+            $request = $request->withCookieParams($cookies);
+        }
+
         // re-apply actual request target from above
         if ($originalTarget !== null) {
             $uri = $request->getUri()->withPath('');

src/ServerRequest.php

@@ -132,7 +132,7 @@ public static function parseCookie($cookie)
             return false;
         }
 
-        $cookieArray = explode(';', $cookie);
+        $cookieArray = explode('; ', $cookie);
         $result = array();
 
         foreach ($cookieArray as $pair) {

tests/ServerRequestTest.php

@@ -115,7 +115,7 @@ public function testParseSingleCookieNameValuePairWillReturnValidArray()
 
     public function testParseMultipleCookieNameValuePaiWillReturnValidArray()
     {
-        $cookieString = 'hello=world;test=abc';
+        $cookieString = 'hello=world; test=abc';
         $cookies = ServerRequest::parseCookie($cookieString);
         $this->assertEquals(array('hello' => 'world', 'test' => 'abc'), $cookies);
     }
@@ -136,7 +136,7 @@ public function testParseMultipleCookieNameValuePairWillReturnFalse()
 
     public function testOnlyFirstSetWillBeAddedToCookiesArray()
     {
-        $cookieString = 'hello=world;hello=abc';
+        $cookieString = 'hello=world; hello=abc';
         $cookies = ServerRequest::parseCookie($cookieString);
         $this->assertEquals(array('hello' => 'abc'), $cookies);
     }
@@ -157,21 +157,21 @@ public function testSingleCookieValueInCookiesReturnsEmptyArray()
 
     public function testSingleMutlipleCookieValuesReturnsEmptyArray()
     {
-        $cookieString = 'world;test';
+        $cookieString = 'world; test';
         $cookies = ServerRequest::parseCookie($cookieString);
         $this->assertEquals(array(), $cookies);
     }
 
     public function testSingleValueIsValidInMultipleValueCookieWillReturnValidArray()
     {
-        $cookieString = 'world;test=php';
+        $cookieString = 'world; test=php';
         $cookies = ServerRequest::parseCookie($cookieString);
         $this->assertEquals(array('test' => 'php'), $cookies);
     }
 
     public function testUrlEncodingForValueWillReturnValidArray()
     {
-        $cookieString = 'hello=world%21;test=100%25%20coverage';
+        $cookieString = 'hello=world%21; test=100%25%20coverage';
         $cookies = ServerRequest::parseCookie($cookieString);
         $this->assertEquals(array('hello' => 'world!', 'test' => '100% coverage'), $cookies);
     }

tests/ServerTest.php

@@ -2369,6 +2369,68 @@ public function testServerRequestParams()
         $this->assertNotNull($serverParams['REQUEST_TIME_FLOAT']);
     }
 
+    public function testCookieWillBeAddedToServerRequest()
+    {
+        $requestValidation = null;
+        $server = new Server($this->socket, function (ServerRequestInterface $request) use (&$requestValidation) {
+            $requestValidation = $request;
+            return new Response();
+        });
+
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = "GET / HTTP/1.1\r\n";
+        $data .= "Host: example.com:80\r\n";
+        $data .= "Connection: close\r\n";
+        $data .= "Cookie: hello=world\r\n";
+        $data .= "\r\n";
+
+        $this->connection->emit('data', array($data));
+
+        $this->assertEquals(array('hello' => 'world'), $requestValidation->getCookieParams());
+    }
+
+    public function testMultipleCookiesWontBeAddedToServerRequest()
+    {
+        $requestValidation = null;
+        $server = new Server($this->socket, function (ServerRequestInterface $request) use (&$requestValidation) {
+            $requestValidation = $request;
+            return new Response();
+        });
+
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = "GET / HTTP/1.1\r\n";
+        $data .= "Host: example.com:80\r\n";
+        $data .= "Connection: close\r\n";
+        $data .= "Cookie: hello=world\r\n";
+        $data .= "Cookie: test=failed\r\n";
+        $data .= "\r\n";
+
+        $this->connection->emit('data', array($data));
+        $this->assertEquals(array(), $requestValidation->getCookieParams());
+    }
+
+    public function testCookieWithSepeartorWillBeAddedToServerRequest()
+    {
+        $requestValidation = null;
+        $server = new Server($this->socket, function (ServerRequestInterface $request) use (&$requestValidation) {
+            $requestValidation = $request;
+            return new Response();
+        });
+
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = "GET / HTTP/1.1\r\n";
+        $data .= "Host: example.com:80\r\n";
+        $data .= "Connection: close\r\n";
+        $data .= "Cookie: hello=world; test=abc\r\n";
+        $data .= "\r\n";
+
+        $this->connection->emit('data', array($data));
+        $this->assertEquals(array('hello' => 'world', 'test' => 'abc'), $requestValidation->getCookieParams());
+    }
+
     private function createGetRequest()
     {
         $data = "GET / HTTP/1.1\r\n";