Make caseless remove robust (#440)

guzzle · Oct 4, 2021 · c7b89ff · c7b89ff
1 parent 7e5aa3c
commit c7b89ff
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/Utils.php b/src/Utils.php
@@ -25,7 +25,7 @@ public static function caselessRemove(array $keys, array $data): array
         }
 
         foreach ($data as $k => $v) {
-            if (!in_array(strtolower($k), $keys)) {
+            if (!is_string($k) || !in_array(strtolower($k), $keys)) {
                 $result[$k] = $v;
             }
         }

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -470,4 +470,38 @@ public function testModifyServerRequestRetainsAttributes(): void
 
         self::assertSame(['foo' => 'bar'], $modifiedRequest->getAttributes());
     }
+
+    /**
+     * @return list<array{0: string[], 1: array, 2: array}>
+     */
+    public function providesCaselessRemoveCases(): array
+    {
+        return [
+            [
+                ['foo-bar'],
+                ['Foo-Bar' => 'hello'],
+                []
+            ],
+            [
+                ['foo-bar'],
+                ['hello'],
+                ['hello']
+            ],
+            [
+                ['foo-Bar'],
+                ['Foo-Bar' => 'hello', 123 => '', 'Foo-BAR' => 'hello123', 'foobar' => 'baz'],
+                [123 => '', 'foobar' => 'baz'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider providesCaselessRemoveCases
+     *
+     * @param string[] $keys
+     */
+    public function testCaselessRemove(array $keys, array $data, array $expected): void
+    {
+        self::assertSame($expected, Psr7\Utils::caselessRemove($keys, $data));
+    }
 }