Move Cookie::toArrayClient() to Response::convertCookie()

cakephp · Apr 21, 2017 · 3db767b · 3db767b
1 parent c2876db
commit 3db767b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 61 deletions.
diff --git a/src/Http/Client/Response.php b/src/Http/Client/Response.php
@@ -446,7 +446,7 @@ public function getCookieData($name)
 
         $cookie = $this->cookies->get($name);
 
-        return $this->toArrayClient($cookie);
+        return $this->convertCookie($cookie);
     }
 
     /**
@@ -458,26 +458,16 @@ public function getCookieData($name)
      * @param \Cake\Http\Cookie\CookieInterface $cookie Cookie object.
      * @return array
      */
-    protected function toArrayClient(CookieInterface $cookie)
+    public function convertCookie(CookieInterface $cookie)
     {
-        if ($cookie instanceof Cookie) {
-            return $cookie->toArrayClient();
-        }
-
-        if ($cookie->getExpiry()) {
-            $expires = $cookie->getExpiry()->format(Cookie::EXPIRES_FORMAT);
-        } else {
-            $expires = '';
-        }
-
         return [
             'name' => $cookie->getName(),
             'value' => $cookie->getValue(),
             'path' => $cookie->getPath(),
             'domain' => $cookie->getDomain(),
             'secure' => $cookie->isSecure(),
             'httponly' => $cookie->isHttpOnly(),
-            'expires' => $expires
+            'expires' => $cookie->getFormattedExpires()
         ];
     }
 
@@ -505,7 +495,7 @@ protected function _getCookies()
 
         $cookies = [];
         foreach ($this->cookies as $cookie) {
-            $cookies[$cookie->getName()] = $this->toArrayClient($cookie);
+            $cookies[$cookie->getName()] = $this->convertCookie($cookie);
         }
 
         return $cookies;

diff --git a/src/Http/Cookie/Cookie.php b/src/Http/Cookie/Cookie.php
@@ -619,27 +619,6 @@ public function toArray()
         ];
     }
 
-    /**
-     * Convert the cookie into an array of its properties.
-     *
-     * This method is compatible with older client code that
-     * expects date strings instead of timestamps.
-     *
-     * @return array
-     */
-    public function toArrayClient()
-    {
-        return [
-            'name' => $this->getName(),
-            'value' => $this->getValue(),
-            'path' => $this->getPath(),
-            'domain' => $this->getDomain(),
-            'secure' => $this->isSecure(),
-            'httponly' => $this->isHttpOnly(),
-            'expires' => $this->getFormattedExpires()
-        ];
-    }
-
     /**
      * Convert the cookie into an array of its properties.
      *

diff --git a/tests/TestCase/Http/Client/ResponseTest.php b/tests/TestCase/Http/Client/ResponseTest.php
@@ -13,7 +13,9 @@
  */
 namespace Cake\Test\TestCase\Http\Client;
 
+use Cake\Chronos\Chronos;
 use Cake\Http\Client\Response;
+use Cake\Http\Cookie\Cookie;
 use Cake\Http\Cookie\CookieCollection;
 use Cake\TestSuite\TestCase;
 
@@ -428,4 +430,31 @@ public function testAutoDecodeGzipBody()
         $response = new Response($headers, $body);
         $this->assertEquals('Hello world!', $response->body);
     }
+
+    /**
+     * Test convertCookie
+     *
+     * @return void
+     */
+    public function testConvertCookie()
+    {
+        $date = Chronos::parse('2017-03-31 12:34:56');
+        $cookie = new Cookie('cakephp', 'cakephp-rocks');
+        $cookie = $cookie->withDomain('cakephp.org')
+            ->withPath('/api')
+            ->withExpiry($date)
+            ->withHttpOnly(true)
+            ->withSecure(true);
+        $expected = [
+            'name' => 'cakephp',
+            'value' => 'cakephp-rocks',
+            'path' => '/api',
+            'domain' => 'cakephp.org',
+            'expires' => 'Fri, 31-Mar-2017 12:34:56 GMT',
+            'secure' => true,
+            'httponly' => true
+        ];
+        $response = new Response([], '');
+        $this->assertEquals($expected, $response->convertCookie($cookie));
+    }
 }
diff --git a/tests/TestCase/Http/Cookie/CookieTest.php b/tests/TestCase/Http/Cookie/CookieTest.php
@@ -569,32 +569,6 @@ public function testToArray()
         $this->assertEquals($expected, $cookie->toArray());
     }
 
-    /**
-     * Test toArrayClient
-     *
-     * @return void
-     */
-    public function testToArrayClient()
-    {
-        $date = Chronos::parse('2017-03-31 12:34:56');
-        $cookie = new Cookie('cakephp', 'cakephp-rocks');
-        $cookie = $cookie->withDomain('cakephp.org')
-            ->withPath('/api')
-            ->withExpiry($date)
-            ->withHttpOnly(true)
-            ->withSecure(true);
-        $expected = [
-            'name' => 'cakephp',
-            'value' => 'cakephp-rocks',
-            'path' => '/api',
-            'domain' => 'cakephp.org',
-            'expires' => 'Fri, 31-Mar-2017 12:34:56 GMT',
-            'secure' => true,
-            'httponly' => true
-        ];
-        $this->assertEquals($expected, $cookie->toArrayClient());
-    }
-
     /**
      * Test toArrayResponse
      *