Revert "Moved serialization of Cookie to Cookie. Added unit test …

…for serialization / deserialization."

This reverts commit a2acd88.

framework/web/Cookie.php

@@ -7,8 +7,6 @@
 
 namespace yii\web;
 
-use yii\base\InvalidConfigException;
-
 /**
  * Cookie represents information related with a cookie, such as [[name]], [[value]], [[domain]], etc.
  *
@@ -67,35 +65,4 @@ public function __toString()
     {
         return (string) $this->value;
     }
-
-    /**
-     * Unserializes a cookie received by the client.
-     * @param string $data
-     * @return self|null
-     */
-    public static function fromDataString($data)
-    {
-        if (($unserialized = json_decode($data, true)) !== false) {
-            $result = new self();
-            $result->name = $unserialized[0];
-            $result->value = $unserialized[1];
-            $result->expire = 0;
-            return $result;
-        }
-    }
-
-    /**
-     * Unserializes a cookie received by the client.
-     * @return string
-     */
-    public function toDataString()
-    {
-        if (!isset($this->name)) {
-            throw new InvalidConfigException("Cookie serialization requires a name.");
-        }
-        return json_encode([
-            $this->name,
-            $this->value
-        ]);
-    }
 }

framework/web/Request.php

@@ -1286,9 +1286,13 @@ protected function loadCookies()
                 if ($data === false) {
                     continue;
                 }
-
-                if (($cookie = Cookie::fromDataString($data)) !== null && $cookie->name === $name) {
-                    $cookies[$name] = $cookie;
+                $data = @unserialize($data);
+                if (is_array($data) && isset($data[0], $data[1]) && $data[0] === $name) {
+                    $cookies[$name] = new Cookie([
+                        'name' => $name,
+                        'value' => $data[1],
+                        'expire' => null,
+                    ]);
                 }
             }
         } else {

framework/web/Response.php

@@ -394,12 +394,10 @@ protected function sendCookies()
             }
             $validationKey = $request->cookieValidationKey;
         }
-        /** @var Cookie $cookie */
         foreach ($this->getCookies() as $cookie) {
+            $value = $cookie->value;
             if ($cookie->expire != 1  && isset($validationKey)) {
-                $value = Yii::$app->getSecurity()->hashData($cookie->toDataString(), $validationKey);
-            } else {
-                $value = $cookie->value;
+                $value = Yii::$app->getSecurity()->hashData(serialize([$cookie->name, $value]), $validationKey);
             }
             setcookie($cookie->name, $value, $cookie->expire, $cookie->path, $cookie->domain, $cookie->secure, $cookie->httpOnly);
         }