Merge pull request imbo#120 from christeredvartsen/issue-119

The crop transformation fails when x and/or y is 0

library/Imbo/Image/Transformation/Crop.php

@@ -52,14 +52,14 @@ class Crop extends Transformation implements TransformationInterface {
      *
      * @var int
      */
-    private $x;
+    private $x = 0;
 
     /**
      * Y coordinate of the top left corner of the crop
      *
      * @var int
      */
-    private $y;
+    private $y = 0;
 
     /**
      * Width of the crop
@@ -82,16 +82,22 @@ class Crop extends Transformation implements TransformationInterface {
      * @throws TransformationException
      */
     public function __construct(array $params) {
-        foreach (array('x', 'y', 'width', 'height') as $param) {
-            if (empty($params[$param])) {
+        foreach (array('width', 'height') as $param) {
+            if (!isset($params[$param])) {
                 throw new TransformationException('Missing required parameter: ' . $param, 400);
             }
         }
 
-        $this->x = (int) $params['x'];
-        $this->y = (int) $params['y'];
         $this->width = (int) $params['width'];
         $this->height = (int) $params['height'];
+
+        if (!empty($params['x'])) {
+            $this->x = (int) $params['x'];
+        }
+
+        if (!empty($params['y'])) {
+            $this->y = (int) $params['y'];
+        }
     }
 
     /**

tests/Imbo/UnitTest/Image/Transformation/CropTest.php

@@ -0,0 +1,99 @@
+<?php
+/**
+ * Imbo
+ *
+ * Copyright (c) 2011-2012, Christer Edvartsen <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * * The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * @package TestSuite\UnitTests
+ * @author Christer Edvartsen <[email protected]>
+ * @copyright Copyright (c) 2011-2012, Christer Edvartsen <[email protected]>
+ * @license http://www.opensource.org/licenses/mit-license MIT License
+ * @link https://github.com/imbo/imbo
+ */
+
+namespace Imbo\UnitTest\Image\Transformation;
+
+use Imbo\Image\Transformation\Crop;
+
+/**
+ * @package TestSuite\UnitTests
+ * @author Christer Edvartsen <[email protected]>
+ * @copyright Copyright (c) 2011-2012, Christer Edvartsen <[email protected]>
+ * @license http://www.opensource.org/licenses/mit-license MIT License
+ * @link https://github.com/imbo/imbo
+ * @covers Imbo\Image\Transformation\Crop
+ */
+class CropTest extends \PHPUnit_Framework_TestCase {
+    /**
+     * @covers Imbo\Image\Transformation\Crop::__construct
+     * @expectedException Imbo\Exception\TransformationException
+     * @expectedExceptionCode 400
+     * @expectedExceptionMessage Missing required parameter: width
+     */
+    public function testThrowsExceptionWhenWidthIsMissing() {
+        new Crop(array('height' => 123));
+    }
+
+    /**
+     * @covers Imbo\Image\Transformation\Crop::__construct
+     * @expectedException Imbo\Exception\TransformationException
+     * @expectedExceptionCode 400
+     * @expectedExceptionMessage Missing required parameter: height
+     */
+    public function testThrowsExceptionWhenHeightIsMissing() {
+        new Crop(array('width' => 123));
+    }
+
+    /**
+     * Fetch different image parameters
+     *
+     * @return array[]
+     */
+    public function getImageParams() {
+        return array(
+            array(array('width' => 123, 'height' => 234), 123, 234),
+            array(array('width' => 123, 'height' => 234, 'y' => 10), 123, 234, 0, 10),
+            array(array('width' => 123, 'height' => 234, 'x' => 10, 'y' => 20), 123, 234, 10, 20),
+        );
+    }
+
+    /**
+     * @dataProvider getImageParams
+     * @covers Imbo\Image\Transformation\Crop::__construct
+     * @covers Imbo\Image\Transformation\Crop::applyToImage
+     */
+    public function testUsesAllParamsWithImagick($params, $width, $height, $x = 0, $y = 0) {
+        $image = $this->getMock('Imbo\Image\ImageInterface');
+        $image->expects($this->once())->method('getBlob')->will($this->returnValue('originalimage'));
+        $image->expects($this->once())->method('setBlob')->with('newimage')->will($this->returnSelf());
+        $image->expects($this->once())->method('setWidth')->with($width)->will($this->returnSelf());
+        $image->expects($this->once())->method('setHeight')->with($height)->will($this->returnSelf());
+
+        $imagick = $this->getMock('Imagick');
+        $imagick->expects($this->once())->method('readImageBlob')->with('originalimage');
+        $imagick->expects($this->once())->method('cropImage')->with($width, $height, $x, $y);
+        $imagick->expects($this->once())->method('getImageBlob')->will($this->returnValue('newimage'));
+        $imagick->expects($this->once())->method('getImageGeometry')->will($this->returnValue(array('width' => $width, 'height' => $height)));
+
+        $crop = new Crop($params);
+        $crop->setImagick($imagick)->applyToImage($image);
+    }
+}