Fix bug

chadicus · Aug 27, 2018 · 6292f8e · 6292f8e
1 parent 2f6c93c
commit 6292f8e
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/src/RequestBridge.php b/src/RequestBridge.php
@@ -2,6 +2,7 @@
 namespace Chadicus\Slim\OAuth2\Http;
 
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
 use OAuth2;
 
 /**
@@ -69,23 +70,36 @@ private static function cleanupHeaders(array $uncleanHeaders = [])
     /**
      * Convert a PSR-7 uploaded files structure to a $_FILES structure.
      *
-     * @param \Psr\Http\Message\UploadedFileInterface[] $uploadedFiles Array of file objects.
+     * @param array $uploadedFiles Array of file objects.
      *
      * @return array
      */
     private static function convertUploadedFiles(array $uploadedFiles)
     {
         $files = [];
-        foreach ($uploadedFiles as $name => $upload) {
-            $files[$name] = [
-                'name' => $upload->getClientFilename(),
-                'type' => $upload->getClientMediaType(),
-                'size' => $upload->getSize(),
-                'tmp_name' => $upload->getStream()->getMetadata('uri'),
-                'error' => $upload->getError(),
-            ];
+        foreach ($uploadedFiles as $name => $uploadedFile) {
+            if (!is_array($uploadedFile)) {
+                $files[$name] = self::convertUploadedFile($uploadedFile);
+                continue;
+            }
+
+            $files[$name] = [];
+            foreach ($uploadedFile as $file) {
+                $files[$name][] = self::convertUploadedFile($file);
+            }
         }
 
         return $files;
     }
+
+    private static function convertUploadedFile(UploadedFileInterface $uploadedFile)
+    {
+        return [
+            'name' => $uploadedFile->getClientFilename(),
+            'type' => $uploadedFile->getClientMediaType(),
+            'size' => $uploadedFile->getSize(),
+            'tmp_name' => $uploadedFile->getStream()->getMetadata('uri'),
+            'error' => $uploadedFile->getError(),
+        ];
+    }
 }