add json value support for setCookie header

with unittest
ameir · Sep 4, 2013 · b4b9063 · b4b9063
1 parent 2a33a10
commit b4b9063
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/library/Zend/Http/Header/SetCookie.php b/library/Zend/Http/Header/SetCookie.php
@@ -205,13 +205,9 @@ public function getFieldValue()
             return '';
         }
 
-        $value = $this->getValue();
-        if (strpos($value, '"')!==false) {
-            $value = '"'.urlencode(str_replace('"', '', $value)).'"';
-        } else {
-            $value = urlencode($value);
-        }
-        $fieldValue = $this->getName() . '=' . $value;
+        $value = urlencode($this->getValue());
+
+        $fieldValue = $this->getName() . '="' . $value .'"';
 
         $version = $this->getVersion();
         if ($version!==null) {

diff --git a/tests/ZendTest/Http/Header/SetCookieTest.php b/tests/ZendTest/Http/Header/SetCookieTest.php
@@ -306,6 +306,26 @@ public function testToString($cStr, $info, $expected)
         $this->assertEquals($cookie->getFieldName() . ': ' . $expected, $cookie->toString());
     }
 
+    public function testSetJsonValue()
+    {
+		$cookieName ="fooCookie";
+		$jsonData = json_encode(array('foo'=>'bar'));
+
+		$cookie= new SetCookie($cookieName,$jsonData);
+
+		$regExp = sprintf('#^%s="%s"#',$cookieName,urlencode($jsonData));
+		$this->assertRegExp($regExp,$cookie->getFieldValue());
+
+		$cookieName ="fooCookie";
+		$jsonData = json_encode(array('foo'=>'bar'));
+
+		$cookie= new SetCookie($cookieName,$jsonData);
+		$cookie->setDomain('example.org');
+
+		$regExp = sprintf('#^%s="%s"; Domain=#',$cookieName,urlencode($jsonData));
+		$this->assertRegExp($regExp,$cookie->getFieldValue());
+    }
+
     /**
      * Provide valid cookie strings with information about them
      *