Only HttpCookies

Author: devosc

src/Http/Config/ServerRequest.php

@@ -6,6 +6,7 @@
 namespace Valar\Http\Config;
 
 use Mvc5\Arg;
+use Mvc5\Cookie\HttpCookies;
 
 trait ServerRequest
 {
@@ -37,8 +38,7 @@ function getAttributes() : array
      */
     function getCookieParams() : array
     {
-        /** @var array|\Traversable $cookies */
-        return is_array($cookies = $this[Arg::COOKIES] ?? []) ? $cookies : \iterator_to_array($cookies);
+        return $this[Arg::COOKIES]->all();
     }
 
     /**
@@ -98,7 +98,7 @@ function withoutAttribute($name)
      */
     function withCookieParams(array $cookies)
     {
-        return $this->with(Arg::COOKIES, $cookies);
+        return $this->with(Arg::COOKIES, new HttpCookies($cookies));
     }
 
     /**

src/Http/ServerRequest.php

@@ -6,6 +6,7 @@
 namespace Valar\Http;
 
 use Mvc5\Arg;
+use Mvc5\Cookie\HttpCookies;
 use Mvc5\Http\HttpHeaders;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\PhpInputStream;
@@ -40,10 +41,15 @@ function __construct($config = [])
             ServerRequestFactory::marshalUriFromServer($server, \iterator_to_array($config[Arg::HEADERS]))
         );
 
+        !isset($config[Arg::COOKIES]) &&
+            $config[Arg::COOKIES] = new HttpCookies($_COOKIE);
+
+        is_array($config[Arg::COOKIES]) &&
+            $config[Arg::COOKIES] = new HttpCookies($config[Arg::COOKIES]);
+
         !isset($config[Arg::ARGS]) && $config[Arg::ARGS] = $_GET;
         !isset($config[Arg::ATTRIBUTES]) && $config[Arg::ATTRIBUTES] = [];
         !isset($config[Arg::BODY]) && $config[Arg::BODY] = new PhpInputStream;
-        !isset($config[Arg::COOKIES]) && $config[Arg::COOKIES] = $_COOKIE;
         !isset($config[Arg::DATA]) && $config[Arg::DATA] = $_POST;
         !isset($config[Arg::FILES]) && $config[Arg::FILES] = ServerRequestFactory::normalizeFiles($_FILES);
         !isset($config[Arg::METHOD]) && $config[Arg::METHOD] = $server['REQUEST_METHOD'] ?? 'GET';

tests/Http/ServerRequestTest.php

@@ -46,7 +46,7 @@ function test_get_cookie_params()
     /**
      *
      */
-    function test_get_cookie_params_from_traversable()
+    function test_get_cookie_params_from_http_cookies()
     {
         $request = new ServerRequest(['cookies' => new HttpCookies(['foo' => 'bar'])]);