Request cookie parser

examples/psr7.php

@@ -7,6 +7,7 @@
 // - Open in browser:
 //   | http://localhost:8080/psr7.php?action=hello
 //   | http://localhost:8080/psr7.php?action=hello&name=yourname
+//   | http://localhost:8080/psr7.php?action=helloFromCookie
 //   | http://localhost:8080/psr7.php?action=helloWithDefault
 //   | http://localhost:8080/psr7.php?action=json&payload={%22a%22:1}
 
@@ -18,6 +19,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 $symfonyRequest = Request::createFromGlobals();
+$symfonyRequest->cookies->add(["user", "John Doe"]);
 $psr7Factory = new DiactorosFactory();
 $request = $psr7Factory->createRequest($symfonyRequest);
 
@@ -37,6 +39,13 @@ public function hello()
         return "Hello $name";
     }
 
+    public function helloFromCookie()
+    {
+        $fullName = $this->cookieParameter('fullName')->string()->required();
+
+        return "Hello $fullName";
+    }
+
     public function helloWithDefault()
     {
         $name = $this->queryParameter('name')->string()->defaultsTo('unknown');

examples/symfony.php

@@ -8,6 +8,7 @@
 //   | http://localhost:8080/symfony.php?action=hello
 //   | http://localhost:8080/symfony.php?action=hello&name=yourname
 //   | http://localhost:8080/symfony.php?action=helloWithDefault
+//   | http://localhost:8080/symfony.php?action=helloFromCookie
 //   | http://localhost:8080/symfony.php?action=json&payload={%22a%22:1}
 //   | http://localhost:8080/symfony.php?action=intArray&userIds=21,22,23
 //   | http://localhost:8080/symfony.php?action=dateTimeArray&timestamps=2016-01-01%2000:00:00,2016-12-31%2023:59:59
@@ -26,6 +27,7 @@ class MyController
 
     public function __construct(\Symfony\Component\HttpFoundation\Request $request)
     {
+        $request->cookies->add(["user", "John Doe"]);
         $this->initRequestParser($request);
     }
 
@@ -36,6 +38,13 @@ public function hello()
         return "Hello $name";
     }
 
+    public function helloFromCookie()
+    {
+        $fullName = $this->cookieParameter('fullName')->string()->required();
+
+        return "Hello $fullName";
+    }
+
     public function helloWithDefault()
     {
         $name = $this->queryParameter('name')->string()->defaultsTo('unknown');

src/BaseControllerHelperTrait.php

@@ -14,12 +14,18 @@ trait BaseControllerHelperTrait
      */
     private $bodyParser;
 
+    /**
+     * @var RequestParser
+     */
+    private $cookieParser;
+
     protected final function initRequestParser($request, $config = null)
     {
         /** @var $requestParserFactory RequestParserFactory */
         $requestParserFactory = $this->createRequestParserFactory($request, $config);
         $this->queryParser = $requestParserFactory->createQueryParser();
         $this->bodyParser = $requestParserFactory->createBodyParser();
+        $this->cookieParser = $requestParserFactory->createCookieParser();
     }
 
     /**
@@ -47,4 +53,17 @@ protected function bodyParameter($name)
     {
         return $this->bodyParser->get($name);
     }
+
+    /**
+     * Use this method to access the request cookie parameters.
+     *
+     *     $userId = $this->cookieParameter('userId')->int()->defaultsTo(null)
+     *
+     * @param $name
+     * @return TypeParser
+     */
+    protected function cookieParameter($name)
+    {
+        return $this->cookieParser->get($name);
+    }
 }

src/Psr7/Psr7RequestParserFactory.php

@@ -46,4 +46,18 @@ public function createBodyParser()
 
         return new RequestParser($readParameter, $this->config);
     }
+
+    public function createCookieParser()
+    {
+        $cookies = $this->request->getCookieParams();
+        $readParameter = function ($name) use ($cookies) {
+            if (!isset($cookies[$name])) {
+                return null;
+            }
+
+            return $cookies[$name];
+        };
+
+        return new RequestParser($readParameter, $this->config);
+    }
 }

src/RequestParserFactory.php

@@ -13,4 +13,9 @@ public function createQueryParser();
      * @return RequestParser
      */
     public function createBodyParser();
+
+    /**
+     * @return RequestParser
+     */
+    public function createCookieParser();
 }

src/Symfony/SymfonyRequestParserFactory.php

@@ -34,4 +34,14 @@ public function createBodyParser()
 
         return new RequestParser($readParameter, $this->config);
     }
+
+    public function createCookieParser()
+    {
+        $readParameter = function ($name) {
+            $cookies = $this->request->cookies;
+            return $cookies->has($name) ? $cookies->get($name) : null;
+        };
+
+        return new RequestParser($readParameter, $this->config);
+    }
 }

tests/Integration/Psr7IntegrationTest.php

@@ -15,10 +15,12 @@ public function controllersProvider()
 
         $getRequest = $request
             ->withMethod('GET')
+            ->withCookieParams($parameters)
             ->withQueryParams($parameters);
 
         $postRequest = $request
             ->withMethod('POST')
+            ->withCookieParams($parameters)
             ->withParsedBody($parameters);
 
         return [

tests/Integration/SymfonyIntegrationTest.php

@@ -11,10 +11,10 @@ public function controllersProvider()
             'int' => 1
         ];
 
-        $getRequest = new \Symfony\Component\HttpFoundation\Request($parameters);
+        $getRequest = new \Symfony\Component\HttpFoundation\Request($parameters, [], [], $parameters);
         $getRequest->setMethod('GET');
 
-        $postRequest = new \Symfony\Component\HttpFoundation\Request([], $parameters);
+        $postRequest = new \Symfony\Component\HttpFoundation\Request([], $parameters, [], $parameters);
         $postRequest->setMethod('POST');
 
         return [

tests/Integration/setup.php

@@ -5,22 +5,30 @@ abstract class AbstractIntegrationTest extends \PHPUnit_Framework_TestCase
     abstract public function controllersProvider();
 
     /**
+     * @param AbstractIntegrationTestController $controller
+     *
      * @dataProvider controllersProvider
      */
     public function testStringAction(AbstractIntegrationTestController $controller)
     {
         $this->assertEquals('Test', $controller->testString());
+        $this->assertEquals('Test', $controller->testString(true));
     }
 
     /**
+     * @param AbstractIntegrationTestController $controller
+     *
      * @dataProvider controllersProvider
      */
     public function testIntAction(AbstractIntegrationTestController $controller)
     {
         $this->assertEquals(1, $controller->testInt());
+        $this->assertEquals(1, $controller->testInt(true));
     }
 
     /**
+     * @param AbstractIntegrationTestController $controller
+     *
      * @dataProvider controllersProvider
      */
     public function testNotFoundActionThrowsException(AbstractIntegrationTestController $controller)
@@ -40,23 +48,27 @@ public function __construct($request)
         $this->request = $request;
     }
 
-    protected function parameter($name)
+    protected function parameter($name, $cookie = false)
     {
-        if ($this->request->getMethod() === 'GET') {
-            return $this->queryParameter($name);
+        if (!$cookie) {
+            if ($this->request->getMethod() === 'GET') {
+                return $this->queryParameter($name);
+            } else {
+                return $this->bodyParameter($name);
+            }
         } else {
-            return $this->bodyParameter($name);
+            return $this->cookieParameter($name);
         }
     }
 
-    public function testString()
+    public function testString($fromCookie = false)
     {
-        return $this->parameter('string')->string()->required();
+        return $this->parameter('string', $fromCookie)->string()->required();
     }
 
-    public function testInt()
+    public function testInt($fromCookie = false)
     {
-        return $this->parameter('int')->int()->required();
+        return $this->parameter('int', $fromCookie)->int()->required();
     }
 
     public function testNotFound()