refactor(HasHttpClient): adjust multipart options handling

guanguans · guanguans · commit f2353ea3db86 · 2024-03-08T18:18:23.000+08:00
- Update HasHttpClient.php to handle multipart options differently
  - Modify Utils.php to adjust multipartFor method signature
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

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,10 @@ public function defaultHttpOptions(): array`
`175`	`175`	`public function normalizeHttpOptions(array $options): array`
`176`	`176`	`{`
`177`	`177`	`if (isset($options[RequestOptions::MULTIPART])) {`
`178`		`- $options[RequestOptions::MULTIPART] = Utils::multipartFor($options[RequestOptions::MULTIPART]);`
	`178`	`+ $options[RequestOptions::MULTIPART] = Utils::multipartFor(`
	`179`	`+ $options[RequestOptions::MULTIPART],`
	`180`	`+ MULTIPART_TRY_OPEN_FILE`
	`181`	`+ );`
`179`	`182`	`}`
`180`	`183`
`181`	`184`	`return $options;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class Utils`
`24`	`24`	`/**`
`25`	`25`	`* Convert a form array into a multipart array.`
`26`	`26`	`*/`
`27`		`- public static function multipartFor(array $form, int $options = MULTIPART_TRY_OPEN_FILE): array`
	`27`	`+ public static function multipartFor(array $form, int $options = 0): array`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`	`30`	`* @param array-key $name`