Merge pull request #36 from veewee/small-issue

Fix small boundary issue
phpro · Nov 9, 2023 · 4ff5a2a · 4ff5a2a
2 parents b8501fb + 85452c2
commit 4ff5a2a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/docs/files.md b/docs/files.md
@@ -32,7 +32,7 @@ This decoder will try to parse some information from the Response headers and st
 * `Content-Disposistion`: could result in guessing the filename, extension and/or mime-type.
 * `Content-Length`: could be used to guess the size in bytes of the response.
 
-The decoder is highly configurable, meaning you can alter the way it guesses specific properties or opt-out on intenser logic like calculating an md5 hash.
+The decoder is highly configurable, meaning you can alter the way it guesses specific properties or opt-out on intenser logic like calculating a md5 hash.
 
 
 ## Upload file(s)

diff --git a/src/Encoding/Mime/MultiPartEncoder.php b/src/Encoding/Mime/MultiPartEncoder.php
@@ -7,6 +7,9 @@
 use Http\Discovery\Psr17FactoryDiscovery;
 use Phpro\HttpTools\Dependency\SymfonyMimeDependency;
 use Phpro\HttpTools\Encoding\EncoderInterface;
+
+use function Psl\Type\string;
+
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Symfony\Component\Mime\Part\AbstractMultipartPart as MultiPart;
@@ -40,7 +43,7 @@ public function __invoke(RequestInterface $request, $data): RequestInterface
         return $request
             ->withAddedHeader(
                 'Content-Type',
-                (string) ($data->getHeaders()->getHeaderBody('Content-Type') ?? 'multipart/form-data')
+                string()->assert($data->getPreparedHeaders()->get('content-type')?->toString())
             )
             ->withBody($this->streamFactory->createStream(
                 $data->bodyToString()

diff --git a/tests/Unit/Encoding/Mime/MultiPartEncoderTest.php b/tests/Unit/Encoding/Mime/MultiPartEncoderTest.php
@@ -27,9 +27,15 @@ public function it_can_encode_multi_part(): void
 
         $actual = $encoder($request, $data);
 
+        $expectedContentType = $data->getPreparedHeaders()->get('Content-Type')->toString();
+
         self::assertSame($request->getMethod(), $actual->getMethod());
         self::assertSame($request->getUri(), $actual->getUri());
         self::assertSame($data->bodyToString(), (string) $actual->getBody());
-        self::assertSame(['multipart/form-data'], $actual->getHeader('Content-Type'));
+        self::assertSame(
+            [$expectedContentType],
+            $actual->getHeader('Content-Type')
+        );
+        self::assertStringContainsString('boundary', $expectedContentType);
     }
 }