bug #21462 [BrowserKit] ignore invalid cookies expires date format (xabbuh)

fabpot · fabpot · commit a6c05e5fb677 · 2017-01-30T07:30:55.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [BrowserKit] ignore invalid cookies expires date format | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15656 | License | MIT | Doc PR | Commits ------- f19788d ignore invalid cookies expires date format
diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php
@@ -213,8 +213,6 @@ private static function parseDate($dateValue)
         if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {
             return $date->format('U');
         }
-
-        throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue));
     }
 
     /**
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -88,10 +88,11 @@ public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
         Cookie::fromString('foo');
     }
 
-    public function testFromStringThrowsAnExceptionIfCookieDateIsNotValid()
+    public function testFromStringIgnoresInvalidExpiresDate()
     {
-        $this->setExpectedException('InvalidArgumentException');
-        Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
+        $cookie = Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
+
+        $this->assertFalse($cookie->isExpired());
     }
 
     public function testFromStringThrowsAnExceptionIfUrlIsNotValid()

Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,6 @@ private static function parseDate($dateValue)`
`213`	`213`	`if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {`
`214`	`214`	`return $date->format('U');`
`215`	`215`	`}`
`216`		`-`
`217`		`- throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue));`
`218`	`216`	`}`
`219`	`217`
`220`	`218`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,11 @@ public function testFromStringThrowsAnExceptionIfCookieIsNotValid()`
`88`	`88`	`Cookie::fromString('foo');`
`89`	`89`	`}`
`90`	`90`
`91`		`- public function testFromStringThrowsAnExceptionIfCookieDateIsNotValid()`
	`91`	`+ public function testFromStringIgnoresInvalidExpiresDate()`
`92`	`92`	`{`
`93`		`- $this->setExpectedException('InvalidArgumentException');`
`94`		`- Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');`
	`93`	`+ $cookie = Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');`
	`94`	`+`
	`95`	`+ $this->assertFalse($cookie->isExpired());`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`public function testFromStringThrowsAnExceptionIfUrlIsNotValid()`