Merge pull request #76 from aaa2000/cookie-date

Supports more cookie date formats in the Cookie Plugin

Author: joelwurtz

CHANGELOG.md

@@ -8,6 +8,7 @@
 - `PluginClientFactory` to create `PluginClient` instances.
 - Added new option 'delay' for `RetryPlugin`.
 - Added new option 'decider' for `RetryPlugin`.
+- Supports more cookie date formats in the Cookie Plugin
 
 ### Changed
 

composer.json

@@ -14,7 +14,7 @@
         "php": ">=5.4",
         "php-http/httplug": "^1.1",
         "php-http/message-factory": "^1.0",
-        "php-http/message": "^1.2",
+        "php-http/message": "^1.6",
         "symfony/options-resolver": "^2.6 || ^3.0"
     },
     "require-dev": {

src/Plugin/CookiePlugin.php

@@ -6,6 +6,8 @@
 use Http\Client\Exception\TransferException;
 use Http\Message\Cookie;
 use Http\Message\CookieJar;
+use Http\Message\CookieUtil;
+use Http\Message\Exception\UnexpectedValueException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -114,15 +116,17 @@ private function createCookie(RequestInterface $request, $setCookie)
 
             switch (strtolower($key)) {
                 case 'expires':
-                    $expires = \DateTime::createFromFormat(\DateTime::COOKIE, $value);
-
-                    if (true !== ($expires instanceof \DateTime)) {
+                    try {
+                        $expires = CookieUtil::parseDate($value);
+                    } catch (UnexpectedValueException $e) {
                         throw new TransferException(
                             sprintf(
                                 'Cookie header `%s` expires value `%s` could not be converted to date',
                                 $name,
                                 $value
-                            )
+                            ),
+                            null,
+                            $e
                         );
                     }