irishdan / ResponsiveImageBundle

ImageProcessing/FocusCropDataCalculator.php

Doc Comments +6 added lines, -6 removed lines

@@ -97,8 +97,8 @@ 
      * @param string $axis
      * @param        $cropCoordinates
      * @param        $aspectRatio
-     * @param        $newWidth
-     * @param        $newHeight
+     * @param        integer $newWidth
+     * @param        integer $newHeight
      *
      * @return array
      */
@@ -159,7 +159,7 @@ 
     }
 
     /**
-     * @param        $axis
+     * @param        string $axis
      * @param string $type
      *
      * @return mixed
@@ -255,10 +255,10 @@ 
     }
 
     /**
-     * @param $focusNear
+     * @param double $focusNear
      * @param $focusFar
      * @param $cropLength
-     * @param $imageLength
+     * @param integer $imageLength
      *
      * @return array
      */
@@ -296,7 +296,7 @@ 
      * Tests if a given offset is valid.
      * Valid offsets cropped images will include the focus rectangle and will not fall outside of the original image.
      *
-     * @param $point
+     * @param integer $point
      * @param $cropLength
      * @param $imageLength
      * @param $focusNear

Braces +4 added lines, -8 removed lines

@@ -77,11 +77,9 @@ 
 
         if ($imageAspectRatio > $styleAspectRatio) {
             $axis = 'x';
-        }
-        else if ($imageAspectRatio < $styleAspectRatio) {
+        } else if ($imageAspectRatio < $styleAspectRatio) {
             $axis = 'y';
-        }
-        else {
+        } else {
             return [
                 'width'  => $newWidth,
                 'height' => $newHeight,
@@ -114,8 +112,7 @@ 
             // How many times the style height goes into the new height
             $scaleFactor = $newHeight / $this->styleHeight;
             $cropWidth = $this->styleWidth * $scaleFactor;
-        }
-        else {
+        } else {
             $cropWidth = $newWidth;
 
             // How many times the style height goes into the new height
@@ -178,8 +175,7 @@ 
 
         if ($type == 'near') {
             $point = ${'focus' . $axis . '1'} - ${'crop' . $axis . '1'};
-        }
-        else {
+        } else {
             $point = ${'focus' . $axis . '2'} - ${'crop' . $axis . '1'};
         }
 

Tests/ImageProcessing/FocusCropDataCalculatorTest.php

Spacing +2 added lines, -2 removed lines

@@ -61,8 +61,8 @@
                 $message = 'Too wide: ' . $focusCropData['width'] . '<=' . $width;
                 $this->assertTrue($focusCropData['width'] <= $width, $message);
 
-                $message = 'Too high: ' . (int)round($focusCropData['height']) . ' <= ' . $height;
-                $this->assertTrue((int)round($focusCropData['height']) <= (int)$height, $message);
+                $message = 'Too high: ' . (int) round($focusCropData['height']) . ' <= ' . $height;
+                $this->assertTrue((int) round($focusCropData['height']) <= (int) $height, $message);
 
                 $this->assertTrue($focusCropData['x'] >= $imageCoordinates['crop_coordinates'][0]); // x1
                 $this->assertTrue($focusCropData['y'] >= $imageCoordinates['crop_coordinates'][1]); // y1