refactoring uploader

Author: dosarkz

src/BaseUploader.php

@@ -30,6 +30,11 @@ public static function file($uploading_file, $destination = null)
     public static function image($uploading_file, $destination = null, $resize = false, $imageWidth = 800,
                                  $imageHeight = null, $thumbWidth = 200, $thumbHeight = null)
     {
+        if ($destination == null)
+        {
+            $destination = 'uploads/images';
+        }
+
         return new ImageUploader($uploading_file, $destination, $resize, $imageWidth, $imageHeight,
             $thumbWidth, $thumbHeight);
     }

src/ImageUploader.php

@@ -3,6 +3,7 @@
 
 use Illuminate\Support\Facades\File;
 use Intervention\Image\Facades\Image;
+use Illuminate\Http\UploadedFile;
 
 /**
  * Class ImageUploader
@@ -41,7 +42,7 @@ public function __construct($uploaded_file, $destination = null, $resize = false
     {
         $this->setUploadedFile($uploaded_file);
         $this->setDestination($destination);
-        $this->setThumb('thumb_' . $this->getFileName());
+
 
         $this->resize = $resize;
         $this->imageWidth = $imageWidth;
@@ -53,7 +54,6 @@ public function __construct($uploaded_file, $destination = null, $resize = false
         {
             File::makeDirectory(public_path($this->destination), $mode = 0777, true);
         }
-
         parent::__construct();
     }
 
@@ -76,8 +76,9 @@ public function setThumb($thumb)
     /**
      *
      */
-    public function upload()
+    public function upload(UploadedFile $uploadedFile)
     {
+        $this->setThumb('thumb_'.$this->getFileName());
         $this->uploadImageFile($this->getFileName());
         $this->uploadImageThumb($this->getThumb());
     }
@@ -96,10 +97,10 @@ public function uploadImageFile($filename)
             return Image::make($this->getUploadedFile()->getRealPath())
                 ->resize($this->imageWidth, $this->imageHeight, function ($constraint) {
                     $constraint->aspectRatio();
-                })->save(public_path($this->getDestination() . $filename));
+                })->save(public_path($this->getDestination() .'/'. $filename));
         }else {
             return Image::make($this->getUploadedFile()->getRealPath())
-                ->save(public_path($this->getDestination() . $filename));
+                ->save(public_path($this->getDestination()  .'/'. $filename));
         }
     }
     /**
@@ -112,16 +113,15 @@ public function uploadImageThumb($thumb)
 
         if ($width > $this->thumbWidth)
         {
-            Image::make($this->getUploadedFile()->getRealPath())
-                ->resize($this->thumbWidth, $this->thumbHeight, function ($constraint) {
-                $constraint->aspectRatio();
-            })
-                ->save(public_path($this->getDestination() . $thumb));
+           return  Image::make($this->getUploadedFile()->getRealPath())
+               ->resize($this->thumbWidth, $this->thumbHeight, function ($constraint) {
+                   $constraint->aspectRatio();
+               })
+               ->save(public_path($this->getDestination() .'/'. $thumb));
         }else{
             return Image::make($this->getUploadedFile()->getRealPath())
                 ->save(public_path($this->getDestination() .'/'. $thumb));
         }
-        return $thumb;
     }
 
 }

src/Uploader.php

@@ -1,7 +1,6 @@
 <?php
 namespace Dosarkz\LaravelUploader;
-
-use UploadedFile;
+use Illuminate\Http\UploadedFile;
 
 abstract class Uploader
 {