[BrowserKit] added ability to ignored malformed set-cookie header

jfsimon · jfsimon · commit fc475892440b · 2013-03-12T16:50:09.000+01:00
diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -109,7 +109,11 @@ public function updateFromSetCookie(array $setCookies, $uri = null)
         }
 
         foreach ($cookies as $cookie) {
-            $this->set(Cookie::fromString($cookie, $uri));
+            try {
+                $this->set(Cookie::fromString($cookie, $uri));
+            } catch (\InvalidArgumentException $e) {
+                // invalid cookies are just ignored
+            }
         }
     }
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php
@@ -82,6 +82,13 @@ public function testUpdateFromSetCookie()
         $this->assertEquals('bar', $cookieJar->get('bar')->getValue(), '->updateFromSetCookie() keeps existing cookies');
     }
 
+    public function testUpdateFromEmptySetCookie()
+    {
+        $cookieJar = new CookieJar();
+        $cookieJar->updateFromSetCookie(array(''));
+        $this->assertEquals(array(), $cookieJar->all());
+    }
+
     public function testUpdateFromSetCookieWithMultipleCookies()
     {
         $timestamp = time() + 3600;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,11 @@ public function updateFromSetCookie(array $setCookies, $uri = null)`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`foreach ($cookies as $cookie) {`
`112`		`- $this->set(Cookie::fromString($cookie, $uri));`
	`112`	`+ try {`
	`113`	`+ $this->set(Cookie::fromString($cookie, $uri));`
	`114`	`+ } catch (\InvalidArgumentException $e) {`
	`115`	`+ // invalid cookies are just ignored`
	`116`	`+ }`
`113`	`117`	`}`
`114`	`118`	`}`
`115`	`119`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,13 @@ public function testUpdateFromSetCookie()`
`82`	`82`	`$this->assertEquals('bar', $cookieJar->get('bar')->getValue(), '->updateFromSetCookie() keeps existing cookies');`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ public function testUpdateFromEmptySetCookie()`
	`86`	`+ {`
	`87`	`+ $cookieJar = new CookieJar();`
	`88`	`+ $cookieJar->updateFromSetCookie(array(''));`
	`89`	`+ $this->assertEquals(array(), $cookieJar->all());`
	`90`	`+ }`
	`91`	`+`
`85`	`92`	`public function testUpdateFromSetCookieWithMultipleCookies()`
`86`	`93`	`{`
`87`	`94`	`$timestamp = time() + 3600;`