#81: HttpRequestService ability to work with multipart

composer.json

@@ -17,7 +17,8 @@
     "tecnickcom/tcpdf": "~6.2.22",
     "doctrine/dbal": "^3.6",
     "ext-json": "*",
-    "php-mock/php-mock-phpunit": "^2.9"
+    "php-mock/php-mock-phpunit": "^2.9",
+    "riverline/multipart-parser": "^2.1"
   },
   "require-dev": {
     "fakerphp/faker": "^1.23",

src/Services/HttpRequestService.php

@@ -7,6 +7,7 @@
 use GuzzleHttp\Cookie\CookieJar;
 use Psr\Http\Message\ResponseInterface;
 use GuzzleHttp\Exception\RequestException;
+use Riverline\MultiPartParser\StreamedPart;
 use RonasIT\Support\Exceptions\InvalidJSONFormatException;
 use RonasIT\Support\Exceptions\UnknownRequestMethodException;
 
@@ -127,8 +128,19 @@ public function send(string $method, string $url, array $data = [], array $heade
         }
     }
 
+    public function parseMultipart(string $content): StreamedPart
+    {
+        $stream = fopen('php://temp', 'rw');
+        fwrite($stream, $content);
+        rewind($stream);
+
+        return app()->makeWith(StreamedPart::class, ['stream' => $stream]);
+    }
+
     protected function sendRequest($method, $url, array $data = [], array $headers = []): ResponseInterface
     {
+        $headers = array_change_key_case($headers);
+
         $this->setOptions($headers);
         $this->setData($method, $headers, $data);
 
@@ -222,15 +234,56 @@ protected function setData(string $method, array $headers, array $data = []): vo
             return;
         }
 
-        $headers = array_change_key_case($headers);
         $contentType = Arr::get($headers, 'content-type');
 
         if (preg_match('/application\/json/', $contentType)) {
             $this->options['json'] = $data;
         } elseif (preg_match('/application\/x-www-form-urlencoded/', $contentType)) {
             $this->options['form_params'] = $data;
+        } elseif (preg_match('/multipart\/form-data/', $contentType)) {
+            $this->options['multipart'] = $this->getMultipartOptionReplacement($data);
         } else {
             $this->options['body'] = json_encode($data);
         }
     }
+
+    protected function getMultipartOptionReplacement(array $data): array
+    {
+        Arr::forget($this->options, 'headers.content-type');
+
+        $options = [];
+
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $options = array_merge($options, $this->getArrayMultipartOptionReplacement($key, $value));
+            } else {
+                $options[] = [
+                    'name' => $key,
+                    'contents' => $value
+                ];
+            }
+        }
+
+        return $options;
+    }
+
+    protected function getArrayMultipartOptionReplacement(string $parentKey, array $items): array
+    {
+        $options = [];
+
+        foreach ($items as $key => $item) {
+            $preparedKey = "{$parentKey}[{$key}]";
+
+            if (is_array($item)) {
+                $options = array_merge($options, $this->getArrayMultipartOptionReplacement($preparedKey, $item));
+            } else {
+                $options[] = [
+                    'name' => $preparedKey,
+                    'contents' => $item
+                ];
+            }
+        }
+
+        return $options;
+    }
 }

tests/HttpRequestServiceTest.php

@@ -144,7 +144,7 @@ public function testSendPutWithMultipartContentType()
             [
                 'headers' => [
                     'some_header' => 'some_header_value',
-                    'Content-type' => 'application/x-www-form-urlencoded'
+                    'content-type' => 'application/x-www-form-urlencoded'
                 ],
                 'cookies' => null,
                 'allow_redirects' => true,
@@ -163,6 +163,72 @@ public function testSendPutWithMultipartContentType()
         ]);
     }
 
+    public function testSendPutMultipartContentTypeWithFiles(): void
+    {
+        $this->mockGuzzleClient('put', [
+            'https://some.url.com',
+            [
+                'headers' => [],
+                'cookies' => null,
+                'allow_redirects' => true,
+                'connect_timeout' => 0,
+                'multipart' => [
+                    [
+                        'name' => '0[first_file]',
+                        'contents' => 'first_file_content',
+                    ],
+                    [
+                        'name' => '0[second_file][first_file]',
+                        'contents' => 'first_file_content',
+                    ],
+                    [
+                        'name' => '0[second_file][second_file]',
+                        'contents' => 'second_file_content',
+                    ],
+                    [
+                        'name' => '1[first_file]',
+                        'contents' => 'first_file_content',
+                    ],
+                    [
+                        'name' => '1[second_file]',
+                        'contents' => 'second_file_content',
+                    ]
+                ]
+            ]
+        ]);
+
+        $this->httpRequestServiceClass->put('https://some.url.com', [
+            [
+                'first_file' => 'first_file_content',
+                'second_file' => [
+                    'first_file' => 'first_file_content',
+                    'second_file' => 'second_file_content'
+                ]
+            ],
+            [
+                'first_file' => 'first_file_content',
+                'second_file' => 'second_file_content'
+            ]
+        ], [
+            'Content-type' => 'multipart/form-data;'
+        ]);
+    }
+
+    public function testParseMultipartContent(): void
+    {
+        $multipartContent = $this->getFixture('multipart_content');
+
+        $multipartObject = $this->httpRequestServiceClass->parseMultipart($multipartContent);
+
+        $parsedData = [];
+
+        foreach ($multipartObject->getParts() as $part) {
+            $parsedData[] = [$part->getName(), $part->getBody()];
+        }
+
+        $this->assertEqualsFixture('parsed_multipart_content.json', $parsedData);
+    }
+
     public function sendPutAsJSONData(): array
     {
         return [
@@ -194,7 +260,7 @@ public function testSendPutAsJSON(array $headers)
         $this->mockGuzzleClient('put', [
             'https://some.url.com',
             [
-                'headers' => $headers,
+                'headers' => ['content-type' => 'application/json'],
                 'cookies' => null,
                 'allow_redirects' => true,
                 'connect_timeout' => 0,

tests/fixtures/HttpRequestServiceTest/multipart_content

@@ -0,0 +1,21 @@
+<<<EOL
+User-Agent: curl/7.21.2 (x86_64-apple-darwin)
+Host: localhost:8080
+Accept: */*
+Content-Type: multipart/form-data; boundary=----------------------------83ff53821b7c
+
+------------------------------83ff53821b7c
+Content-Disposition: form-data; name="foo"
+
+bar
+------------------------------83ff53821b7c
+Content-Transfer-Encoding: base64
+
+YmFzZTY0
+------------------------------83ff53821b7c
+Content-Disposition: form-data; name="upload"; filename="text.txt"
+Content-Type: text/plain
+
+File content
+------------------------------83ff53821b7c--
+EOL;

tests/fixtures/HttpRequestServiceTest/parsed_multipart_content.json

@@ -0,0 +1,14 @@
+[
+    [
+        "foo",
+        "bar"
+    ],
+    [
+        null,
+        "base64"
+    ],
+    [
+        "upload",
+        "File content"
+    ]
+]