Update Request::getMultipartBody method

Author: natanfelles

src/Request.php

@@ -119,6 +119,8 @@ public function __toString() : string
     }
 
     /**
+     * NOTE: Created by comparing a request made with Firefox.
+     *
      * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#multipartform-data
      *
      * @return string
@@ -144,22 +146,30 @@ protected function getMultipartBody() : string
         $files = ArraySimple::convert($this->getFiles());
         foreach ($files as $field => $file) {
             $field = \htmlspecialchars($field, \ENT_QUOTES | \ENT_HTML5);
-            $filename = \htmlspecialchars($file->getName(), \ENT_QUOTES | \ENT_HTML5);
+            $field = \preg_replace('/\[\d+]/', '[]', $field);
+            $filename = \htmlspecialchars($file->getFullPath(), \ENT_QUOTES | \ENT_HTML5);
+            $contentType = $file->getClientType() ?: 'application/octet-stream';
             $getContentsOf = $file->isMoved() ? $file->getDestination() : $file->getTmpName();
             $data = '';
             if ($getContentsOf !== '') {
                 $data = \file_get_contents($getContentsOf);
             }
             $bodyParts[] = \implode("\r\n", [
                 "Content-Disposition: form-data; name=\"{$field}\"; filename=\"{$filename}\"",
-                'Content-Type: ' . $file->getClientType(),
+                'Content-Type: ' . $contentType,
                 '',
                 $data,
             ]);
         }
-        $boundary = \explode(';', $this->getContentType(), 2);
-        $boundary = \trim($boundary[1]);
-        $boundary = \substr($boundary, \strlen('boundary='));
+        $boundary = '';
+        $boundaryParts = \explode(';', $this->getContentType());
+        foreach ($boundaryParts as $boundaryPart) {
+            $boundaryPart = \trim($boundaryPart);
+            if (\str_starts_with(\strtolower($boundaryPart), 'boundary=')) {
+                $boundary = \substr($boundaryPart, \strlen('boundary='));
+                break;
+            }
+        }
         foreach ($bodyParts as &$part) {
             $part = "--{$boundary}\r\n{$part}";
         }
@@ -175,6 +185,7 @@ protected function getMultipartBody() : string
         /*
         $serverLength = (string) $_SERVER['CONTENT_LENGTH'];
         $algoLength = (string) \strlen($bodyParts);
+        \var_dump($serverLength, $algoLength);
         if ($serverLength !== $algoLength) {
             throw new \Exception(
                 '$_SERVER CONTENT_LENGTH is ' . $serverLength

tests/RequestTest.php

@@ -352,11 +352,11 @@ public function testToStringMultipart() : void
                 'full_path' => [
                     1 => [
                         'aa' => [
-                            0 => 'Test.php',
+                            0 => 'dir/Test.php',
                             1 => '',
                         ],
                     ],
-                    2 => 'Other File.php',
+                    2 => 'dir/Other File.php',
                 ],
                 'type' => [
                     1 => [
@@ -422,26 +422,26 @@ public function testToStringMultipart() : void
             'Porto Alegre',
         ];
         $files[0] = [
-            'Content-Disposition: form-data; name="files[1][aa][0]"; filename="Test.php"',
+            'Content-Disposition: form-data; name="files[][aa][]"; filename="dir/Test.php"',
             'Content-Type: application/x-httpd-php',
             '',
             \file_get_contents($filepath),
         ];
         $files[1] = [
-            'Content-Disposition: form-data; name="files[1][aa][1]"; filename=""',
-            'Content-Type: ',
+            'Content-Disposition: form-data; name="files[][aa][]"; filename=""',
+            'Content-Type: application/octet-stream',
             '',
             '',
         ];
         $files[2] = [
-            'Content-Disposition: form-data; name="files[2]"; filename="Other File.php"',
+            'Content-Disposition: form-data; name="files[]"; filename="dir/Other File.php"',
             'Content-Type: text/x-php',
             '',
             \file_get_contents($filepath),
         ];
         $files[3] = [
             'Content-Disposition: form-data; name="foo"; filename=""',
-            'Content-Type: ',
+            'Content-Type: application/octet-stream',
             '',
             '',
         ];
@@ -460,7 +460,7 @@ public function testToStringMultipart() : void
         $body .= \implode("\r\n", $files[3]) . "\r\n";
         $body .= $boundary . "--\r\n";
         $contentLength = \strlen($body);
-        self::assertSame(953, $contentLength);
+        self::assertSame(1004, $contentLength);
         $message = $startLine . "\r\n"
             . \implode("\r\n", $headerLines) . "\r\n"
             . "\r\n"