phpcsfixer

Author: sreichel

app/code/core/Mage/Catalog/Model/Product/Image.php

@@ -357,8 +357,8 @@ protected function _rgbToString($rgbArray)
      * Set filenames for base file and new file
      *
      * @param string $file
-     * @throws Exception
      * @return $this
+     * @throws Exception
      */
     public function setBaseFile($file)
     {
@@ -548,8 +548,8 @@ public function setAngle($angle)
      * @param int $width
      * @param int $heigth
      * @param int $imageOpacity
-     * @throws Exception
      * @return $this
+     * @throws Exception
      */
     public function setWatermark($file, $position = null, $size = null, $width = null, $heigth = null, $imageOpacity = null)
     {
@@ -675,9 +675,9 @@ public function getWatermarkFile()
      * Get relative watermark file path
      * or false if file not found
      *
+     * @return bool|string
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
-     * @return bool|string
      */
     protected function _getWatermarkFilePath()
     {