Merge pull request #26 from justutiz/master

Fixed issue #18

Author: LaravelDaily

src/Builders/ControllerBuilder.php

@@ -99,7 +99,7 @@ private function buildParts($template)
             $this->compactEditBuilder(),
             $this->relationshipsNamespaces(),
             $this->files > 0 ? 'use App\Http\Controllers\Traits\FileUploadTrait;' : '',
-            $this->files > 0 ? '$this->saveFiles($request);' : '',
+            $this->files > 0 ? '$request = $this->saveFiles($request);' : '',
             $this->enum > 0 ? $this->enum() : '',
         ], $template);
 

src/Controllers/publish/FileUploadTrait

@@ -5,6 +5,7 @@ use Intervention\Image\Facades\Image;
 
 trait FileUploadTrait
 {
+
     /**
      * File upload trait used in controllers to upload files
      */
@@ -36,15 +37,15 @@ trait FileUploadTrait
                         });
                     }
                     $image->save(public_path('uploads') . '/' . $filename);
-                    $request->replace(array_merge($request->all(), [$key => $filename]));
-                    $request->files->remove($key);
+                    $request = new Request(array_merge($request->all(), [$key => $filename]));
                 } else {
                     $filename = time() . '-' . $request->file($key)->getClientOriginalName();
                     $request->file($key)->move(public_path('uploads'), $filename);
-                    $request->replace(array_merge($request->all(), [$key => $filename]));
-                    $request->files->remove($key);
+                    $request = new Request(array_merge($request->all(), [$key => $filename]));
                 }
             }
         }
+
+        return $request;
     }
 }