Reduce complexity of crop methods in Size manipulator.

thephpleague · Dec 23, 2015 · c45cef0 · c45cef0
1 parent 2bb66ed
commit c45cef0
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 52 deletions.
diff --git a/src/Manipulators/Size.php b/src/Manipulators/Size.php
@@ -119,39 +119,6 @@ public function getFit()
         return 'contain';
     }
 
-    /**
-     * Resolve crop.
-     * @return integer[] The resolved crop.
-     */
-    public function getCrop()
-    {
-        $cropMethods = [
-            'crop-top-left' => [0, 0],
-            'crop-top' => [50, 0],
-            'crop-top-right' => [100, 0],
-            'crop-left' => [0, 50],
-            'crop-center' => [50, 50],
-            'crop-right' => [100, 50],
-            'crop-bottom-left' => [0, 100],
-            'crop-bottom' => [50, 100],
-            'crop-bottom-right' => [100, 100],
-        ];
-
-        if (array_key_exists($this->fit, $cropMethods)) {
-            return $cropMethods[$this->fit];
-        }
-
-        if (preg_match('/^crop-([\d]{1,3})-([\d]{1,3})*$/', $this->fit, $matches)) {
-            if ($matches[1] > 100 or $matches[2] > 100) {
-                return [50, 50];
-            }
-
-            return [(int) $matches[1], (int) $matches[2]];
-        }
-
-        return [50, 50];
-    }
-
     /**
      * Resolve the device pixel ratio.
      * @return double The device pixel ratio.
@@ -335,20 +302,44 @@ public function runStretchResize(Image $image, $width, $height)
      */
     public function runCropResize(Image $image, $width, $height)
     {
-        list($offset_percentage_x, $offset_percentage_y) = $this->getCrop();
-
-        $resize_width = $width;
-        $resize_height = $width * ($image->height() / $image->width());
-
-        if ($height > $resize_height) {
-            $resize_width = $height * ($image->width() / $image->height());
-            $resize_height = $height;
-        }
+        list($resize_width, $resize_height) = $this->resolveCropResizeDimensions($image, $width, $height);
 
         $image->resize($resize_width, $resize_height, function ($constraint) {
             $constraint->aspectRatio();
         });
 
+        list($offset_x, $offset_y) = $this->resolveCropOffset($image, $width, $height);
+
+        return $image->crop($width, $height, $offset_x, $offset_y);
+    }
+
+    /**
+     * Resolve the crop resize dimensions.
+     * @param  Image   $image  The source image.
+     * @param  integer $width  The width.
+     * @param  integer $height The height.
+     * @return array   The resize dimensions.
+     */
+    public function resolveCropResizeDimensions(Image $image, $width, $height)
+    {
+        if ($height > $width * ($image->height() / $image->width())) {
+            return [$height * ($image->width() / $image->height()), $height];
+        }
+
+        return [$width, $width * ($image->height() / $image->width())];
+    }
+
+    /**
+     * Resolve the crop offset.
+     * @param  Image   $image  The source image.
+     * @param  integer $width  The width.
+     * @param  integer $height The height.
+     * @return array   The crop offset.
+     */
+    public function resolveCropOffset(Image $image, $width, $height)
+    {
+        list($offset_percentage_x, $offset_percentage_y) = $this->getCrop();
+
         $offset_x = (int) (($image->width() * $offset_percentage_x / 100) - ($width / 2));
         $offset_y = (int) (($image->height() * $offset_percentage_y / 100) - ($height / 2));
 
@@ -371,11 +362,42 @@ public function runCropResize(Image $image, $width, $height)
             $offset_y = $max_offset_y;
         }
 
-        return $image->crop(
-            $width,
-            $height,
-            $offset_x,
-            $offset_y
-        );
+        return [$offset_x, $offset_y];
+    }
+
+    /**
+     * Resolve crop.
+     * @return integer[] The resolved crop.
+     */
+    public function getCrop()
+    {
+        $cropMethods = [
+            'crop-top-left' => [0, 0],
+            'crop-top' => [50, 0],
+            'crop-top-right' => [100, 0],
+            'crop-left' => [0, 50],
+            'crop-center' => [50, 50],
+            'crop-right' => [100, 50],
+            'crop-bottom-left' => [0, 100],
+            'crop-bottom' => [50, 100],
+            'crop-bottom-right' => [100, 100],
+        ];
+
+        if (array_key_exists($this->fit, $cropMethods)) {
+            return $cropMethods[$this->fit];
+        }
+
+        if (preg_match('/^crop-([\d]{1,3})-([\d]{1,3})*$/', $this->fit, $matches)) {
+            if ($matches[1] > 100 or $matches[2] > 100) {
+                return [50, 50];
+            }
+
+            return [
+                (int) $matches[1],
+                (int) $matches[2],
+            ];
+        }
+
+        return [50, 50];
     }
 }
diff --git a/tests/Manipulators/SizeTest.php b/tests/Manipulators/SizeTest.php
@@ -130,8 +130,8 @@ public function testLimitImageSize()
     public function testRunResize()
     {
         $image = Mockery::mock('Intervention\Image\Image', function ($mock) {
-            $mock->shouldReceive('width')->andReturn(100)->times(3);
-            $mock->shouldReceive('height')->andReturn(100)->times(3);
+            $mock->shouldReceive('width')->andReturn(100)->times(4);
+            $mock->shouldReceive('height')->andReturn(100)->times(4);
             $mock->shouldReceive('crop')->andReturn($mock)->once();
             $mock->shouldReceive('resize')->with(100, 100, $this->callback)->andReturn($mock)->times(4);
             $mock->shouldReceive('resize')->with(100, 100)->andReturn($mock)->once();
@@ -221,8 +221,8 @@ public function testRunStretchResize()
     public function testRunCropResize()
     {
         $image = Mockery::mock('Intervention\Image\Image', function ($mock) {
-            $mock->shouldReceive('width')->andReturn(100)->times(3);
-            $mock->shouldReceive('height')->andReturn(100)->times(3);
+            $mock->shouldReceive('width')->andReturn(100)->times(4);
+            $mock->shouldReceive('height')->andReturn(100)->times(4);
             $mock->shouldReceive('resize')->with(100, 100, $this->callback)->andReturn($mock)->once();
             $mock->shouldReceive('crop')->with(100, 100, 0, 0)->andReturn($mock)->once();
         });