Merge pull request nahid#1 from azonedev/master

feat: Add support for multi-dimensional arrays on MultipartStreamHandler

Author: nahid

src/Adapter/Guzzle/MultipartStreamHandler.php

@@ -13,6 +13,7 @@ public function __invoke(callable $handler)
     {
         return function(ServerRequestInterface $request, array $options) use ($handler){
             $contentType = $request->getHeader('Content-Type')[0] ?? 'plain/text';
+
             if(!preg_match('#^multipart/form-data; boundary=(.*)#',$contentType,$matches)){
                 return $handler($request,$options);
             }
@@ -27,7 +28,6 @@ public function __invoke(callable $handler)
 
             $elements = [ ... $files, ... $fields];
 
-
             $multiStream = new MultipartStream($elements,$boundary);
             $request = $request->withBody($multiStream);
 
@@ -38,57 +38,75 @@ public function __invoke(callable $handler)
 
 
     protected function files(array $files, $fileName = '', $elements = []) {
+
         foreach($files as $name => $file){
-            if(empty($fileName)){
-                $fileName .= $name;
-            } else {
-                $fileName .= '[' . $name . ']';
-            }
 
             if (is_array($file)) {
-                $elements = $this->files($file, $fileName, $elements);
-            }
+                foreach($file as $key => $value) {
+                    $fileName .= $name . '[' . $key . ']';
 
-            /** @var UploadedFile $file */
+                    $elements[] = $this->makeFileElements($fileName, $value);
+                    $fileName = '';
+                    continue;
 
-            if($file instanceof UploadedFileInterface) {
-                $elements[] = [
-                    'name' => $fileName,
-                    'contents' => $file->getStream(),
-                    'filename' => $file->getClientFilename(),
-                ];
-
-                $fileName = '';
+                }
+            } else {
+                $fileName .= $name;
+                $elements[] = $this->makeFileElements($fileName, $file);
             }
 
+
+            $fileName = '';
+
         }
 
         return $elements;
     }
 
+    protected function makeFileElements(string $fileName, UploadedFileInterface $file): array
+    {
+            return [
+                'name' => $fileName,
+                'contents' => $file->getStream(),
+                'filename' => $file->getClientFilename(),
+                'headers' => [
+                    'Content-Type' => 'image/jpg'
+                ]
+            ];
+    }
+
     protected function postFields(array $postFields, $fieldName = '', $elements = []) {
         foreach($postFields as $name => $postField){
-            if(empty($fieldName)){
-                $fieldName .= $name;
-            } else {
-                $fieldName .= '[' . $name . ']';
-            }
-
             if (is_array($postField)) {
-                $elements = $this->postFields($postField, $fieldName, $elements);
+               $elements = $this->makeArrayPostFields($postField, $name, $elements);
+            }else {
+                $elements[] = $this->makePostFieldsElement($name, $postField);
             }
+        }
 
-            if(is_string($postField)) {
-                $elements[] = [
-                    'name' => $fieldName,
-                    'contents' => $postField,
-                ];
+        return $elements;
+    }
 
-                $fieldName = '';
+    protected function makeArrayPostFields(array $postFields, string $fieldName, array $elements): array
+    {
+        foreach ($postFields as $key => $value){
+            $name = $fieldName . '[' . $key . ']';
+            if(is_string($value)){
+                $elements[] = $this->makePostFieldsElement($name, $value);
+            }else{
+                $elements = $this->makeArrayPostFields($value, $name, $elements);
             }
+            $name = '';
         }
-
         return $elements;
     }
 
+    protected function makePostFieldsElement(string $name, string $content): array
+    {
+        return [
+            'name' => $name,
+            'contents' => $content
+        ];
+    }
+
 }