Minor changes to the CookieCryptTrait, doc block & property

cakephp · Mar 1, 2017 · 8065bc7 · 8065bc7
1 parent 9dfdc20
commit 8065bc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Http/Cookie/Cookie.php b/src/Http/Cookie/Cookie.php
@@ -381,6 +381,7 @@ public function read($path = null)
      * Throws a \RuntimeException if the cookie value was not expanded
      *
      * @throws \RuntimeException
+     * @return void
      */
     protected function _isExpanded()
     {

diff --git a/src/Http/Cookie/CookieCryptTrait.php b/src/Http/Cookie/CookieCryptTrait.php
@@ -48,6 +48,13 @@ trait CookieCryptTrait
      */
     protected $encryptionKey = '';
 
+    /**
+     * Prefix of the encrypted string
+     *
+     * @var string
+     */
+    protected $encryptedStringPrefix = 'Q2FrZQ==.';
+
     /**
      * Sets the encryption cipher
      *
@@ -124,15 +131,14 @@ protected function _encrypt($value)
         }
 
         $encrypt = $this->encryptionCipher;
-        $prefix = 'Q2FrZQ==.';
         $cipher = null;
         $key = $this->getEncryptionKey();
 
         if ($encrypt === 'aes') {
             $cipher = Security::encrypt($value, $key);
         }
 
-        return $prefix . base64_encode($cipher);
+        return $this->encryptedStringPrefix . base64_encode($cipher);
     }
 
     /**
@@ -185,11 +191,10 @@ protected function _decode($value)
             return $this->_expand($value);
         }
 
-        $prefix = 'Q2FrZQ==.';
         $key = $this->getEncryptionKey();
         $encrypt = $this->encryptionCipher;
 
-        $value = base64_decode(substr($value, strlen($prefix)));
+        $value = base64_decode(substr($value, strlen($this->encryptedStringPrefix)));
 
         if ($encrypt === 'aes') {
             $value = Security::decrypt($value, $key);