Merge pull request #332 from saloonphp/fix/remove-array-filter-on-multipart-builder

Fix | V3 - Remove array filter on multipart builder

Author: Sammyjo20

src/Http/Senders/Factories/GuzzleMultipartBodyFactory.php

@@ -20,12 +20,12 @@ class GuzzleMultipartBodyFactory implements MultipartBodyFactory
     public function create(StreamFactoryInterface $streamFactory, array $multipartValues, string $boundary): StreamInterface
     {
         $elements = array_map(static function (MultipartValue $value) {
-            return array_filter([
+            return [
                 'name' => $value->name,
                 'filename' => $value->filename,
                 'contents' => $value->value,
                 'headers' => $value->headers,
-            ]);
+            ];
         }, $multipartValues);
 
         return new MultipartStream($elements, $boundary);

tests/Feature/Body/HasMultipartBodyTest.php

@@ -10,6 +10,7 @@
 use GuzzleHttp\Promise\FulfilledPromise;
 use Saloon\Tests\Fixtures\Connectors\TestConnector;
 use Saloon\Repositories\Body\MultipartBodyRepository;
+use Saloon\Tests\Fixtures\Requests\MixedMultipartRequest;
 use Saloon\Tests\Fixtures\Requests\HasMultipartBodyRequest;
 use Saloon\Tests\Fixtures\Connectors\HasMultipartBodyConnector;
 
@@ -88,3 +89,33 @@
 
     expect($asserted)->toBeTrue();
 });
+
+test('can send a real multipart request and files are sent', function () {
+    $connector = new TestConnector;
+    $request = new MixedMultipartRequest;
+
+    $request->body()->add('name', 'Howdy');
+    $request->body()->add('file', file_get_contents('tests/Fixtures/Howdy.txt'), 'hi.txt');
+
+    $response = $connector->send($request);
+
+    $data = $response->json();
+
+    expect($data)->toHaveKey('name', 'Howdy');
+    expect($data)->toHaveKey('file_contents', 'Hello World!' . PHP_EOL);
+});
+
+test('can send an empty string as the contents', function () {
+    $connector = new TestConnector;
+    $request = new MixedMultipartRequest;
+
+    $request->body()->add('name', 'Howdy');
+    $request->body()->add('file', '', 'hi.txt');
+
+    $response = $connector->send($request);
+
+    $data = $response->json();
+
+    expect($data)->toHaveKey('name', 'Howdy');
+    expect($data)->toHaveKey('file_contents', '');
+});

tests/Fixtures/Howdy.txt

@@ -0,0 +1 @@
+Hello World!

tests/Fixtures/Requests/MixedMultipartRequest.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Saloon\Tests\Fixtures\Requests;
+
+use Saloon\Enums\Method;
+use Saloon\Http\Request;
+use Saloon\Contracts\Body\HasBody;
+use Saloon\Traits\Body\HasMultipartBody;
+
+class MixedMultipartRequest extends Request implements HasBody
+{
+    use HasMultipartBody;
+
+    protected Method $method = Method::POST;
+
+    /**
+     * Define the endpoint for the request.
+     */
+    public function resolveEndpoint(): string
+    {
+        return '/mixed-multipart';
+    }
+}