Fix the UploadedFiles handling

getsentry · Jun 5, 2019 · aff334d · aff334d
1 parent a0cd0b7
commit aff334d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/src/Integration/RequestIntegration.php b/src/Integration/RequestIntegration.php
@@ -164,23 +164,11 @@ private function captureRequestBody(ServerRequestInterface $serverRequest)
             return null;
         }
 
-        $requestData = $serverRequest->getParsedBody();
-        $requestData = \is_array($requestData) ? $requestData : [];
-
-        foreach ($serverRequest->getUploadedFiles() as $fieldName => $uploadedFiles) {
-            if (!\is_array($uploadedFiles)) {
-                $uploadedFiles = [$uploadedFiles];
-            }
-
-            /** @var UploadedFileInterface $uploadedFile */
-            foreach ($uploadedFiles as $uploadedFile) {
-                $requestData[$fieldName][] = [
-                    'client_filename' => $uploadedFile->getClientFilename(),
-                    'client_media_type' => $uploadedFile->getClientMediaType(),
-                    'size' => $uploadedFile->getSize(),
-                ];
-            }
-        }
+        $parsedBody = $serverRequest->getParsedBody();
+        $requestData = array_merge(
+            $this->parseUploadedFiles($serverRequest->getUploadedFiles()),
+            \is_array($parsedBody) ? $parsedBody : []
+        );
 
         if (!empty($requestData)) {
             return $requestData;
@@ -196,4 +184,25 @@ private function captureRequestBody(ServerRequestInterface $serverRequest)
 
         return $requestBody->getContents();
     }
+
+    private function parseUploadedFiles(array $uploadedFiles): array
+    {
+        $data = [];
+
+        foreach ($uploadedFiles as $key => $item) {
+            if ($item instanceof UploadedFileInterface) {
+                $data[$key] = [
+                    'client_filename' => $item->getClientFilename(),
+                    'client_media_type' => $item->getClientMediaType(),
+                    'size' => $item->getSize(),
+                ];
+            } elseif (\is_array($item)) {
+                $data[$key] = $this->parseUploadedFiles($item);
+            } else {
+                throw new \InvalidArgumentException('Unrecognized UploadedFiles item, got ' . \gettype($item));
+            }
+        }
+
+        return $data;
+    }
 }
diff --git a/tests/Integration/RequestIntegrationTest.php b/tests/Integration/RequestIntegrationTest.php
@@ -319,11 +319,9 @@ public function applyToEventDataProvider(): \Generator
                 ],
                 'data' => [
                     'foo' => [
-                        [
-                            'client_filename' => 'foo.ext',
-                            'client_media_type' => 'application/text',
-                            'size' => 123,
-                        ],
+                        'client_filename' => 'foo.ext',
+                        'client_media_type' => 'application/text',
+                        'size' => 123,
                     ],
                 ],
             ],