fix fail setData(null) error

lanrenbulan · Aug 19, 2024 · 465f45c · 465f45c
1 parent 57cdd37
commit 465f45c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/ApiResult.php b/src/ApiResult.php
@@ -39,9 +39,11 @@ public static function fail(string $message, ?array $data = null): static
         $result = new static();
 
         $result->setSuccess(false)
-            ->setData($data)
-            ->setMessage($message)
-        ;
+            ->setMessage($message);
+
+        if (null !== $data) {
+            $result->setData($data);
+        }
 
         return $result;
     }

diff --git a/src/Client.php b/src/Client.php
@@ -6,7 +6,6 @@
 
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Promise;
-use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Throwable;

diff --git a/src/RequestBuilderTrait.php b/src/RequestBuilderTrait.php
@@ -55,7 +55,12 @@ public function setBodyParams(array $params): static
 
     public function getRequest(): RequestInterface
     {
-        $this->beforeBuildRequest();;
+        $this->beforeBuildRequest();
+
+        // Need to be removed, generated by Guzzle
+        if ('multipart/form-data' === $this->headers['Content-Type']) {
+            unset($this->headers['Content-Type']);
+        }
 
         return new Request($this->method, $this->getUri(), $this->headers, $this->getBody());
     }