From 3c549879bf1e08a653032272c2fdc0f1bec99183 Mon Sep 17 00:00:00 2001 From: Pato05 <20874747+Pato05@users.noreply.github.com> Date: Tue, 14 Jul 2020 02:26:05 +0200 Subject: [PATCH] Fixed some mistakes I made --- src/Body/FormBody.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Body/FormBody.php b/src/Body/FormBody.php index 3206b3c4..8c186022 100644 --- a/src/Body/FormBody.php +++ b/src/Body/FormBody.php @@ -149,9 +149,9 @@ private function getMultipartFieldArray(): array $fields[] = "--{$this->boundary}\r\n"; /** @psalm-suppress PossiblyNullArgument */ - $fields[] = $field instanceof FileBody - ? $this->generateMultipartFileHeader($name, $fileName, $field, $contentType) - : $this->generateMultipartFieldHeader($name, $field, $contentType); + $fields[] = $fileName !== null + ? $this->generateMultipartFileHeader($name, $fileName, $contentType) + : $this->generateMultipartFieldHeader($name, $contentType); $fields[] = $field; $fields[] = "\r\n"; @@ -162,23 +162,21 @@ private function getMultipartFieldArray(): array return $this->cachedFields = $fields; } - private function generateMultipartFileHeader(string $name, string $fileName, FileBody $field, string $contentType): string + private function generateMultipartFileHeader(string $name, string $fileName, string $contentType): string { $header = "Content-Disposition: form-data; name=\"{$name}\"; filename=\"{$fileName}\"\r\n"; - $header .= "Content-Type: {$contentType}\r\n"; - $header .= "Content-Length: " . \Amp\Promise\wait($field->getBodyLength()) . "\r\n"; - $header .= "Content-Transfer-Encoding: binary\r\n\r\n"; + $header .= "Content-Type: {$contentType}\r\n\r\n"; return $header; } - private function generateMultipartFieldHeader(string $name, string $content, string $contentType): string + private function generateMultipartFieldHeader(string $name, string $contentType): string { $header = "Content-Disposition: form-data; name=\"{$name}\"\r\n"; if ($contentType !== "") { $header .= "Content-Type: {$contentType}\r\n"; } - $header .= "Content-Length: " . strlen($content) . "\r\n\r\n"; + $header .= "\r\n"; return $header; }