[BrowserKit] Throw exception on invalid cookie expiration timestamp

anlutro · fabpot · commit 8df535dbf9ea · 2014-01-06T17:03:23.000+01:00
diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php
@@ -81,14 +81,22 @@ public function __construct($name, $value, $expires = null, $path = null, $domai
      *
      * @return string The HTTP representation of the Cookie
      *
+     * @throws \UnexpectedValueException
+     *
      * @api
      */
     public function __toString()
     {
         $cookie = sprintf('%s=%s', $this->name, $this->rawValue);
 
         if (null !== $this->expires) {
-            $cookie .= '; expires='.substr(\DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'))->format(self::$dateFormats[0]), 0, -5);
+            $dateTime = \DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'));
+
+            if ($dateTime === false) {
+                throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.'), $this->expires);
+            }
+
+            $cookie .= '; expires='.substr($dateTime->format(self::$dateFormats[0]), 0, -5);
         }
 
         if ('' !== $this->domain) {

Original file line number	Diff line number	Diff line change
`@@ -81,14 +81,22 @@ public function __construct($name, $value, $expires = null, $path = null, $domai`
`81`	`81`	`*`
`82`	`82`	`* @return string The HTTP representation of the Cookie`
`83`	`83`	`*`
	`84`	`+ * @throws \UnexpectedValueException`
	`85`	`+ *`
`84`	`86`	`* @api`
`85`	`87`	`*/`
`86`	`88`	`public function __toString()`
`87`	`89`	`{`
`88`	`90`	`$cookie = sprintf('%s=%s', $this->name, $this->rawValue);`
`89`	`91`
`90`	`92`	`if (null !== $this->expires) {`
`91`		`- $cookie .= '; expires='.substr(\DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'))->format(self::$dateFormats[0]), 0, -5);`
	`93`	`+ $dateTime = \DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'));`
	`94`	`+`
	`95`	`+ if ($dateTime === false) {`
	`96`	`+ throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.'), $this->expires);`
	`97`	`+ }`
	`98`	`+`
	`99`	`+ $cookie .= '; expires='.substr($dateTime->format(self::$dateFormats[0]), 0, -5);`
`92`	`100`	`}`
`93`	`101`
`94`	`102`	`if ('' !== $this->domain) {`