Merge pull request #8 from pionl/pr/7

Add support for Request with multiple files array

Author: Martin Kluska

.gitignore

@@ -0,0 +1,5 @@
+
+composer.phar
+/vendor/
+composer.lock
+

readme.md

@@ -214,6 +214,62 @@ public function upload(Request $request) {
 }
 ```
 
+##### Usage with multiple files in one Request
+
+```php
+/**
+ * Handles the file upload
+ *
+ * @param Request $request
+ *
+ * @param Int $fileIndex
+ *
+ * @return \Illuminate\Http\JsonResponse
+ * 
+ * @throws UploadMissingFileException
+ */
+public function upload(Request $request) {
+
+    // Response for the files - completed and uncompleted
+    $files = [];
+
+    // Get array of files from request
+    $files = $request->file('files');
+    
+    if (!is_array($files)) {
+        throw new UploadMissingFileException();
+    }
+    
+    // Loop sent files
+    foreach ($files as $file) {
+        if ($receiver->isUploaded()) {
+            // receive the file
+            $save = $receiver->receive();
+    
+            // check if the upload has finished (in chunk mode it will send smaller files)
+            if ($save->isFinished()) {
+                // save the file and return any response you need
+                $files[] = $this->saveFile($save->getFile());
+            } else {
+                // we are in chunk mode, lets send the current progress
+    
+                /** @var ContentRangeUploadHandler $handler */
+                $handler = $save->handler();
+                
+                // Add the completed file
+                $files[] = [
+                    "start" => $handler->getBytesStart(),
+                    "end" => $handler->getBytesEnd(),
+                    "total" => $handler->getBytesTotal(),
+                    "finished" => false
+                ];
+            }
+        }
+    }
+    
+    return response()->json($files);
+}
+```
 
 #### Route
 Add a route to your controller
@@ -334,4 +390,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for how to contribute changes. All contri
 was written by [Martin Kluska](http://kluska.cz) and is released under the 
 [MIT License](LICENSE.md).
 
-Copyright (c) 2016 Martin Kluska
+Copyright (c) 2016 Martin Kluska

src/Receiver/FileReceiver.php

@@ -45,16 +45,16 @@ class FileReceiver
     /**
      * The file receiver for the given file index
      *
-     * @param string              $fileIndex the desired file index in requests files
-     * @param Request             $request the current request
-     * @param string              $handlerClass the handler class name for detecting the file upload
-     * @param ChunkStorage|null   $chunkStorage the chunk storage, on null will use the instance from app container
-     * @param AbstractConfig|null $config the config, on null will use the instance from app container
+     * @param string|UploadedFile $fileIndexOrFile the desired file index to use in request or the final UploadedFile
+     * @param Request             $request         the current request
+     * @param string              $handlerClass    the handler class name for detecting the file upload
+     * @param ChunkStorage|null   $chunkStorage    the chunk storage, on null will use the instance from app container
+     * @param AbstractConfig|null $config          the config, on null will use the instance from app container
      */
-    public function __construct($fileIndex, Request $request, $handlerClass, $chunkStorage = null, $config = null)
+    public function __construct($fileIndexOrFile, Request $request, $handlerClass, $chunkStorage = null, $config = null)
     {
         $this->request = $request;
-        $this->file = $request->file($fileIndex);
+        $this->file = is_object($fileIndexOrFile) ? $fileIndexOrFile : $request->file($fileIndexOrFile);
         $this->chunkStorage = is_null($chunkStorage) ? ChunkStorage::storage() : $chunkStorage;
         $this->config = is_null($config) ? AbstractConfig::config() : $config;