refactor(HasHttpClient): adjust multipart options handling

- Update HasHttpClient.php to handle multipart options differently - Modify Utils.php to adjust multipartFor method signature
guanguans · Mar 8, 2024 · f2353ea · f2353ea
1 parent 57dcf59
commit f2353ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48"/>
+<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+  <file src="src/Foundation/Concerns/HasHttpClient.php">
+    <UndefinedConstant>
+      <code><![CDATA[MULTIPART_TRY_OPEN_FILE]]></code>
+    </UndefinedConstant>
+  </file>
+</files>
diff --git a/src/Foundation/Concerns/HasHttpClient.php b/src/Foundation/Concerns/HasHttpClient.php
@@ -175,7 +175,10 @@ public function defaultHttpOptions(): array
     public function normalizeHttpOptions(array $options): array
     {
         if (isset($options[RequestOptions::MULTIPART])) {
-            $options[RequestOptions::MULTIPART] = Utils::multipartFor($options[RequestOptions::MULTIPART]);
+            $options[RequestOptions::MULTIPART] = Utils::multipartFor(
+                $options[RequestOptions::MULTIPART],
+                MULTIPART_TRY_OPEN_FILE
+            );
         }
 
         return $options;

diff --git a/src/Foundation/Support/Utils.php b/src/Foundation/Support/Utils.php
@@ -24,7 +24,7 @@ class Utils
     /**
      * Convert a form array into a multipart array.
      */
-    public static function multipartFor(array $form, int $options = MULTIPART_TRY_OPEN_FILE): array
+    public static function multipartFor(array $form, int $options = 0): array
     {
         /**
          * @param array-key $name