symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Cookie.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/HttpFoundation/Cookie.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
Lines changed: 18 additions & 4 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
Lines changed: 18 additions & 4 deletions
@@ -56,15 +56,15 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
         } elseif (!is_numeric($expire)) {
             $expire = strtotime($expire);
 
-            if (false === $expire || -1 === $expire) {
+            if (false === $expire) {
                 throw new \InvalidArgumentException('The cookie expiration time is not valid.');
             }
         }
 
         $this->name = $name;
         $this->value = $value;
         $this->domain = $domain;
-        $this->expire = $expire;
+        $this->expire = 0 < $expire ? (int) $expire : 0;
         $this->path = empty($path) ? '/' : $path;
         $this->secure = (bool) $secure;
         $this->httpOnly = (bool) $httpOnly;
@@ -84,7 +84,7 @@ public function __toString()
         } else {
             $str .= urlencode($this->getValue());
 
-            if ($this->getExpiresTime() !== 0) {
+            if (0 !== $this->getExpiresTime()) {
                 $str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime());
             }
         }
 
@@ -52,7 +52,14 @@ public function testInstantiationThrowsExceptionIfCookieNameContainsInvalidChara
      */
     public function testInvalidExpiration()
     {
-        $cookie = new Cookie('MyCookie', 'foo', 'bar');
+        new Cookie('MyCookie', 'foo', 'bar');
+    }
+
+    public function testNegativeExpirationIsNotPossible()
+    {
+        $cookie = new Cookie('foo', 'bar', -100);
+
+        $this->assertSame(0, $cookie->getExpiresTime());
     }
 
     public function testGetValue()
@@ -77,6 +84,13 @@ public function testGetExpiresTime()
         $this->assertEquals(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
     }
 
+    public function testGetExpiresTimeIsCastToInt()
+    {
+        $cookie = new Cookie('foo', 'bar', 3600.9);
+
+        $this->assertSame(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date as an integer');
+    }
+
     public function testConstructorWithDateTime()
     {
         $expire = new \DateTime();
@@ -143,12 +157,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; path=/; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie');
+        $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__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');
+        $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', (string) $cookie, '->__toString() returns string representation of a cleared cookie if value is NULL');
 
         $cookie = new Cookie('foo', 'bar', 0, '/', '');
-        $this->assertEquals('foo=bar; path=/; httponly', $cookie->__toString());
+        $this->assertEquals('foo=bar; path=/; httponly', (string) $cookie);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,15 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom`
`56`	`56`	`} elseif (!is_numeric($expire)) {`
`57`	`57`	`$expire = strtotime($expire);`
`58`	`58`
`59`		`- if (false === $expire \|\| -1 === $expire) {`
	`59`	`+ if (false === $expire) {`
`60`	`60`	`throw new \InvalidArgumentException('The cookie expiration time is not valid.');`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`$this->name = $name;`
`65`	`65`	`$this->value = $value;`
`66`	`66`	`$this->domain = $domain;`
`67`		`- $this->expire = $expire;`
	`67`	`+ $this->expire = 0 < $expire ? (int) $expire : 0;`
`68`	`68`	`$this->path = empty($path) ? '/' : $path;`
`69`	`69`	`$this->secure = (bool) $secure;`
`70`	`70`	`$this->httpOnly = (bool) $httpOnly;`
`@@ -84,7 +84,7 @@ public function __toString()`
`84`	`84`	`} else {`
`85`	`85`	`$str .= urlencode($this->getValue());`
`86`	`86`
`87`		`- if ($this->getExpiresTime() !== 0) {`
	`87`	`+ if (0 !== $this->getExpiresTime()) {`
`88`	`88`	`$str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime());`
`89`	`89`	`}`
`90`	`90`	`}`