Added the ->fit() method

Author: AlexMordred

README.md

@@ -96,6 +96,12 @@ Downsize an image if it's bigger than the specified width and/or height (the asp
 ->downsize(integer $maxWidth, integer $maxHeight)
 ```
 
+Crop and resize an image to fit the the specified dimensions (the same as `->fit()` from Intervention Image)
+
+```php
+->fit(integer $width, integer $height, boolean $dontUpsize = false)
+```
+
 Call this method before calling any of the above methods, for example:
 
 ```php

src/FileUploader.php

@@ -101,6 +101,23 @@ public function setFile($file)
         return $this;
     }
 
+    /**
+     * Create new or return an existing Intervention Image object based on
+     * $this->file
+     *
+     * @return Image
+     */
+    protected function getImage()
+    {
+        if (!$this->image) {
+            if (self::isImage($this->file)) {
+                return Image::make($this->file);
+            }
+        }
+
+        return $this->image;
+    }
+
     /**
      * Uploads a file under a hashname
      *
@@ -178,22 +195,40 @@ public function replaceAs($oldFilePath, $newFilename, $path = '', $storage = 'pu
      */
     public function downsize($maxWidth, $maxHeight)
     {
-        if (self::isImage($this->file)) {
-            $image = Image::make($this->file);
-
+        if ($this->image = $this->getImage()) {
             // Downsize the image if it's bigger than desired
-            if ($image->width() > $maxWidth || $image->height() > $maxHeight) {
-                $image->resize($maxWidth, $maxHeight, function ($constraint) {
+            if ($this->image->width() > $maxWidth || $this->image->height() > $maxHeight) {
+                $this->image->resize($maxWidth, $maxHeight, function ($constraint) {
                     $constraint->aspectRatio();
                 });
-
-                $this->image = $image;
             }
         }
 
         return $this;
     }
 
+    /**
+     * Crop and resize an image to fit the the specified dimensions
+     *
+     * @param integer $width
+     * @param integer $height
+     * @param boolean $dontUpsize don't upsize the image if it's smaller than
+     * the provided width and height
+     * @return void
+     */
+    public function fit($width, $height, $dontUpsize = false)
+    {
+        if ($this->image = $this->getImage()) {
+            $this->image->fit($width, $height, function ($constraint) use ($dontUpsize) {
+                if ($dontUpsize) {
+                    $constraint->upsize();
+                }
+            });
+        }
+
+        return $this;
+    }
+
     /**
      * Delete a file from the specified storage
      *

tests/FileUploaderTest.php

@@ -54,6 +54,36 @@ public function testItDownsizesImageBeforeUploading()
         $this->assertLessThanOrEqual(200, $uploaded->height());
     }
 
+    public function testItDownsizesAndCropsImageBeforeUploading()
+    {
+        Storage::fake('public');
+
+        $image = UploadedFile::fake()->image('image.jpg', 640, 480);
+
+        $path = FileUploader::make($image)->fit(640, 640)->upload();
+
+        Storage::disk('public')->assertExists($path);
+
+        $uploaded = Image::make(Storage::disk('public')->get($path));
+        $this->assertEquals(640, $uploaded->width());
+        $this->assertEquals(640, $uploaded->height());
+    }
+
+    public function testItDownsizesAndCropsImageBeforeUploadingWithoutUpscaling()
+    {
+        Storage::fake('public');
+
+        $image = UploadedFile::fake()->image('image.jpg', 640, 480);
+
+        $path = FileUploader::make($image)->fit(640, 640, true)->upload();
+
+        Storage::disk('public')->assertExists($path);
+
+        $uploaded = Image::make(Storage::disk('public')->get($path));
+        $this->assertEquals(480, $uploaded->width());
+        $this->assertEquals(480, $uploaded->height());
+    }
+
     public function testItReplacesTheOldFileWithTheNewFile()
     {
         Storage::fake('public');