Fix nested array failures in HttpBrowser.

symfony · Feb 22, 2020 · 0aedab8 · 0aedab8
1 parent a2fd5f6
commit 0aedab8
Showing 1 changed file with 27 additions and 11 deletions.
diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php
@@ -73,18 +73,10 @@ private function getBodyAndExtraHeaders(Request $request): array
         }
 
         $fields = $request->getParameters();
-        $hasFile = false;
-        foreach ($request->getFiles() as $name => $file) {
-            if (!isset($file['tmp_name'])) {
-                continue;
-            }
-
-            $hasFile = true;
-            $fields[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);
-        }
+        $uploadedFiles = $this->getUploadedFiles($request->getFiles());
 
-        if ($hasFile) {
-            $part = new FormDataPart($fields);
+        if (count($uploadedFiles) > 0) {
+            $part = new FormDataPart($uploadedFiles);
 
             return [$part->bodyToIterable(), $part->getPreparedHeaders()->toArray()];
         }
@@ -119,4 +111,28 @@ private function getHeaders(Request $request): array
 
         return $headers;
     }
+
+    /**
+     * Recursively go through the list. If the file has a tmp_name, convert it to a DataPart.
+     * Keep the original hierarchy.
+     *
+     * @param array $files
+     * @return array
+     */
+    private function getUploadedFiles(array $files)
+    {
+        $uploadedFiles = [];
+        foreach ($files as $name => $file) {
+            if (!is_array($file)) {
+                return $uploadedFiles;
+            }
+            if (!isset($file['tmp_name'])) {
+                $uploadedFiles[$name] = $this->getUploadedFiles($file);
+            }
+            if (isset($file['tmp_name'])) {
+                $uploadedFiles[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);
+            }
+        }
+        return $uploadedFiles;
+    }
 }