fix: 关键字冲突处理

w7corp · Jun 9, 2022 · 8feb208 · 8feb208 · vercel · Jun 9, 2022
1 parent 157a349
commit 8feb208
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Kernel/HttpClient/RequestUtil.php b/src/Kernel/HttpClient/RequestUtil.php
@@ -71,8 +71,11 @@ public static function formatDefaultOptions(array $options): array
 
     public static function formatOptions(array $options, string $method): array
     {
-        if (array_key_exists('query', $options)
-            || array_key_exists('body', $options)
+        if (array_key_exists('query', $options) && is_array($options['query']) && empty($options['query'])) {
+            return $options;
+        }
+
+        if (array_key_exists('body', $options)
             || array_key_exists('json', $options)
             || array_key_exists('xml', $options)
         ) {
@@ -87,7 +90,7 @@ public static function formatOptions(array $options, string $method): array
 
         foreach ($options as $key => $value) {
             if (!array_key_exists($key, HttpClientInterface::OPTIONS_DEFAULTS)) {
-                $options[$name][$key] = $value;
+                $options[$name][trim($key, '"')] = $value;
                 unset($options[$key]);
             }
         }

diff --git a/tests/Kernel/HttpClient/RequestUtilTest.php b/tests/Kernel/HttpClient/RequestUtilTest.php
@@ -97,6 +97,20 @@ public function test_format_options()
         $this->assertArrayHasKey('body', $formatted);
         $this->assertSame('true', $formatted['body']['overtrue']);
         $this->assertSame('world', $formatted['body']['hello']);
+
+
+        // POST with `query`
+        $options = ['overtrue' => 'true', 'hello' => 'world', '"query"' => 'id=1'];
+        $formatted = RequestUtil::formatOptions($options, 'POST');
+
+        $this->assertArrayNotHasKey('overtrue', $formatted);
+        $this->assertArrayNotHasKey('hello', $formatted);
+        $this->assertArrayHasKey('body', $formatted);
+        $this->assertArrayNotHasKey('query', $formatted);
+        $this->assertArrayHasKey('query', $formatted['body']);
+        $this->assertSame('id=1', $formatted['body']['query']);
+        $this->assertSame('true', $formatted['body']['overtrue']);
+        $this->assertSame('world', $formatted['body']['hello']);
     }
 
     public function test_format_xml_body()