Fix #67 Fixed Cookie creation in cookie plugin.

Expand the cookie header content test with all parts.
Pass cookie parts as intended to cookie object.
Throw transfer exception when the cookie expires header can not be parsed.

Author: Peter Bouwdewijn

spec/CookiePluginSpec.php

@@ -2,15 +2,15 @@
 
 namespace spec\Http\Client\Plugin;
 
-use Http\Promise\FulfilledPromise;
 use Http\Message\Cookie;
 use Http\Message\CookieJar;
+use Http\Promise\FulfilledPromise;
 use Http\Promise\Promise;
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class CookiePluginSpec extends ObjectBehavior
 {
@@ -146,7 +146,7 @@ function it_saves_cookie(RequestInterface $request, ResponseInterface $response,
 
         $response->hasHeader('Set-Cookie')->willReturn(true);
         $response->getHeader('Set-Cookie')->willReturn([
-            'cookie=value',
+            'cookie=value; expires=Tuesday, 31-Mar-99 07:42:12 GMT; Max-Age=60; path=/; domain=test.com; secure; HttpOnly'
         ]);
 
         $request->getUri()->willReturn($uri);
@@ -157,4 +157,24 @@ function it_saves_cookie(RequestInterface $request, ResponseInterface $response,
         $promise->shouldHaveType('Http\Promise\Promise');
         $promise->wait()->shouldReturnAnInstanceOf('Psr\Http\Message\ResponseInterface');
     }
+
+    function it_throws_exception_on_invalid_expires_date(RequestInterface $request, ResponseInterface $response, UriInterface $uri)
+    {
+        $next = function () use ($response) {
+            return new FulfilledPromise($response->getWrappedObject());
+        };
+
+        $response->hasHeader('Set-Cookie')->willReturn(true);
+        $response->getHeader('Set-Cookie')->willReturn([
+            'cookie=value; expires=i-am-an-invalid-date;'
+        ]);
+
+        $request->getUri()->willReturn($uri);
+        $uri->getHost()->willReturn('test.com');
+        $uri->getPath()->willReturn('/');
+
+        $promise = $this->handleRequest($request, $next, function () {});
+        $promise->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $promise->shouldThrow('Http\Client\Exception\TransferException')->duringWait();
+    }
 }

src/CookiePlugin.php

@@ -2,6 +2,7 @@
 
 namespace Http\Client\Plugin;
 
+use Http\Client\Exception\TransferException;
 use Http\Message\Cookie;
 use Http\Message\CookieJar;
 use Psr\Http\Message\RequestInterface;
@@ -86,6 +87,8 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
      * @param $setCookie
      *
      * @return Cookie|null
+     * 
+     * @throws \Http\Client\Exception\TransferException
      */
     private function createCookie(RequestInterface $request, $setCookie)
     {
@@ -97,7 +100,8 @@ private function createCookie(RequestInterface $request, $setCookie)
 
         list($name, $cookieValue) = $this->createValueKey(array_shift($parts));
 
-        $expires = 0;
+        $maxAge = null;
+        $expires = null;
         $domain = $request->getUri()->getHost();
         $path = $request->getUri()->getPath();
         $secure = false;
@@ -109,11 +113,22 @@ private function createCookie(RequestInterface $request, $setCookie)
 
             switch (strtolower($key)) {
                 case 'expires':
-                    $expires = \DateTime::createFromFormat(DATE_COOKIE, $value);
+                    $expires = \DateTime::createFromFormat(\DateTime::COOKIE, $value);
+
+                    if (true !== ($expires instanceof \DateTime)) {
+                        throw new TransferException(
+                            sprintf(
+                                'Cookie header `%s` expires value `%s` could not be converted to date',
+                                $name,
+                                $value
+                            )
+                        );
+                    }
+
                     break;
 
                 case 'max-age':
-                    $expires = (new \DateTime())->add(new \DateInterval('PT'.(int) $value.'S'));
+                    $maxAge = (int) $value;
                     break;
 
                 case 'domain':
@@ -134,7 +149,7 @@ private function createCookie(RequestInterface $request, $setCookie)
             }
         }
 
-        return new Cookie($name, $cookieValue, $expires, $domain, $path, $secure, $httpOnly);
+        return new Cookie($name, $cookieValue, $maxAge, $domain, $path, $secure, $httpOnly, $expires);
     }
 
     /**