Revert skipping invalid cookies

Returning some cookies might lead to incorrect cookie values if the header is malformed, so reverting to returning an empty array.
amphp · Dec 29, 2023 · a19f480 · a19f480
1 parent a9bfd3a
commit a19f480
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Cookie/RequestCookie.php b/src/Cookie/RequestCookie.php
@@ -29,8 +29,8 @@ public static function fromHeader(string $string): array
         $cookies = \explode(";", $string);
         $result = [];
 
-        foreach ($cookies as $cookie) {
-            try {
+        try {
+            foreach ($cookies as $cookie) {
                 // Ignore zero-length cookie.
                 if (\trim($cookie) === '') {
                     continue;
@@ -39,21 +39,21 @@ public static function fromHeader(string $string): array
                 $parts = \explode('=', $cookie, 2);
 
                 if (\count($parts) !== 2) {
-                    continue;
+                    return [];
                 }
 
                 [$name, $value] = $parts;
 
                 $name = \trim($name);
                 if ($name === '') {
-                    continue;
+                    return [];
                 }
 
                 // We can safely trim quotes, as they're not allowed within cookie values
                 $result[] = new self($name, \trim($value, " \t\""));
-            } catch (InvalidCookieException) {
-                // Skip invalid cookie.
             }
+        } catch (InvalidCookieException) {
+            return [];
         }
 
         return $result;

diff --git a/test/Cookie/RequestCookieTest.php b/test/Cookie/RequestCookieTest.php
@@ -14,9 +14,9 @@ public function testParsing()
         $this->assertEquals([new RequestCookie("a", "1"), new RequestCookie("b", "2")], RequestCookie::fromHeader("a=1; b=2"));
         $this->assertEquals([new RequestCookie("a", "1"), new RequestCookie("b", "2")], RequestCookie::fromHeader("a=1 ;b=2"));
         $this->assertEquals([new RequestCookie("a", "1"), new RequestCookie("b", "-2")], RequestCookie::fromHeader("a=1; b = -2"));
-        $this->assertEquals([new RequestCookie("a", "1")], RequestCookie::fromHeader("a=1; b=2,2"));
-        $this->assertEquals([new RequestCookie("a", "1")], RequestCookie::fromHeader("a=1; b=2 2"));
-        $this->assertEquals([new RequestCookie("a", "1")], RequestCookie::fromHeader("a=1; b"));
+        $this->assertEquals([], RequestCookie::fromHeader("a=1; b=2,2"));
+        $this->assertEquals([], RequestCookie::fromHeader("a=1; b=2 2"));
+        $this->assertEquals([], RequestCookie::fromHeader("a=1; b"));
     }
 
     /**