Renamed convertCookie() to convertCookieToArray() and make them prote…

…cted.
cakephp · Apr 25, 2017 · d5ae143 · d5ae143
1 parent 74e1c4f
commit d5ae143
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 89 deletions.
diff --git a/src/Http/Client/CookieCollection.php b/src/Http/Client/CookieCollection.php
@@ -79,7 +79,7 @@ public function getAll()
     {
         $out = [];
         foreach ($this->cookies as $cookie) {
-            $out[] = $this->convertCookie($cookie);
+            $out[] = $this->convertCookieToArray($cookie);
         }
 
         return $out;
@@ -93,7 +93,7 @@ public function getAll()
      * @param \Cake\Http\Cookie\CookieInterface $cookie Cookie object.
      * @return array
      */
-    public function convertCookie(CookieInterface $cookie)
+    protected function convertCookieToArray(CookieInterface $cookie)
     {
         return [
             'name' => $cookie->getName(),

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->convertCookie($cookie);
+        return $this->convertCookieToArray($cookie);
     }
 
     /**
@@ -458,7 +458,7 @@ public function getCookieData($name)
      * @param \Cake\Http\Cookie\CookieInterface $cookie Cookie object.
      * @return array
      */
-    public function convertCookie(CookieInterface $cookie)
+    protected function convertCookieToArray(CookieInterface $cookie)
     {
         return [
             'name' => $cookie->getName(),
@@ -495,7 +495,7 @@ protected function _getCookies()
 
         $cookies = [];
         foreach ($this->cookies as $cookie) {
-            $cookies[$cookie->getName()] = $this->convertCookie($cookie);
+            $cookies[$cookie->getName()] = $this->convertCookieToArray($cookie);
         }
 
         return $cookies;

diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -1941,7 +1941,7 @@ public function cookie($options = null)
 
             $cookie = $this->_cookies->get($options);
 
-            return $this->convertCookie($cookie);
+            return $this->convertCookieToArray($cookie);
         }
 
         $options += [
@@ -2047,7 +2047,7 @@ public function getCookie($name)
 
         $cookie = $this->_cookies->get($name);
 
-        return $this->convertCookie($cookie);
+        return $this->convertCookieToArray($cookie);
     }
 
     /**
@@ -2061,7 +2061,7 @@ public function getCookies()
     {
         $out = [];
         foreach ($this->_cookies as $cookie) {
-            $out[$cookie->getName()] = $this->convertCookie($cookie);
+            $out[$cookie->getName()] = $this->convertCookieToArray($cookie);
         }
 
         return $out;
@@ -2076,7 +2076,7 @@ public function getCookies()
      * @param \Cake\Http\Cookie\CookieInterface $cookie Cookie object.
      * @return array
      */
-    public function convertCookie(CookieInterface $cookie)
+    protected function convertCookieToArray(CookieInterface $cookie)
     {
         return [
             'name' => $cookie->getName(),

diff --git a/tests/TestCase/Http/Client/CookieCollectionTest.php b/tests/TestCase/Http/Client/CookieCollectionTest.php
@@ -303,30 +303,4 @@ public function testGetMatchingDomainWithDot()
         $expected = [];
         $this->assertEquals($expected, $result);
     }
-
-    /**
-     * 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' => $date->format('U'),
-            'secure' => true,
-            'httponly' => true
-        ];
-        $this->assertEquals($expected, $this->cookies->convertCookie($cookie));
-    }
 }
diff --git a/tests/TestCase/Http/Client/ResponseTest.php b/tests/TestCase/Http/Client/ResponseTest.php
@@ -430,31 +430,4 @@ 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/ResponseTest.php b/tests/TestCase/Http/ResponseTest.php
@@ -3051,31 +3051,4 @@ public function testDebugInfo()
         ];
         $this->assertEquals($expected, $result);
     }
-
-    /**
-     * 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',
-            'expire' => $date->format('U'),
-            'secure' => true,
-            'httpOnly' => true
-        ];
-        $response = new Response();
-        $this->assertEquals($expected, $response->convertCookie($cookie));
-    }
 }