Revert cookie collection setter.

cakephp · May 30, 2017 · 19935c0 · 19935c0
1 parent c0f5030
commit 19935c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 35 deletions.
diff --git a/src/Http/Client.php b/src/Http/Client.php
@@ -16,9 +16,8 @@
 use Cake\Core\App;
 use Cake\Core\Exception\Exception;
 use Cake\Core\InstanceConfigTrait;
-use Cake\Http\Client\CookieCollection as ClientCookieCollection;
+use Cake\Http\Client\CookieCollection;
 use Cake\Http\Client\Request;
-use Cake\Http\Cookie\CookieCollection;
 use Cake\Utility\Hash;
 
 /**
@@ -169,44 +168,20 @@ public function __construct($config = [])
             $this->_cookies = $this->_config['cookieJar'];
             $this->setConfig('cookieJar', null);
         } else {
-            $this->_cookies = new ClientCookieCollection();
+            $this->_cookies = new CookieCollection();
         }
     }
 
     /**
      * Get the cookies stored in the Client.
      *
-     * @return \Cake\Http\Cookie\CookieCollection
-     * @deprecated 3.5.0 Use getCookies() instead.
+     * @return \Cake\Http\Client\CookieCollection
      */
     public function cookies()
     {
         return $this->_cookies;
     }
 
-    /**
-     * Get the cookies stored in the Client.
-     *
-     * @return \Cake\Http\Cookie\CookieCollection
-     */
-    public function getCookies()
-    {
-        return $this->_cookies;
-    }
-
-    /**
-     * Sets the cookie collection.
-     *
-     * @param \Cake\Http\Cookie\CookieCollection $cookies Cookie collection to be set.
-     * @return $this
-     */
-    public function setCookies(CookieCollection $cookies)
-    {
-        $this->_cookies = $cookies;
-
-        return $this;
-    }
-
     /**
      * Do a GET request.
      *

diff --git a/tests/TestCase/Http/ClientTest.php b/tests/TestCase/Http/ClientTest.php
@@ -622,22 +622,18 @@ public function testCookieStorage()
     }
 
     /**
-     * Test cookie collection getter and setter,
+     * Test cookieJar config option.
      *
      * @return void
      */
-    public function testCookies()
+    public function testCookieJar()
     {
         $jar = new CookieCollection();
         $http = new Client([
             'cookieJar' => $jar
         ]);
 
-        $this->assertSame($jar, $http->getCookies());
-
-        $cookies = new CookieCollection();
-        $http->setCookies($cookies);
-        $this->assertSame($cookies, $http->getCookies());
+        $this->assertSame($jar, $http->cookies());
     }
 
     /**