Remove encrpytion features from individual cookies.

With an encryption middleware in place, we no longer need to have encryption features on individual cookies. Cookies are now simple immutable value objects and the middleware handles encryption concerns.
cakephp · Apr 15, 2017 · 7cc5693 · 7cc5693
1 parent 437cc51
commit 7cc5693
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 472 deletions.
diff --git a/src/Http/Cookie/Cookie.php b/src/Http/Cookie/Cookie.php
@@ -48,8 +48,6 @@
 class Cookie implements CookieInterface
 {
 
-    use CookieCryptTrait;
-
     /**
      * Expires attribute format.
      *
@@ -598,40 +596,6 @@ public function read($path = null)
         return Hash::get($this->value, $path);
     }
 
-    /**
-     * Encrypts the cookie value
-     *
-     * @param string|null $key Encryption key
-     * @return $this
-     */
-    public function encrypt($key = null)
-    {
-        if ($key !== null) {
-            $this->setEncryptionKey($key);
-        }
-
-        $this->value = $this->_encrypt($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Decrypts the cookie value
-     *
-     * @param string|null $key Encryption key
-     * @return $this
-     */
-    public function decrypt($key = null)
-    {
-        if ($key !== null) {
-            $this->setEncryptionKey($key);
-        }
-
-        $this->value = $this->_decrypt($this->value);
-
-        return $this;
-    }
-
     /**
      * Checks if the cookie value was expanded
      *

diff --git a/src/Http/Cookie/CookieCryptTrait.php b/src/Http/Cookie/CookieCryptTrait.php
diff --git a/src/Http/Cookie/RequestCookies.php b/src/Http/Cookie/RequestCookies.php
diff --git a/src/Http/Cookie/ResponseCookies.php b/src/Http/Cookie/ResponseCookies.php
diff --git a/tests/TestCase/Http/Cookie/CookieTest.php b/tests/TestCase/Http/Cookie/CookieTest.php
@@ -22,13 +22,6 @@
 class CookieTest extends TestCase
 {
 
-    /**
-     * Encryption key used in the tests
-     *
-     * @var string
-     */
-    protected $encryptionKey = 'someverysecretkeythatisatleast32charslong';
-
     /**
      * Generate invalid cookie names.
      *
@@ -70,37 +63,6 @@ public function testValidateNameEmptyName()
         new Cookie('', '');
     }
 
-    /**
-     * Test decrypting the cookie
-     *
-     * @return void
-     */
-    public function testDecrypt()
-    {
-        $value = 'cakephp-rocks-and-is-awesome';
-        $cookie = new Cookie('cakephp', $value);
-        $cookie->encrypt($this->encryptionKey);
-        $this->assertTextStartsWith('Q2FrZQ==.', $cookie->getValue());
-        $cookie->decrypt($this->encryptionKey);
-        $this->assertSame($value, $cookie->getValue());
-    }
-
-    /**
-     * Testing encrypting the cookie
-     *
-     * @return void
-     */
-    public function testEncrypt()
-    {
-        $value = 'cakephp-rocks-and-is-awesome';
-
-        $cookie = new Cookie('cakephp', $value);
-        $cookie->encrypt($this->encryptionKey);
-
-        $this->assertNotEquals($value, $cookie->getValue());
-        $this->assertNotEmpty($cookie->getValue());
-    }
-
     /**
      * Tests the header value
      *