[HttpFoundation] fixed empty domain= in Cookie::__toString()

fabpot · fabpot · commit 495d0e366e0d · 2013-04-20T19:50:53.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -95,7 +95,7 @@ public function __toString()
             $str .= '; path='.$this->path;
         }
 
-        if (null !== $this->getDomain()) {
+        if ($this->getDomain()) {
             $str .= '; domain='.$this->getDomain();
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -117,11 +117,12 @@ public function testCookieIsCleared()
     public function testToString()
     {
         $cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);
-
         $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie');
 
         $cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');
-
         $this->assertEquals('foo=deleted; expires=' . gmdate("D, d-M-Y H:i:s T", time()-31536001) . '; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');
+
+        $cookie = new Cookie('foo', 'bar', 0, '/', '');
+        $this->assertEquals('foo=bar; httponly', $cookie->__toString());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,12 @@ public function testCookieIsCleared()`
`117`	`117`	`public function testToString()`
`118`	`118`	`{`
`119`	`119`	`$cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);`
`120`		`-`
`121`	`120`	`$this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie');`
`122`	`121`
`123`	`122`	`$cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');`
`124`		`-`
`125`	`123`	`$this->assertEquals('foo=deleted; expires=' . gmdate("D, d-M-Y H:i:s T", time()-31536001) . '; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');`
	`124`	`+`
	`125`	`+ $cookie = new Cookie('foo', 'bar', 0, '/', '');`
	`126`	`+ $this->assertEquals('foo=bar; httponly', $cookie->__toString());`
`126`	`127`	`}`
`127`	`128`	`}`