Changed fromResponse() method to SetCookie header

zendframework · Dec 24, 2012 · 7f470d7 · 7f470d7
1 parent 4eae49a
commit 7f470d7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/library/Zend/Http/Client/Cookies.php b/library/Zend/Http/Client/Cookies.php
@@ -11,7 +11,8 @@
 namespace Zend\Http\Client;
 
 use ArrayIterator;
-use Zend\Http\Header\Cookie;
+use Zend\Http\Header\SetCookie;
+use Zend\Stdlib\ArrayUtils;
 use Zend\Http\Response;
 use Zend\Uri;
 
@@ -93,7 +94,7 @@ public function __construct()
      * Add a cookie to the class. Cookie should be passed either as a Zend\Http\Header\Cookie object
      * or as a string - in which case an object is created from the string.
      *
-     * @param Cookie|string $cookie
+     * @param SetCookie|string $cookie
      * @param Uri\Uri|string    $ref_uri Optional reference URI (for domain, path, secure)
      * @throws Exception\InvalidArgumentException if invalid $cookie value
      */
@@ -103,7 +104,7 @@ public function addCookie($cookie, $ref_uri = null)
             $cookie = Cookie::fromString($cookie, $ref_uri);
         }
 
-        if ($cookie instanceof Cookie) {
+        if ($cookie instanceof SetCookie) {
             $domain = $cookie->getDomain();
             $path   = $cookie->getPath();
             if (!isset($this->cookies[$domain])) {
@@ -128,6 +129,9 @@ public function addCookie($cookie, $ref_uri = null)
     public function addCookiesFromResponse(Response $response, $ref_uri)
     {
         $cookie_hdrs = $response->getHeaders()->get('Set-Cookie');
+        if ($cookie_hdrs instanceof \ArrayIterator) {
+            $cookie_hdrs = ArrayUtils::iteratorToArray($cookie_hdrs);
+        }
 
         if (is_array($cookie_hdrs)) {
             foreach ($cookie_hdrs as $cookie) {

diff --git a/tests/ZendTest/Http/CookiesTest.php b/tests/ZendTest/Http/CookiesTest.php
@@ -27,8 +27,21 @@ public function testFromResponseInSetCookie()
         $headers->addHeader($header);
         $response->setHeaders($headers);
 
-
         $response = \Zend\Http\Cookies::fromResponse($response, "http://www.zend.com");
         $this->assertSame($header, $response->getCookie('http://www.zend.com', 'foo'));
     }
+
+    public function testFromResponseInCookie()
+    {
+        $response = new Response();
+        $headers = new Headers();
+        $header = new \Zend\Http\Header\SetCookie("foo", "bar");
+        $header->setDomain("www.zend.com");
+        $header->setPath("/");
+        $headers->addHeader($header);
+        $response->setHeaders($headers);
+
+        $response = \Zend\Http\Client\Cookies::fromResponse($response, "http://www.zend.com");
+        $this->assertSame($header, $response->getCookie('http://www.zend.com', 'foo'));
+    }
 }