[HttpFoundation] Fix cookie to string conversion for raw cookies

ro0NL · fabpot · commit 5e899cd2a78d · 2016-12-14T08:17:13.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -80,20 +80,20 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
      */
     public function __toString()
     {
-        $str = urlencode($this->getName()).'=';
+        $str = ($this->isRaw() ? $this->getName() : urlencode($this->getName())).'=';
 
         if ('' === (string) $this->getValue()) {
             $str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001);
         } else {
-            $str .= urlencode($this->getValue());
+            $str .= $this->isRaw() ? $this->getValue() : urlencode($this->getValue());
 
             if ($this->getExpiresTime() !== 0) {
                 $str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime());
             }
         }
 
-        if ($this->path) {
-            $str .= '; path='.$this->path;
+        if ($this->getPath()) {
+            $str .= '; path='.$this->getPath();
         }
 
         if ($this->getDomain()) {
@@ -124,7 +124,7 @@ public function getName()
     /**
      * Gets the value of the cookie.
      *
-     * @return string
+     * @return string|null
      */
     public function getValue()
     {
@@ -134,7 +134,7 @@ public function getValue()
     /**
      * Gets the domain that the cookie is available to.
      *
-     * @return string
+     * @return string|null
      */
     public function getDomain()
     {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -154,10 +154,12 @@ public function testToString()
 
     public function testRawCookie()
     {
-        $cookie = new Cookie('foo', 'bar', 3600, '/', '.myfoodomain.com', false, true);
+        $cookie = new Cookie('foo', 'b a r', 0, '/', null, false, false);
         $this->assertFalse($cookie->isRaw());
+        $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);
 
-        $cookie = new Cookie('foo', 'bar', 3600, '/', '.myfoodomain.com', false, true, true);
+        $cookie = new Cookie('foo', 'b+a+r', 0, '/', null, false, false, true);
         $this->assertTrue($cookie->isRaw());
+        $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -80,20 +80,20 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom`
`80`	`80`	`*/`
`81`	`81`	`public function __toString()`
`82`	`82`	`{`
`83`		`- $str = urlencode($this->getName()).'=';`
	`83`	`+ $str = ($this->isRaw() ? $this->getName() : urlencode($this->getName())).'=';`
`84`	`84`
`85`	`85`	`if ('' === (string) $this->getValue()) {`
`86`	`86`	`$str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001);`
`87`	`87`	`} else {`
`88`		`- $str .= urlencode($this->getValue());`
	`88`	`+ $str .= $this->isRaw() ? $this->getValue() : urlencode($this->getValue());`
`89`	`89`
`90`	`90`	`if ($this->getExpiresTime() !== 0) {`
`91`	`91`	`$str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime());`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`95`		`- if ($this->path) {`
`96`		`- $str .= '; path='.$this->path;`
	`95`	`+ if ($this->getPath()) {`
	`96`	`+ $str .= '; path='.$this->getPath();`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if ($this->getDomain()) {`
`@@ -124,7 +124,7 @@ public function getName()`
`124`	`124`	`/**`
`125`	`125`	`* Gets the value of the cookie.`
`126`	`126`	`*`
`127`		`- * @return string`
	`127`	`+ * @return string\|null`
`128`	`128`	`*/`
`129`	`129`	`public function getValue()`
`130`	`130`	`{`
`@@ -134,7 +134,7 @@ public function getValue()`
`134`	`134`	`/**`
`135`	`135`	`* Gets the domain that the cookie is available to.`
`136`	`136`	`*`
`137`		`- * @return string`
	`137`	`+ * @return string\|null`
`138`	`138`	`*/`
`139`	`139`	`public function getDomain()`
`140`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,12 @@ public function testToString()`
`154`	`154`
`155`	`155`	`public function testRawCookie()`
`156`	`156`	`{`
`157`		`- $cookie = new Cookie('foo', 'bar', 3600, '/', '.myfoodomain.com', false, true);`
	`157`	`+ $cookie = new Cookie('foo', 'b a r', 0, '/', null, false, false);`
`158`	`158`	`$this->assertFalse($cookie->isRaw());`
	`159`	`+ $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);`
`159`	`160`
`160`		`- $cookie = new Cookie('foo', 'bar', 3600, '/', '.myfoodomain.com', false, true, true);`
	`161`	`+ $cookie = new Cookie('foo', 'b+a+r', 0, '/', null, false, false, true);`
`161`	`162`	`$this->assertTrue($cookie->isRaw());`
	`163`	`+ $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);`
`162`	`164`	`}`
`163`	`165`	`}`