Mistralys / application-utils

src/ImageHelper.php

Braces +4 added lines, -8 removed lines

@@ -151,8 +151,7 @@ 
             $this->sourceImage = $resource;
             $this->type = $type;
             $this->info = self::getImageSize($resource);
-        } 
-        else 
+        } else 
         {
             $this->file = $sourceFile;
             if (!file_exists($this->file)) {
@@ -561,8 +560,7 @@ 
         if ($this->width <= $this->height) 
         {
             $this->resampleByWidth($width);
-        } 
-        else 
+        } else 
         {
             $this->resampleByHeight($height);
         }
@@ -1037,8 +1035,7 @@ 
         {
             $bg2 = imagecolorallocatealpha($im2, $color['red'], $color['green'], $color['blue'], $color['alpha']);
             imagecolortransparent($im2, $bg2);
-        }
-        else
+        } else
         {
             $bg2 = imagecolorallocate($im2, $color['red'], $color['green'], $color['blue']);
         }
@@ -1348,8 +1345,7 @@ 
 	    if(method_exists(__CLASS__, $method)) 
 	    {
 	        $info = call_user_func(array(__CLASS__, $method), $pathOrResource);
-	    } 
-	    else 
+	    } else 
 	    {
 	        $info = getimagesize($pathOrResource);
 	    }

Indentation +420 added lines, -420 removed lines

@@ -50,53 +50,53 @@ 
     const COLORFORMAT_HEX = 2;
 
     /**
-    * @var string
-    */
+     * @var string
+     */
     protected $file;
 
-   /**
-    * @var ImageHelper_Size
-    */
+    /**
+     * @var ImageHelper_Size
+     */
     protected $info;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
 
-   /**
-    * @var resource|NULL
-    */
+    /**
+     * @var resource|NULL
+     */
     protected $newImage;
 
-   /**
-    * @var resource
-    */
+    /**
+     * @var resource
+     */
     protected $sourceImage;
 
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $width;
 
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $height;
 
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $newWidth = 0;
 
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $newHeight = 0;
 
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $quality = 85;
 
     /**
@@ -201,17 +201,17 @@ 
         }
     }
 
-   /**
-    * Factory method: creates a new helper with a blank image.
-    * 
-    * @param integer $width
-    * @param integer $height
-    * @param string $type The target file type when saving
-    * @return ImageHelper
-    * @throws ImageHelper_Exception
-    *
-    * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_OBJECT
-    */
+    /**
+     * Factory method: creates a new helper with a blank image.
+     * 
+     * @param integer $width
+     * @param integer $height
+     * @param string $type The target file type when saving
+     * @return ImageHelper
+     * @throws ImageHelper_Exception
+     *
+     * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_OBJECT
+     */
     public static function createNew($width, $height, $type='png')
     {
         $img = imagecreatetruecolor($width, $height);
@@ -226,18 +226,18 @@ 
         );
     }
     
-   /**
-    * Factory method: creates an image helper from an
-    * existing image resource.
-    *
-    * Note: while the resource is type independent, the
-    * type parameter is required for some methods, as well
-    * as to be able to save the image.
-    *
-    * @param resource $resource
-    * @param string $type The target image type, e.g. "jpeg", "png", etc.
-    * @return ImageHelper
-    */
+    /**
+     * Factory method: creates an image helper from an
+     * existing image resource.
+     *
+     * Note: while the resource is type independent, the
+     * type parameter is required for some methods, as well
+     * as to be able to save the image.
+     *
+     * @param resource $resource
+     * @param string $type The target image type, e.g. "jpeg", "png", etc.
+     * @return ImageHelper
+     */
     public static function createFromResource($resource, ?string $type=null)
     {
         self::requireResource($resource);
@@ -245,29 +245,29 @@ 
         return new ImageHelper(null, $resource, $type);
     }
     
-   /**
-    * Factory method: creates an image helper from an
-    * image file on disk.
-    *
-    * @param string $file
-    * @return ImageHelper
-    */
+    /**
+     * Factory method: creates an image helper from an
+     * image file on disk.
+     *
+     * @param string $file
+     * @return ImageHelper
+     */
     public static function createFromFile(string $file) : ImageHelper
     {
         return new ImageHelper($file);
     }
     
-   /**
-    * Sets a global image helper configuration value. Available
-    * configuration settings are:
-    * 
-    * <ul>
-    * <li><code>auto-memory-adjustment</code> <i>boolean</i> Whether totry and adjust the memory limit automatically so there will be enough to load/process the target image.</li>
-    * </ul>
-    * 
-    * @param string $name
-    * @param mixed $value
-    */
+    /**
+     * Sets a global image helper configuration value. Available
+     * configuration settings are:
+     * 
+     * <ul>
+     * <li><code>auto-memory-adjustment</code> <i>boolean</i> Whether totry and adjust the memory limit automatically so there will be enough to load/process the target image.</li>
+     * </ul>
+     * 
+     * @param string $name
+     * @param mixed $value
+     */
     public static function setConfig($name, $value)
     {
         if(isset(self::$config[$name])) {
@@ -275,22 +275,22 @@ 
         }
     }
     
-   /**
-    * Shorthand for setting the automatic memory adjustment
-    * global configuration setting.
-    * 
-    * @param bool $enabled
-    */
+    /**
+     * Shorthand for setting the automatic memory adjustment
+     * global configuration setting.
+     * 
+     * @param bool $enabled
+     */
     public static function setAutoMemoryAdjustment($enabled=true)
     {
         self::setConfig('auto-memory-adjustment', $enabled);
     }
     
-   /**
-    * Duplicates an image resource.
-    * @param resource $img
-    * @return resource
-    */
+    /**
+     * Duplicates an image resource.
+     * @param resource $img
+     * @return resource
+     */
     protected function duplicateImage($img)
     {
         self::requireResource($img);
@@ -302,12 +302,12 @@ 
         return $duplicate;
     }
     
-   /**
-    * Duplicates the current state of the image into a new
-    * image helper instance.
-    * 
-    * @return ImageHelper
-    */
+    /**
+     * Duplicates the current state of the image into a new
+     * image helper instance.
+     * 
+     * @return ImageHelper
+     */
     public function duplicate()
     {
         return ImageHelper::createFromResource($this->duplicateImage($this->newImage));
@@ -495,13 +495,13 @@ 
         ));
     }
     
-   /**
-    * Resamples the image to a new width, maintaining
-    * aspect ratio.
-    * 
-    * @param int $width
-    * @return ImageHelper
-    */
+    /**
+     * Resamples the image to a new width, maintaining
+     * aspect ratio.
+     * 
+     * @param int $width
+     * @return ImageHelper
+     */
     public function resampleByWidth(int $width) : ImageHelper
     {
         $size = $this->getSizeByWidth($width);
@@ -511,12 +511,12 @@ 
         return $this;
     }
 
-   /**
-    * Resamples the image by height, and creates a new image file on disk.
-    * 
-    * @param int $height
-    * @return ImageHelper
-    */
+    /**
+     * Resamples the image by height, and creates a new image file on disk.
+     * 
+     * @param int $height
+     * @return ImageHelper
+     */
     public function resampleByHeight($height) : ImageHelper
     {
         $size = $this->getSizeByHeight($height);
@@ -524,13 +524,13 @@ 
         return $this->resampleImage($size->getWidth(), $size->getHeight());
     }
 
-   /**
-    * Resamples the image without keeping the aspect ratio.
-    * 
-    * @param int $width
-    * @param int $height
-    * @return ImageHelper
-    */
+    /**
+     * Resamples the image without keeping the aspect ratio.
+     * 
+     * @param int $width
+     * @param int $height
+     * @return ImageHelper
+     */
     public function resample(?int $width = null, ?int $height = null) : ImageHelper
     {
         if($this->isVector()) {
@@ -595,12 +595,12 @@ 
     
     protected $alpha = false;
 
-   /**
-    * Configures the specified image resource to make it alpha compatible.
-    * 
-    * @param resource $canvas
-    * @param bool $fill Whether to fill the whole canvas with the transparency
-    */
+    /**
+     * Configures the specified image resource to make it alpha compatible.
+     * 
+     * @param resource $canvas
+     * @param bool $fill Whether to fill the whole canvas with the transparency
+     */
     public static function addAlphaSupport($canvas, $fill=true)
     {
         self::requireResource($canvas);
@@ -715,12 +715,12 @@ 
         $this->quality = $quality * 1;
     }
 
-   /**
-    * Attempts to adjust the memory to the required size
-    * to work with the current image.
-    * 
-    * @return boolean
-    */
+    /**
+     * Attempts to adjust the memory to the required size
+     * to work with the current image.
+     * 
+     * @return boolean
+     */
     protected function adjustMemory() : bool
     {
         if(!self::$config['auto-memory-adjustment']) {
@@ -760,27 +760,27 @@ 
         return false;
     }
 
-   /**
-    * Stretches the image to the specified dimensions.
-    * 
-    * @param int $width
-    * @param int $height
-    * @return ImageHelper
-    */
+    /**
+     * Stretches the image to the specified dimensions.
+     * 
+     * @param int $width
+     * @param int $height
+     * @return ImageHelper
+     */
     public function stretch(int $width, int $height) : ImageHelper
     {
         return $this->resampleImage($width, $height);
     }
 
-   /**
-    * Creates a new image from the current image,
-    * resampling it to the new size.
-    * 
-    * @param int $newWidth
-    * @param int $newHeight   
-    * @throws ImageHelper_Exception
-    * @return ImageHelper
-    */
+    /**
+     * Creates a new image from the current image,
+     * resampling it to the new size.
+     * 
+     * @param int $newWidth
+     * @param int $newHeight   
+     * @throws ImageHelper_Exception
+     * @return ImageHelper
+     */
     protected function resampleImage(int $newWidth, int $newHeight) : ImageHelper
     {
         if($this->isVector()) {
@@ -849,17 +849,17 @@ 
         return array_unique($types);
     }
     
-   /**
-    * Displays an existing image resource.
-    *
-    * @param resource $resource
-    * @param string $imageType The image format to send, i.e. "jpeg", "png"
-    * @param int $quality The quality to use for the image. This is 0-9 (0=no compression, 9=max) for PNG, and 0-100 (0=lowest, 100=highest quality) for JPG
-    *
-    * @throws ImageHelper_Exception
-    * @see ImageHelper::ERROR_NOT_A_RESOURCE
-    * @see ImageHelper::ERROR_INVALID_STREAM_IMAGE_TYPE
-    */
+    /**
+     * Displays an existing image resource.
+     *
+     * @param resource $resource
+     * @param string $imageType The image format to send, i.e. "jpeg", "png"
+     * @param int $quality The quality to use for the image. This is 0-9 (0=no compression, 9=max) for PNG, and 0-100 (0=lowest, 100=highest quality) for JPG
+     *
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_NOT_A_RESOURCE
+     * @see ImageHelper::ERROR_INVALID_STREAM_IMAGE_TYPE
+     */
     public static function displayImageStream($resource, string $imageType, int $quality=-1) : void
     {
         self::requireResource($resource);
@@ -942,11 +942,11 @@ 
         readfile($imageFile);
     }
     
-   /**
-    * Displays the current image.
-    *
-    * NOTE: You must call `exit()` manually after this.
-    */
+    /**
+     * Displays the current image.
+     *
+     * NOTE: You must call `exit()` manually after this.
+     */
     public function display() : void
     {
         $this->displayImageStream(
@@ -970,16 +970,16 @@ 
         return $this->trimImage($this->newImage, $color);
     }
     
-   /**
-    * Retrieves a color definition by its index.
-    * 
-    * @param resource $img A valid image resource.
-    * @param int $colorIndex The color index, as returned by `imagecolorat` for example.
-    * @return array<string,int> An array with red, green, blue and alpha keys.
-    *
-    * @throws ImageHelper_Exception
-    * @see ImageHelper::ERROR_NOT_A_RESOURCE
-    */
+    /**
+     * Retrieves a color definition by its index.
+     * 
+     * @param resource $img A valid image resource.
+     * @param int $colorIndex The color index, as returned by `imagecolorat` for example.
+     * @return array<string,int> An array with red, green, blue and alpha keys.
+     *
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_NOT_A_RESOURCE
+     */
     public function getIndexedColors($img, int $colorIndex) : array
     {
         self::requireResource($img);
@@ -999,18 +999,18 @@ 
         );
     }
         
-   /**
-    * Trims the specified image resource by removing the specified color.
-    * Also works with transparency.
-    * 
-    * @param resource $img
-    * @param array|NULL $color A color definition, as an associative array with red, green, blue and alpha keys. If not specified, the color at pixel position 0,0 will be used.
-    * @return ImageHelper
-    *
-    * @throws ImageHelper_Exception
-    * @see ImageHelper::ERROR_NOT_A_RESOURCE
-    * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_CANVAS
-    */
+    /**
+     * Trims the specified image resource by removing the specified color.
+     * Also works with transparency.
+     * 
+     * @param resource $img
+     * @param array|NULL $color A color definition, as an associative array with red, green, blue and alpha keys. If not specified, the color at pixel position 0,0 will be used.
+     * @return ImageHelper
+     *
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_NOT_A_RESOURCE
+     * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_CANVAS
+     */
     protected function trimImage($img, ?array $color=null) : ImageHelper
     {
         if($this->isVector()) {
@@ -1118,14 +1118,14 @@ 
         return $this;
     }
     
-   /**
-    * Requires the subject to be a resource.
-    * 
-    * @param resource|mixed $subject
-    *
-    * @throws ImageHelper_Exception
-    * @see ImageHelper::ERROR_NOT_A_RESOURCE
-    */
+    /**
+     * Requires the subject to be a resource.
+     * 
+     * @param resource|mixed $subject
+     *
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_NOT_A_RESOURCE
+     */
     protected static function requireResource($subject) : void
     {
         if(is_resource($subject)) {
@@ -1142,14 +1142,14 @@ 
         );
     }
     
-   /**
-    * Creates a new image resource, with transparent background.
-    * 
-    * @param int $width
-    * @param int $height
-    * @throws ImageHelper_Exception
-    * @return resource
-    */
+    /**
+     * Creates a new image resource, with transparent background.
+     * 
+     * @param int $width
+     * @param int $height
+     * @throws ImageHelper_Exception
+     * @return resource
+     */
     protected function createNewImage(int $width, int $height)
     {
         $img = imagecreatetruecolor($width, $height);
@@ -1168,54 +1168,54 @@ 
         return $img;
     }
     
-   /**
-    * Whether the two specified colors are the same.
-    * 
-    * @param array<string,int> $a
-    * @param array<string,int> $b
-    * @return boolean
-    */
-	protected function colorsMatch(array $a, array $b) : bool
-	{
-		$parts = array('red', 'green', 'blue');
-		foreach($parts as $part) {
-			if($a[$part] != $b[$part]) {
-				return false;
-			}
-		} 
+    /**
+     * Whether the two specified colors are the same.
+     * 
+     * @param array<string,int> $a
+     * @param array<string,int> $b
+     * @return boolean
+     */
+    protected function colorsMatch(array $a, array $b) : bool
+    {
+        $parts = array('red', 'green', 'blue');
+        foreach($parts as $part) {
+            if($a[$part] != $b[$part]) {
+                return false;
+            }
+        } 
 		
-		return true;
-	}
+        return true;
+    }
 	
-	public function fillWhite($x=0, $y=0)
-	{
-	    $this->addRGBColor('white', 255, 255, 255);
+    public function fillWhite($x=0, $y=0)
+    {
+        $this->addRGBColor('white', 255, 255, 255);
         return $this->fill('white', $x, $y);
-	}
+    }
 	
-	public function fillTransparent() : ImageHelper
-	{
+    public function fillTransparent() : ImageHelper
+    {
         $this->enableAlpha();
 	    
-	    self::fillImageTransparent($this->newImage);
+        self::fillImageTransparent($this->newImage);
 	    
-	    return $this;
-	}
+        return $this;
+    }
 	
-	public static function fillImageTransparent($resource)
-	{
-	    self::requireResource($resource);
+    public static function fillImageTransparent($resource)
+    {
+        self::requireResource($resource);
 	    
-	    $transparent = imagecolorallocatealpha($resource, 89, 14, 207, 127);
-	    imagecolortransparent ($resource, $transparent);
-	    imagefill($resource, 0, 0, $transparent);
-	}
+        $transparent = imagecolorallocatealpha($resource, 89, 14, 207, 127);
+        imagecolortransparent ($resource, $transparent);
+        imagefill($resource, 0, 0, $transparent);
+    }
 	
-	public function fill($colorName, $x=0, $y=0)
-	{
-	    imagefill($this->newImage, $x, $y, $this->colors[$colorName]);
-	    return $this;
-	}
+    public function fill($colorName, $x=0, $y=0)
+    {
+        imagefill($this->newImage, $x, $y, $this->colors[$colorName]);
+        return $this;
+    }
 	
     protected $colors = array();
 
@@ -1236,9 +1236,9 @@ 
         return $this;
     }
     
-   /**
-    * @return resource
-    */
+    /**
+     * @return resource
+     */
     public function getImage()
     {
         return $this->newImage;
@@ -1256,26 +1256,26 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the size of the image.
-    * 
-    * @return ImageHelper_Size
-    * @throws ImageHelper_Exception
-    * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
-    */
-	public function getSize() : ImageHelper_Size
+    /**
+     * Retrieves the size of the image.
+     * 
+     * @return ImageHelper_Size
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
+     */
+    public function getSize() : ImageHelper_Size
     {
-	    return self::getImageSize($this->newImage);
+        return self::getImageSize($this->newImage);
     }
     
     protected $TTFFile;
     
-   /**
-    * Sets the TTF font file to use for text operations.
-    * 
-    * @param string $filePath
-    * @return ImageHelper
-    */
+    /**
+     * Sets the TTF font file to use for text operations.
+     * 
+     * @param string $filePath
+     * @return ImageHelper
+     */
     public function setFontTTF($filePath)
     {
         $this->TTFFile = $filePath;
@@ -1347,63 +1347,63 @@ 
             return;
         }
         
-	    throw new ImageHelper_Exception(
+        throw new ImageHelper_Exception(
             'No true type font specified',
             'This functionality requires a TTF font file to be specified with the [setFontTTF] method.',
             self::ERROR_NO_TRUE_TYPE_FONT_SET    
         );
     }
     
-   /**
-	 * Retrieves the size of an image file on disk, or
-	 * an existing image resource.
-	 *
-	 * <pre>
-	 * array(
-	 *     0: (width),
-	 *     1: (height),
-	 *     "channels": the amount of channels
-	 *     "bits": bits per channel
+    /**
+     * Retrieves the size of an image file on disk, or
+     * an existing image resource.
+     *
+     * <pre>
+     * array(
+     *     0: (width),
+     *     1: (height),
+     *     "channels": the amount of channels
+     *     "bits": bits per channel
      * )     
-	 * </pre>
-	 *
-	 * @param string|resource $pathOrResource
-	 * @return ImageHelper_Size Size object, can also be accessed like the traditional array from getimagesize
-	 * @see ImageHelper_Size
-	 * @throws ImageHelper_Exception
-	 * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
-	 * @see ImageHelper::ERROR_CANNOT_READ_SVG_IMAGE
-	 * @see ImageHelper::ERROR_SVG_SOURCE_VIEWBOX_MISSING
-	 * @see ImageHelper::ERROR_SVG_VIEWBOX_INVALID
-	 */
-	public static function getImageSize($pathOrResource) : ImageHelper_Size
-	{
-	    if(is_resource($pathOrResource)) 
-	    {
-	        return new ImageHelper_Size(array(
-	            'width' => imagesx($pathOrResource),
-	            'height' => imagesy($pathOrResource),
-	            'channels' => 1,
-	            'bits' => 8
-	        ));
-	    }
+     * </pre>
+     *
+     * @param string|resource $pathOrResource
+     * @return ImageHelper_Size Size object, can also be accessed like the traditional array from getimagesize
+     * @see ImageHelper_Size
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
+     * @see ImageHelper::ERROR_CANNOT_READ_SVG_IMAGE
+     * @see ImageHelper::ERROR_SVG_SOURCE_VIEWBOX_MISSING
+     * @see ImageHelper::ERROR_SVG_VIEWBOX_INVALID
+     */
+    public static function getImageSize($pathOrResource) : ImageHelper_Size
+    {
+        if(is_resource($pathOrResource)) 
+        {
+            return new ImageHelper_Size(array(
+                'width' => imagesx($pathOrResource),
+                'height' => imagesy($pathOrResource),
+                'channels' => 1,
+                'bits' => 8
+            ));
+        }
 	    
-	    $type = self::getFileImageType($pathOrResource);
+        $type = self::getFileImageType($pathOrResource);
 	    
-	    $info = false;
-	    $method = 'getImageSize_'.$type;
-	    if(method_exists(__CLASS__, $method)) 
-	    {
-	        $info = call_user_func(array(__CLASS__, $method), $pathOrResource);
-	    } 
-	    else 
-	    {
-	        $info = getimagesize($pathOrResource);
-	    }
+        $info = false;
+        $method = 'getImageSize_'.$type;
+        if(method_exists(__CLASS__, $method)) 
+        {
+            $info = call_user_func(array(__CLASS__, $method), $pathOrResource);
+        } 
+        else 
+        {
+            $info = getimagesize($pathOrResource);
+        }
 	    
-	    if($info !== false) {
-	        return new ImageHelper_Size($info);
-	    }
+        if($info !== false) {
+            return new ImageHelper_Size($info);
+        }
 	    
         throw new ImageHelper_Exception(
             'Error opening image file',
@@ -1413,98 +1413,98 @@ 
             ),
             self::ERROR_CANNOT_GET_IMAGE_SIZE
         );
-	}
+    }
 	
-   /**
-    * @param string $imagePath
-    * @throws ImageHelper_Exception
-    * @return array
-    * 
-    * @todo This should return a ImageHelper_Size instance.
-    */
-	protected static function getImageSize_svg(string $imagePath) : array
-	{
-	    $xml = XMLHelper::createSimplexml();
-	    $xml->loadFile($imagePath);
+    /**
+     * @param string $imagePath
+     * @throws ImageHelper_Exception
+     * @return array
+     * 
+     * @todo This should return a ImageHelper_Size instance.
+     */
+    protected static function getImageSize_svg(string $imagePath) : array
+    {
+        $xml = XMLHelper::createSimplexml();
+        $xml->loadFile($imagePath);
 	    
-	    if($xml->hasErrors()) {
-	        throw new ImageHelper_Exception(
-	            'Error opening SVG image',
-	            sprintf(
-	                'The XML content of the image [%s] could not be parsed.',
-	                $imagePath
+        if($xml->hasErrors()) {
+            throw new ImageHelper_Exception(
+                'Error opening SVG image',
+                sprintf(
+                    'The XML content of the image [%s] could not be parsed.',
+                    $imagePath
                 ),
-	            self::ERROR_CANNOT_READ_SVG_IMAGE
+                self::ERROR_CANNOT_READ_SVG_IMAGE
             );
-	    }
+        }
 	    
-	    $data = $xml->toArray();
-	    $xml->dispose();
-	    unset($xml);
+        $data = $xml->toArray();
+        $xml->dispose();
+        unset($xml);
 	    
-	    if(!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) {
-	        throw new ImageHelper_Exception(
-	            'SVG Image is corrupted',
-	            sprintf(
-	                'The [viewBox] attribute is missing in the XML of the image at path [%s].',
-	                $imagePath
+        if(!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) {
+            throw new ImageHelper_Exception(
+                'SVG Image is corrupted',
+                sprintf(
+                    'The [viewBox] attribute is missing in the XML of the image at path [%s].',
+                    $imagePath
                 ),
-	            self::ERROR_SVG_SOURCE_VIEWBOX_MISSING
+                self::ERROR_SVG_SOURCE_VIEWBOX_MISSING
             );
-	    }
+        }
 	    
-	    $svgWidth = parseNumber($data['@attributes']['width'])->getNumber();
-	    $svgHeight = parseNumber($data['@attributes']['height'])->getNumber();
+        $svgWidth = parseNumber($data['@attributes']['width'])->getNumber();
+        $svgHeight = parseNumber($data['@attributes']['height'])->getNumber();
 	    
-	    $viewBox = str_replace(' ', ',', $data['@attributes']['viewBox']);
-	    $size = explode(',', $viewBox);
+        $viewBox = str_replace(' ', ',', $data['@attributes']['viewBox']);
+        $size = explode(',', $viewBox);
 	    
-	    if(count($size) != 4) 
-	    {
-	        throw new ImageHelper_Exception(
-	            'SVG image has an invalid viewBox attribute',
-	            sprintf(
-	               'The [viewBox] attribute does not have an expected value: [%s] in path [%s].',
-	                $viewBox,
-	                $imagePath
+        if(count($size) != 4) 
+        {
+            throw new ImageHelper_Exception(
+                'SVG image has an invalid viewBox attribute',
+                sprintf(
+                    'The [viewBox] attribute does not have an expected value: [%s] in path [%s].',
+                    $viewBox,
+                    $imagePath
                 ),
-	            self::ERROR_SVG_VIEWBOX_INVALID
+                self::ERROR_SVG_VIEWBOX_INVALID
             );
-	    }
+        }
 	    
-	    $boxWidth = $size[2];
-	    $boxHeight = $size[3];
+        $boxWidth = $size[2];
+        $boxHeight = $size[3];
 	    
-	    // calculate the x and y units of the document: 
-	    // @see http://tutorials.jenkov.com/svg/svg-viewport-view-box.html#viewbox
-	    //
-	    // The viewbox combined with the width and heigt of the svg
-	    // allow calculating how many pixels are in one unit of the 
-	    // width and height of the document.
+        // calculate the x and y units of the document: 
+        // @see http://tutorials.jenkov.com/svg/svg-viewport-view-box.html#viewbox
+        //
+        // The viewbox combined with the width and heigt of the svg
+        // allow calculating how many pixels are in one unit of the 
+        // width and height of the document.
         //
-	    $xUnits = $svgWidth / $boxWidth;
-	    $yUnits = $svgHeight / $boxHeight;
+        $xUnits = $svgWidth / $boxWidth;
+        $yUnits = $svgHeight / $boxHeight;
 	    
-	    $pxWidth = $xUnits * $svgWidth;
-	    $pxHeight = $yUnits * $svgHeight;
+        $pxWidth = $xUnits * $svgWidth;
+        $pxHeight = $yUnits * $svgHeight;
 	    
-	    return array(
-	        $pxWidth,
-	        $pxHeight,
-	        'bits' => 8
-	    );
-	}
+        return array(
+            $pxWidth,
+            $pxHeight,
+            'bits' => 8
+        );
+    }
 	
-	/**
-    * Crops the image to the specified width and height, optionally
-    * specifying the origin position to crop from.
-    * 
-    * @param integer $width
-    * @param integer $height
-    * @param integer $x
-    * @param integer $y
-    * @return ImageHelper
-    */
+    /**
+     * Crops the image to the specified width and height, optionally
+     * specifying the origin position to crop from.
+     * 
+     * @param integer $width
+     * @param integer $height
+     * @param integer $x
+     * @param integer $y
+     * @return ImageHelper
+     */
     public function crop(int $width, int $height, int $x=0, int $y=0) : ImageHelper
     {
         $new = $this->createNewImage($width, $height);
@@ -1526,22 +1526,22 @@ 
         return $this->newHeight;
     }
 
-   /**
-    * Calculates the average color value used in 
-    * the image. Returns an associative array
-    * with the red, green, blue and alpha components,
-    * or a HEX color string depending on the selected
-    * format.
-    * 
-    * NOTE: Use the calcAverageColorXXX methods for
-    * strict return types. 
-    * 
-    * @param int $format The format in which to return the color value.
-    * @return array|string
-    * 
-    * @see ImageHelper::calcAverageColorRGB()
-    * @see ImageHelper::calcAverageColorHEX()
-    */
+    /**
+     * Calculates the average color value used in 
+     * the image. Returns an associative array
+     * with the red, green, blue and alpha components,
+     * or a HEX color string depending on the selected
+     * format.
+     * 
+     * NOTE: Use the calcAverageColorXXX methods for
+     * strict return types. 
+     * 
+     * @param int $format The format in which to return the color value.
+     * @return array|string
+     * 
+     * @see ImageHelper::calcAverageColorRGB()
+     * @see ImageHelper::calcAverageColorHEX()
+     */
     public function calcAverageColor(int $format=self::COLORFORMAT_RGB)
     {
         $image = $this->duplicate();
@@ -1550,35 +1550,35 @@ 
         return $image->getColorAt(0, 0, $format);
     }
     
-   /**
-    * Calculates the image's average color value, and
-    * returns an associative array with red, green,
-    * blue and alpha keys.
-    * 
-    * @throws ImageHelper_Exception
-    * @return array
-    */
+    /**
+     * Calculates the image's average color value, and
+     * returns an associative array with red, green,
+     * blue and alpha keys.
+     * 
+     * @throws ImageHelper_Exception
+     * @return array
+     */
     public function calcAverageColorRGB() : array
     {
-       $result = $this->calcAverageColor(self::COLORFORMAT_RGB);
-       if(is_array($result)) {
-           return $result;
-       }
+        $result = $this->calcAverageColor(self::COLORFORMAT_RGB);
+        if(is_array($result)) {
+            return $result;
+        }
        
-       throw new ImageHelper_Exception(
-           'Unexpected color value',
-           sprintf('Expected an array, got [%s].', gettype($result)),
-           self::ERROR_UNEXPECTED_COLOR_VALUE
-       );
+        throw new ImageHelper_Exception(
+            'Unexpected color value',
+            sprintf('Expected an array, got [%s].', gettype($result)),
+            self::ERROR_UNEXPECTED_COLOR_VALUE
+        );
     }
     
-   /**
-    * Calculates the image's average color value, and
-    * returns a hex color string (without the #).
-    * 
-    * @throws ImageHelper_Exception
-    * @return string
-    */
+    /**
+     * Calculates the image's average color value, and
+     * returns a hex color string (without the #).
+     * 
+     * @throws ImageHelper_Exception
+     * @return string
+     */
     public function calcAverageColorHex() : string
     {
         $result = $this->calcAverageColor(self::COLORFORMAT_HEX);
@@ -1645,12 +1645,12 @@ 
         return $rgb;
     }
     
-   /**
-    * Converts an RGB value to its luminance equivalent.
-    * 
-    * @param array<string,int> $rgb
-    * @return integer Integer, from 0 to 255 (0=black, 255=white)
-    */
+    /**
+     * Converts an RGB value to its luminance equivalent.
+     * 
+     * @param array<string,int> $rgb
+     * @return integer Integer, from 0 to 255 (0=black, 255=white)
+     */
     public static function rgb2luma(array $rgb) : int
     {
         return (int)floor((($rgb['red']*2)+$rgb['blue']+($rgb['green']*3))/6);
@@ -1670,15 +1670,15 @@ 
         return $luma * 100 / 255;
     }
     
-   /**
-    * Retrieves an md5 hash of the source image file.
-    * 
-    * NOTE: Only works when the helper has been created
-    * from a file. Otherwise, an exception is thrown.
-    * 
-    * @return string
-    * @throws ImageHelper_Exception|OutputBuffering_Exception
-    */
+    /**
+     * Retrieves an md5 hash of the source image file.
+     * 
+     * NOTE: Only works when the helper has been created
+     * from a file. Otherwise, an exception is thrown.
+     * 
+     * @return string
+     * @throws ImageHelper_Exception|OutputBuffering_Exception
+     */
     public function getHash() : string
     {
         if($this->newImage === null)

Spacing +98 added lines, -98 removed lines

@@ -134,10 +134,10 @@ 
      * @throws ImageHelper_Exception
      * @see ImageHelper::ERROR_GD_LIBRARY_NOT_INSTALLED
      */
-    public function __construct(?string $sourceFile=null, $resource=null, ?string $type=null)
+    public function __construct(?string $sourceFile = null, $resource = null, ?string $type = null)
     {
         // ensure that the GD library is installed
-        if(!function_exists('imagecreate')) 
+        if (!function_exists('imagecreate')) 
         {
             throw new ImageHelper_Exception(
                 'The PHP GD extension is not installed or not enabled.',
@@ -146,7 +146,7 @@ 
             );
         }
         
-        if(is_resource($resource)) 
+        if (is_resource($resource)) 
         {
             $this->sourceImage = $resource;
             $this->type = $type;
@@ -170,21 +170,21 @@ 
             if (is_null($this->type)) {
                 throw new ImageHelper_Exception(
                     'Error opening image',
-                    'Not a valid supported image type for image ' . $this->file,
+                    'Not a valid supported image type for image '.$this->file,
                     self::ERROR_UNSUPPORTED_IMAGE_TYPE
                 );
             }
 
             $this->info = self::getImageSize($this->file);
 
-            if(!$this->isVector()) 
+            if (!$this->isVector()) 
             {
-                $method = 'imagecreatefrom' . $this->type;
+                $method = 'imagecreatefrom'.$this->type;
                 $this->sourceImage = $method($this->file);
                 if (!$this->sourceImage) {
                     throw new ImageHelper_Exception(
                         'Error creating new image',
-                        $method . ' failed',
+                        $method.' failed',
                         self::ERROR_FAILED_TO_CREATE_NEW_IMAGE
                     );
                 }
@@ -196,7 +196,7 @@ 
         $this->width = $this->info->getWidth();
         $this->height = $this->info->getHeight();
 
-        if(!$this->isVector()) {
+        if (!$this->isVector()) {
             $this->setNewImage($this->duplicateImage($this->sourceImage));
         }
     }
@@ -212,10 +212,10 @@ 
     *
     * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_OBJECT
     */
-    public static function createNew($width, $height, $type='png')
+    public static function createNew($width, $height, $type = 'png')
     {
         $img = imagecreatetruecolor($width, $height);
-        if($img !== false) {
+        if ($img !== false) {
             return self::createFromResource($img, 'png');
         }
         
@@ -238,7 +238,7 @@ 
     * @param string $type The target image type, e.g. "jpeg", "png", etc.
     * @return ImageHelper
     */
-    public static function createFromResource($resource, ?string $type=null)
+    public static function createFromResource($resource, ?string $type = null)
     {
         self::requireResource($resource);
         
@@ -270,7 +270,7 @@ 
     */
     public static function setConfig($name, $value)
     {
-        if(isset(self::$config[$name])) {
+        if (isset(self::$config[$name])) {
             self::$config[$name] = $value;
         }
     }
@@ -281,7 +281,7 @@ 
     * 
     * @param bool $enabled
     */
-    public static function setAutoMemoryAdjustment($enabled=true)
+    public static function setAutoMemoryAdjustment($enabled = true)
     {
         self::setConfig('auto-memory-adjustment', $enabled);
     }
@@ -315,7 +315,7 @@ 
 
     public function enableAlpha()
     {
-        if(!$this->alpha) 
+        if (!$this->alpha) 
         {
             self::addAlphaSupport($this->newImage, false);
             $this->alpha = true;
@@ -346,9 +346,9 @@ 
      * @param number $percent
      * @return ImageHelper
      */
-    public function sharpen($percent=0)
+    public function sharpen($percent = 0)
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -357,9 +357,9 @@ 
         return $this->convolute($factor);
     }
     
-    public function blur($percent=0)
+    public function blur($percent = 0)
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -372,12 +372,12 @@ 
     {
         // get a value thats equal to 64 - abs( factor )
         // ( using min/max to limited the factor to 0 - 64 to not get out of range values )
-        $val1Adjustment = 64 - min( 64, max( 0, abs( $factor ) ) );
+        $val1Adjustment = 64 - min(64, max(0, abs($factor)));
         
         // the base factor for the "current" pixel depends on if we are blurring or sharpening.
         // If we are blurring use 1, if sharpening use 9.
         $val1Base = 9;
-        if( abs( $factor ) != $factor ) {
+        if (abs($factor) != $factor) {
             $val1Base = 1;
         }
         
@@ -390,24 +390,24 @@ 
         
         // the value for the surrounding pixels is either positive or negative depending on if we are blurring or sharpening.
         $val2 = -1;
-        if( abs( $factor ) != $factor ) {
+        if (abs($factor) != $factor) {
             $val2 = 1;
         }
         
         // setup matrix ..
         $matrix = array(
-            array( $val2, $val2, $val2 ),
-            array( $val2, $val1, $val2 ),
-            array( $val2, $val2, $val2 )
+            array($val2, $val2, $val2),
+            array($val2, $val1, $val2),
+            array($val2, $val2, $val2)
         );
         
         // calculate the correct divisor
         // actual divisor is equal to "$divisor = $val1 + $val2 * 8;"
         // but the following line is more generic
-        $divisor = array_sum( array_map( 'array_sum', $matrix ) );
+        $divisor = array_sum(array_map('array_sum', $matrix));
         
         // apply the matrix
-        imageconvolution( $this->newImage, $matrix, $divisor, 0 );
+        imageconvolution($this->newImage, $matrix, $divisor, 0);
         
         return $this;
     }
@@ -533,7 +533,7 @@ 
     */
     public function resample(?int $width = null, ?int $height = null) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
         
@@ -554,7 +554,7 @@ 
 
     public function resampleAndCrop($width, $height) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
@@ -601,14 +601,14 @@ 
     * @param resource $canvas
     * @param bool $fill Whether to fill the whole canvas with the transparency
     */
-    public static function addAlphaSupport($canvas, $fill=true)
+    public static function addAlphaSupport($canvas, $fill = true)
     {
         self::requireResource($canvas);
         
-        imagealphablending($canvas,true);
+        imagealphablending($canvas, true);
         imagesavealpha($canvas, true);
 
-        if($fill) {
+        if ($fill) {
             self::fillImageTransparent($canvas);
         }
     }
@@ -618,13 +618,13 @@ 
         return $this->alpha;
     }
 
-    public function save(string $targetFile, $dispose=true)
+    public function save(string $targetFile, $dispose = true)
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return true;
         }
         
-        if(!is_resource($this->newImage)) {
+        if (!is_resource($this->newImage)) {
             throw new ImageHelper_Exception(
                 'Error creating new image',
                 'Cannot save an image, no valid image resource was created. You have to call one of the resample methods to create a new image.',
@@ -636,7 +636,7 @@ 
             unlink($targetFile);
         }
         
-        $method = 'image' . $this->type;
+        $method = 'image'.$this->type;
         if (!$method($this->newImage, $targetFile, $this->resolveQuality())) {
             throw new ImageHelper_Exception(
                 'Error creating new image',
@@ -657,7 +657,7 @@ 
             );
         }
 
-        if($dispose) {
+        if ($dispose) {
             $this->dispose();
         }
         
@@ -666,11 +666,11 @@ 
     
     public function dispose()
     {
-        if(is_resource($this->sourceImage)) {
+        if (is_resource($this->sourceImage)) {
             imagedestroy($this->sourceImage);
         }
         
-        if(is_resource($this->newImage)) {
+        if (is_resource($this->newImage)) {
             imagedestroy($this->newImage);
         }
     }
@@ -723,7 +723,7 @@ 
     */
     protected function adjustMemory() : bool
     {
-        if(!self::$config['auto-memory-adjustment']) {
+        if (!self::$config['auto-memory-adjustment']) {
             return true;
         }
         
@@ -752,7 +752,7 @@ 
         if (function_exists('memory_get_usage') && memory_get_usage() + $memoryNeeded > $memoryLimit) {
             $newLimit = ($memoryLimit + (memory_get_usage() + $memoryNeeded)) / $MB;
             $newLimit = ceil($newLimit);
-            ini_set('memory_limit', $newLimit . 'M');
+            ini_set('memory_limit', $newLimit.'M');
 
             return true;
         }
@@ -783,16 +783,16 @@ 
     */
     protected function resampleImage(int $newWidth, int $newHeight) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
-        if($this->newWidth==$newWidth && $this->newHeight==$newHeight) {
+        if ($this->newWidth == $newWidth && $this->newHeight == $newHeight) {
             return $this;
         }
         
-        if($newWidth < 1) { $newWidth = 1; }
-        if($newHeight < 1) { $newHeight = 1; }
+        if ($newWidth < 1) { $newWidth = 1; }
+        if ($newHeight < 1) { $newHeight = 1; }
         
         $this->adjustMemory();
 
@@ -860,15 +860,15 @@ 
     * @see ImageHelper::ERROR_NOT_A_RESOURCE
     * @see ImageHelper::ERROR_INVALID_STREAM_IMAGE_TYPE
     */
-    public static function displayImageStream($resource, string $imageType, int $quality=-1) : void
+    public static function displayImageStream($resource, string $imageType, int $quality = -1) : void
     {
         self::requireResource($resource);
 
         $imageType = self::requireValidStreamType($imageType);
         
-        header('Content-type:image/' . $imageType);
+        header('Content-type:image/'.$imageType);
 
-        $function = 'image' . $imageType;
+        $function = 'image'.$imageType;
         
         $function($resource, null, $quality);
     }
@@ -885,7 +885,7 @@ 
     {
         $imageType = strtolower($imageType);
 
-        if(in_array($imageType, self::$streamTypes))
+        if (in_array($imageType, self::$streamTypes))
         {
             return $imageType;
         }
@@ -911,7 +911,7 @@ 
         if (headers_sent($file, $line)) {
             throw new ImageHelper_Exception(
                 'Error displaying image',
-                'Headers have already been sent: in file ' . $file . ':' . $line,
+                'Headers have already been sent: in file '.$file.':'.$line,
                 self::ERROR_HEADERS_ALREADY_SENT
             );
         }
@@ -928,16 +928,16 @@ 
         }
 
         $format = self::getFileImageType($imageFile);
-        if($format == 'svg') {
+        if ($format == 'svg') {
             $format = 'svg+xml';
         }
 
-        $contentType = 'image/' . $format;
+        $contentType = 'image/'.$format;
         
         header('Content-Type: '.$contentType);
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s", filemtime($imageFile)) . " GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s", filemtime($imageFile))." GMT");
         header('Cache-Control: public');
-        header('Content-Length: ' . filesize($imageFile));
+        header('Content-Length: '.filesize($imageFile));
 
         readfile($imageFile);
     }
@@ -965,7 +965,7 @@ 
      * @see ImageHelper::ERROR_NOT_A_RESOURCE
      * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_CANVAS
      */
-    public function trim(?array $color=null) : ImageHelper
+    public function trim(?array $color = null) : ImageHelper
     {
         return $this->trimImage($this->newImage, $color);
     }
@@ -987,7 +987,7 @@ 
         $color = imagecolorsforindex($img, $colorIndex);
         
         // it seems imagecolorsforindex may return false (undocumented, unproven)
-        if(is_array($color)) {
+        if (is_array($color)) {
             return $color;
         }
         
@@ -1011,15 +1011,15 @@ 
     * @see ImageHelper::ERROR_NOT_A_RESOURCE
     * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_CANVAS
     */
-    protected function trimImage($img, ?array $color=null) : ImageHelper
+    protected function trimImage($img, ?array $color = null) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
         self::requireResource($img);
         
-        if(empty($color)) 
+        if (empty($color)) 
         {
             $color = imagecolorat($img, 0, 0);
             $color = $this->getIndexedColors($img, $color);
@@ -1036,16 +1036,16 @@ 
         $ymax = null;
          
         // Start scanning for the edges.
-        for ($iy=0; $iy<$imh; $iy++)
+        for ($iy = 0; $iy < $imh; $iy++)
         {
             $first = true;
             
-            for ($ix=0; $ix<$imw; $ix++)
+            for ($ix = 0; $ix < $imw; $ix++)
             {
                 $ndx = imagecolorat($img, $ix, $iy);
                 $colors = $this->getIndexedColors($img, $ndx);
                 
-                if(!$this->colorsMatch($colors, $color)) 
+                if (!$this->colorsMatch($colors, $color)) 
                 {
                     if ($xmin > $ix) { $xmin = $ix; }
                     if ($xmax < $ix) { $xmax = $ix; }
@@ -1053,7 +1053,7 @@ 
                     
                     $ymax = $iy;
                     
-                    if($first)
+                    if ($first)
                     { 
                         $ix = $xmax; 
                         $first = false; 
@@ -1063,18 +1063,18 @@ 
         }
         
         // no trimming border found
-        if($ymax === null) {
+        if ($ymax === null) {
             return $this;
         }
         
         // The new width and height of the image. 
-        $imw = 1+$xmax-$xmin; // Image width in pixels
-        $imh = 1+$ymax-$ymin; // Image height in pixels
+        $imw = 1 + $xmax - $xmin; // Image width in pixels
+        $imh = 1 + $ymax - $ymin; // Image height in pixels
 
         // Make another image to place the trimmed version in.
         $im2 = $this->createNewImage($imw, $imh);
         
-        if($color['alpha'] > 0) 
+        if ($color['alpha'] > 0) 
         {
             $bg2 = imagecolorallocatealpha($im2, $color['red'], $color['green'], $color['blue'], $color['alpha']);
             imagecolortransparent($im2, $bg2);
@@ -1113,7 +1113,7 @@ 
         
         $this->newImage = $image;
         $this->newWidth = imagesx($image);
-        $this->newHeight= imagesy($image);
+        $this->newHeight = imagesy($image);
 
         return $this;
     }
@@ -1128,7 +1128,7 @@ 
     */
     protected static function requireResource($subject) : void
     {
-        if(is_resource($subject)) {
+        if (is_resource($subject)) {
             return;
         }
         
@@ -1154,7 +1154,7 @@ 
     {
         $img = imagecreatetruecolor($width, $height);
         
-        if($img === false) 
+        if ($img === false) 
         {
             throw new ImageHelper_Exception(
                 'Error creating new image',
@@ -1178,8 +1178,8 @@ 
 	protected function colorsMatch(array $a, array $b) : bool
 	{
 		$parts = array('red', 'green', 'blue');
-		foreach($parts as $part) {
-			if($a[$part] != $b[$part]) {
+		foreach ($parts as $part) {
+			if ($a[$part] != $b[$part]) {
 				return false;
 			}
 		} 
@@ -1187,7 +1187,7 @@ 
 		return true;
 	}
 	
-	public function fillWhite($x=0, $y=0)
+	public function fillWhite($x = 0, $y = 0)
 	{
 	    $this->addRGBColor('white', 255, 255, 255);
         return $this->fill('white', $x, $y);
@@ -1207,11 +1207,11 @@ 
 	    self::requireResource($resource);
 	    
 	    $transparent = imagecolorallocatealpha($resource, 89, 14, 207, 127);
-	    imagecolortransparent ($resource, $transparent);
+	    imagecolortransparent($resource, $transparent);
 	    imagefill($resource, 0, 0, $transparent);
 	}
 	
-	public function fill($colorName, $x=0, $y=0)
+	public function fill($colorName, $x = 0, $y = 0)
 	{
 	    imagefill($this->newImage, $x, $y, $this->colors[$colorName]);
 	    return $this;
@@ -1225,7 +1225,7 @@ 
         return $this;
     }
     
-    public function textTTF($text, $size, $colorName, $x=0, $y=0, $angle=0)
+    public function textTTF($text, $size, $colorName, $x = 0, $y = 0, $angle = 0)
     {
         imagealphablending($this->newImage, true);
         
@@ -1244,11 +1244,11 @@ 
         return $this->newImage;
     }
     
-    public function paste(ImageHelper $target, $xpos=0, $ypos=0, $sourceX=0, $sourceY=0)
+    public function paste(ImageHelper $target, $xpos = 0, $ypos = 0, $sourceX = 0, $sourceY = 0)
     {
         $img = $target->getImage();
         
-        if($target->isAlpha()) {
+        if ($target->isAlpha()) {
             $this->enableAlpha();
         }
         
@@ -1293,10 +1293,10 @@ 
     public function fitText($text, $matchWidth)
     {
         $sizes = array();
-        for($i=1; $i<=1000; $i=$i+0.1) {
+        for ($i = 1; $i <= 1000; $i = $i + 0.1) {
             $size = $this->calcTextSize($text, $i);
             $sizes[] = $size;
-            if($size['width'] >= $matchWidth) {
+            if ($size['width'] >= $matchWidth) {
                 break;
             }
         }
@@ -1308,7 +1308,7 @@ 
         $diffLast = $last['width'] - $matchWidth;
         $diffPrev = $matchWidth - $prev['width'];
     
-        if($diffLast <= $diffPrev) {
+        if ($diffLast <= $diffPrev) {
             return $last;
         }
     
@@ -1336,14 +1336,14 @@ 
             'bottom_left_y' => $box[1],
             'bottom_right_x' => $box[2],
             'bottom_right_y' => $box[3],
-            'width' => $right-$left,
-            'height' => $bottom-$top
+            'width' => $right - $left,
+            'height' => $bottom - $top
         );
     }
     
     protected function requireTTFFont()
     {
-        if(isset($this->TTFFile)) {
+        if (isset($this->TTFFile)) {
             return;
         }
         
@@ -1378,7 +1378,7 @@ 
 	 */
 	public static function getImageSize($pathOrResource) : ImageHelper_Size
 	{
-	    if(is_resource($pathOrResource)) 
+	    if (is_resource($pathOrResource)) 
 	    {
 	        return new ImageHelper_Size(array(
 	            'width' => imagesx($pathOrResource),
@@ -1392,7 +1392,7 @@ 
 	    
 	    $info = false;
 	    $method = 'getImageSize_'.$type;
-	    if(method_exists(__CLASS__, $method)) 
+	    if (method_exists(__CLASS__, $method)) 
 	    {
 	        $info = call_user_func(array(__CLASS__, $method), $pathOrResource);
 	    } 
@@ -1401,7 +1401,7 @@ 
 	        $info = getimagesize($pathOrResource);
 	    }
 	    
-	    if($info !== false) {
+	    if ($info !== false) {
 	        return new ImageHelper_Size($info);
 	    }
 	    
@@ -1427,7 +1427,7 @@ 
 	    $xml = XMLHelper::createSimplexml();
 	    $xml->loadFile($imagePath);
 	    
-	    if($xml->hasErrors()) {
+	    if ($xml->hasErrors()) {
 	        throw new ImageHelper_Exception(
 	            'Error opening SVG image',
 	            sprintf(
@@ -1442,7 +1442,7 @@ 
 	    $xml->dispose();
 	    unset($xml);
 	    
-	    if(!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) {
+	    if (!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) {
 	        throw new ImageHelper_Exception(
 	            'SVG Image is corrupted',
 	            sprintf(
@@ -1459,7 +1459,7 @@ 
 	    $viewBox = str_replace(' ', ',', $data['@attributes']['viewBox']);
 	    $size = explode(',', $viewBox);
 	    
-	    if(count($size) != 4) 
+	    if (count($size) != 4) 
 	    {
 	        throw new ImageHelper_Exception(
 	            'SVG image has an invalid viewBox attribute',
@@ -1505,7 +1505,7 @@ 
     * @param integer $y
     * @return ImageHelper
     */
-    public function crop(int $width, int $height, int $x=0, int $y=0) : ImageHelper
+    public function crop(int $width, int $height, int $x = 0, int $y = 0) : ImageHelper
     {
         $new = $this->createNewImage($width, $height);
         
@@ -1542,7 +1542,7 @@ 
     * @see ImageHelper::calcAverageColorRGB()
     * @see ImageHelper::calcAverageColorHEX()
     */
-    public function calcAverageColor(int $format=self::COLORFORMAT_RGB)
+    public function calcAverageColor(int $format = self::COLORFORMAT_RGB)
     {
         $image = $this->duplicate();
         $image->resample(1, 1);
@@ -1561,7 +1561,7 @@ 
     public function calcAverageColorRGB() : array
     {
        $result = $this->calcAverageColor(self::COLORFORMAT_RGB);
-       if(is_array($result)) {
+       if (is_array($result)) {
            return $result;
        }
        
@@ -1582,7 +1582,7 @@ 
     public function calcAverageColorHex() : string
     {
         $result = $this->calcAverageColor(self::COLORFORMAT_HEX);
-        if(is_string($result)) {
+        if (is_string($result)) {
             return $result;
         }
         
@@ -1618,9 +1618,9 @@ 
      * @throws ImageHelper_Exception
      * @see ImageHelper::ERROR_POSITION_OUT_OF_BOUNDS
      */
-    public function getColorAt(int $x, int $y, int $format=self::COLORFORMAT_RGB)
+    public function getColorAt(int $x, int $y, int $format = self::COLORFORMAT_RGB)
     {
-        if($x > $this->getWidth() || $y > $this->getHeight()) 
+        if ($x > $this->getWidth() || $y > $this->getHeight()) 
         {
             throw new ImageHelper_Exception(
                 'Position out of bounds',
@@ -1638,7 +1638,7 @@ 
         $idx = imagecolorat($this->newImage, $x, $y);
         $rgb = $this->getIndexedColors($this->newImage, $idx);
         
-        if($format == self::COLORFORMAT_HEX) {
+        if ($format == self::COLORFORMAT_HEX) {
             return self::rgb2hex($rgb);
         }
 
@@ -1653,7 +1653,7 @@ 
     */
     public static function rgb2luma(array $rgb) : int
     {
-        return (int)floor((($rgb['red']*2)+$rgb['blue']+($rgb['green']*3))/6);
+        return (int)floor((($rgb['red'] * 2) + $rgb['blue'] + ($rgb['green'] * 3)) / 6);
     }
 
     /**
@@ -1681,7 +1681,7 @@ 
     */
     public function getHash() : string
     {
-        if($this->newImage === null)
+        if ($this->newImage === null)
         {
             throw new ImageHelper_Exception(
                 'No image loaded to create a hash for.',

src/ConvertHelper/WordWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         return $this->getBoolOption('cut');
     }
     
-    public function setCuttingEnabled(bool $enabled=true) : ConvertHelper_WordWrapper
+    public function setCuttingEnabled(bool $enabled = true) : ConvertHelper_WordWrapper
     {
         $this->setOption('cut', $enabled);
         return $this;

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
                 if (mb_strlen($actual.$word) <= $width)
                 {
                     $actual .= $word.' ';
-                }
-                else
+                } else
                 {
                     if ($actual != '') {
                         $line .= rtrim($actual).$break;

src/ConvertHelper/IntervalConverter.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
     
     public function __construct()
     {
-        if(class_exists('\AppLocalize\Localization')) {
+        if (class_exists('\AppLocalize\Localization')) {
             \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged'));
         }
     }
@@ -69,17 +69,17 @@ 
         $keep = $this->resolveTokens($interval);
 
         $parts = array();
-        foreach($keep as $token)
+        foreach ($keep as $token)
         {
             $value = $interval->getToken($token);
-            if($value === 0) {
+            if ($value === 0) {
                 continue;
             }
             
             $parts[] = $this->translateToken($token, $interval);
         }
         
-        if(count($parts) == 1) {
+        if (count($parts) == 1) {
             return $parts[0];
         }
         
@@ -101,10 +101,10 @@ 
         $value = $interval->getToken($token);
         
         $suffix = 'p';
-        if($value == 1) { $suffix = 's'; }
+        if ($value == 1) { $suffix = 's'; }
         $token .= $suffix;
         
-        if(!isset(self::$texts[$token]))
+        if (!isset(self::$texts[$token]))
         {
             throw new ConvertHelper_Exception(
                 'Missing interval translation',
@@ -134,9 +134,9 @@ 
     {
         $offset = 0;
         
-        foreach($this->tokens as $token) 
+        foreach ($this->tokens as $token) 
         {
-            if($interval->getToken($token) > 0) 
+            if ($interval->getToken($token) > 0) 
             {
                 return array_slice($this->tokens, $offset);
             }
@@ -152,7 +152,7 @@ 
     */
     protected function initTexts() : void
     {
-        if(isset(self::$texts)) {
+        if (isset(self::$texts)) {
             return;
         }
         

Indentation +38 added lines, -39 removed lines

@@ -17,21 +17,20 @@ 
  * @package Application Utils
  * @subpackage ConvertHelper
  * @author Sebastian Mordziol <s.mordziol@mistralys.eu>
-
  * @see ConvertHelper::interval2string()
  */
 class ConvertHelper_IntervalConverter
 {
     const ERROR_MISSING_TRANSLATION = 43501;
     
-   /**
-    * @var array|NULL
-    */
+    /**
+     * @var array|NULL
+     */
     protected static $texts = null;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $tokens = array('y', 'm', 'd', 'h', 'i', 's');
     
     public function __construct()
@@ -41,25 +40,25 @@ 
         }
     }
     
-   /**
-    * Called whenever the application locale has changed,
-    * to reset the internal translation cache.
-    */
+    /**
+     * Called whenever the application locale has changed,
+     * to reset the internal translation cache.
+     */
     public function handle_localeChanged()
     {
         self::$texts = null;
     }
     
-   /**
-    * Converts the specified interval to a human readable
-    * string, e.g. "2 hours and 4 minutes".
-    * 
-    * @param \DateInterval $interval
-    * @return string
-    * @throws ConvertHelper_Exception
-    * 
-    * @see ConvertHelper_IntervalConverter::ERROR_MISSING_TRANSLATION
-    */
+    /**
+     * Converts the specified interval to a human readable
+     * string, e.g. "2 hours and 4 minutes".
+     * 
+     * @param \DateInterval $interval
+     * @return string
+     * @throws ConvertHelper_Exception
+     * 
+     * @see ConvertHelper_IntervalConverter::ERROR_MISSING_TRANSLATION
+     */
     public function toString(\DateInterval $interval) : string
     {
         $this->initTexts();
@@ -88,14 +87,14 @@ 
         return t('%1$s and %2$s', implode(', ', $parts), $last);
     }
     
-   /**
-    * Translates the selected time token, e.g. "y" (for year).
-    * 
-    * @param string $token
-    * @param ConvertHelper_DateInterval $interval
-    * @throws ConvertHelper_Exception
-    * @return string
-    */
+    /**
+     * Translates the selected time token, e.g. "y" (for year).
+     * 
+     * @param string $token
+     * @param ConvertHelper_DateInterval $interval
+     * @throws ConvertHelper_Exception
+     * @return string
+     */
     protected function translateToken(string $token, ConvertHelper_DateInterval $interval) : string
     {
         $value = $interval->getToken($token);
@@ -123,13 +122,13 @@ 
         );
     }
     
-   /**
-    * Resolves all time tokens that need to be translated in
-    * the subject interval, depending on its length.
-    * 
-    * @param ConvertHelper_DateInterval $interval
-    * @return array
-    */
+    /**
+     * Resolves all time tokens that need to be translated in
+     * the subject interval, depending on its length.
+     * 
+     * @param ConvertHelper_DateInterval $interval
+     * @return array
+     */
     protected function resolveTokens(ConvertHelper_DateInterval $interval) : array
     {
         $offset = 0;
@@ -147,9 +146,9 @@ 
         return array();
     }
     
-   /**
-    * Initializes the translateable strings.
-    */
+    /**
+     * Initializes the translateable strings.
+     */
     protected function initTexts() : void
     {
         if(isset(self::$texts)) {

src/ZIPHelper.php

Indentation +55 added lines, -55 removed lines

@@ -36,14 +36,14 @@ 
         'WriteThreshold' => 100
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $file;
     
-   /**
-    * @var \ZipArchive
-    */
+    /**
+     * @var \ZipArchive
+     */
     protected $zip;
     
     public function __construct(string $targetFile)
@@ -51,35 +51,35 @@ 
         $this->file = $targetFile;
     }
     
-   /**
-    * Sets an option, among the available options:
-    * 
-    * <ul>
-    * <li>WriteThreshold: The amount of files to add before the zip is automatically written to disk and re-opened to release the file handles. Set to 0 to disable.</li>
-    * </ul>
-    * 
-    * @param string $name
-    * @param mixed $value
-    * @return ZIPHelper
-    */
+    /**
+     * Sets an option, among the available options:
+     * 
+     * <ul>
+     * <li>WriteThreshold: The amount of files to add before the zip is automatically written to disk and re-opened to release the file handles. Set to 0 to disable.</li>
+     * </ul>
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return ZIPHelper
+     */
     public function setOption(string $name, $value) : ZIPHelper
     {
         $this->options[$name] = $value;
         return $this;
     }
     
-   /**
-    * Adds a file to the zip. By default, the file is stored
-    * with the same name in the root of the zip. Use the optional
-    * parameter to change the location in the zip.
-    * 
-    * @param string $filePath
-    * @param string|null $zipPath If no path is specified, file will be added with the same name in the ZIP's root.
-    * @throws ZIPHelper_Exception
-    * @return bool
-    * 
-    * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST
-    */
+    /**
+     * Adds a file to the zip. By default, the file is stored
+     * with the same name in the root of the zip. Use the optional
+     * parameter to change the location in the zip.
+     * 
+     * @param string $filePath
+     * @param string|null $zipPath If no path is specified, file will be added with the same name in the ZIP's root.
+     * @throws ZIPHelper_Exception
+     * @return bool
+     * 
+     * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST
+     */
     public function addFile(string $filePath, ?string $zipPath=null) : bool
     {
         $this->open();
@@ -255,13 +255,13 @@ 
         return $fileName;
     }
     
-   /**
-    * Like {@link ZIPHelper::download()}, but deletes the
-    * file after sending it to the browser.
-    * 
-    * @param string|NULL $fileName Override the ZIP's file name for the download
-    * @see ZIPHelper::download()
-    */
+    /**
+     * Like {@link ZIPHelper::download()}, but deletes the
+     * file after sending it to the browser.
+     * 
+     * @param string|NULL $fileName Override the ZIP's file name for the download
+     * @see ZIPHelper::download()
+     */
     public function downloadAndDelete(?string $fileName=null)
     {
         $this->download($fileName);
@@ -269,14 +269,14 @@ 
         FileHelper::deleteFile($this->file);
     }
 
-   /**
-    * Extracts all files and folders from the zip to the 
-    * target folder. If no folder is specified, the files
-    * are extracted into the same folder as the zip itself.
-    * 
-    * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder.
-    * @return boolean
-    */
+    /**
+     * Extracts all files and folders from the zip to the 
+     * target folder. If no folder is specified, the files
+     * are extracted into the same folder as the zip itself.
+     * 
+     * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder.
+     * @return boolean
+     */
     public function extractAll(?string $outputFolder=null) : bool
     {
         if(empty($outputFolder)) {
@@ -289,9 +289,9 @@ 
     }
 
     
-   /**
-    * @return \ZipArchive
-    */
+    /**
+     * @return \ZipArchive
+     */
     public function getArchive() : \ZipArchive
     {
         $this->open();
@@ -299,14 +299,14 @@ 
         return $this->zip;
     }
     
-   /**
-    * JSON encodes the specified data and adds the json as
-    * a file in the ZIP archive.
-    * 
-    * @param mixed $data
-    * @param string $zipPath
-    * @return boolean
-    */
+    /**
+     * JSON encodes the specified data and adds the json as
+     * a file in the ZIP archive.
+     * 
+     * @param mixed $data
+     * @param string $zipPath
+     * @return boolean
+     */
     public function addJSON($data, $zipPath)
     {
         return $this->addString(

Spacing +17 added lines, -17 removed lines

@@ -30,7 +30,7 @@ 
     
     const ERROR_OPENING_ZIP_FILE = 338003;
     
-    const ERROR_CANNOT_SAVE_FILE_TO_DISK =338004;
+    const ERROR_CANNOT_SAVE_FILE_TO_DISK = 338004;
     
     protected $options = array(
         'WriteThreshold' => 100
@@ -80,7 +80,7 @@ 
     * 
     * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST
     */
-    public function addFile(string $filePath, ?string $zipPath=null) : bool
+    public function addFile(string $filePath, ?string $zipPath = null) : bool
     {
         $this->open();
         
@@ -126,16 +126,16 @@ 
     
     protected function open()
     {
-        if($this->open) {
+        if ($this->open) {
             return;
         }
         
-        if(!isset($this->zip)) {
+        if (!isset($this->zip)) {
             $this->zip = new \ZipArchive();
         }
         
         $flag = null;
-        if(!file_exists($this->file)) {
+        if (!file_exists($this->file)) {
             $flag = \ZipArchive::CREATE;
         }
         
@@ -175,7 +175,7 @@ 
     {
         $this->fileTracker++;
 
-        if($this->options['WriteThreshold'] < 1) {
+        if ($this->options['WriteThreshold'] < 1) {
             return;
         }
         
@@ -188,7 +188,7 @@ 
     
     protected function close()
     {
-        if(!$this->open) {
+        if (!$this->open) {
             return;
         }
         
@@ -197,8 +197,8 @@ 
             throw new ZIPHelper_Exception(
                 'Could not save ZIP file to disk',
                 sprintf(
-                    'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, ' .
-                    'including adding files that do not exist on disk, trying to create an empty zip, ' .
+                    'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, '.
+                    'including adding files that do not exist on disk, trying to create an empty zip, '.
                     'or trying to save to a directory that does not exist.',
                     $this->file
                 ),
@@ -213,7 +213,7 @@ 
     {
         $this->open();
         
-        if($this->countFiles() < 1) 
+        if ($this->countFiles() < 1) 
         {
             throw new ZIPHelper_Exception(
                 'No files in the zip file',
@@ -237,17 +237,17 @@ 
      * @throws ZIPHelper_Exception
      * @return string The file name that was sent (useful in case none was specified).
      */
-    public function download(?string $fileName=null) : string
+    public function download(?string $fileName = null) : string
     {
         $this->save();
         
-        if(empty($fileName)) {
+        if (empty($fileName)) {
             $fileName = basename($this->file);
         }
         
         header('Content-type: application/zip');
-        header('Content-Disposition: attachment; filename=' . $fileName);
-        header('Content-length: ' . filesize($this->file));
+        header('Content-Disposition: attachment; filename='.$fileName);
+        header('Content-length: '.filesize($this->file));
         header('Pragma: no-cache');
         header('Expires: 0');
         readfile($this->file);
@@ -262,7 +262,7 @@ 
     * @param string|NULL $fileName Override the ZIP's file name for the download
     * @see ZIPHelper::download()
     */
-    public function downloadAndDelete(?string $fileName=null)
+    public function downloadAndDelete(?string $fileName = null)
     {
         $this->download($fileName);
         
@@ -277,9 +277,9 @@ 
     * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder.
     * @return boolean
     */
-    public function extractAll(?string $outputFolder=null) : bool
+    public function extractAll(?string $outputFolder = null) : bool
     {
-        if(empty($outputFolder)) {
+        if (empty($outputFolder)) {
             $outputFolder = dirname($this->file);
         }
         

src/SVNHelper/CommandResult.php

Indentation +27 added lines, -27 removed lines

@@ -4,37 +4,37 @@ 
 
 class SVNHelper_CommandResult
 {
-   /**
-    * @var SVNHelper_Command
-    */
+    /**
+     * @var SVNHelper_Command
+     */
     protected $command;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $output;
     
-   /**
-    * @var SVNHelper_CommandError[]
-    */
+    /**
+     * @var SVNHelper_CommandError[]
+     */
     protected $errors = array();
     
-   /**
-    * @var SVNHelper_CommandError[]
-    */
+    /**
+     * @var SVNHelper_CommandError[]
+     */
     protected $warnings = array();
     
-   /**
-    * The actual command that has been executed
-    * @var string
-    */
+    /**
+     * The actual command that has been executed
+     * @var string
+     */
     protected $commandLine;
     
-   /**
-    * @param SVNHelper_Command $command
-    * @param string[] $output
-    * @param SVNHelper_CommandError[] $errors
-    */
+    /**
+     * @param SVNHelper_Command $command
+     * @param string[] $output
+     * @param SVNHelper_CommandError[] $errors
+     */
     public function __construct(SVNHelper_Command $command, $commandLine, $output, $errors)
     {
         $this->command = $command;
@@ -86,12 +86,12 @@ 
         return $this->command;
     }
     
-   /**
-    * Retrieves all error messages.
-    * 
-    * @param bool $asString
-    * @return string|string[]
-    */
+    /**
+     * Retrieves all error messages.
+     * 
+     * @param bool $asString
+     * @return string|string[]
+     */
     public function getErrorMessages(bool $asString=false)
     {
         if($asString) {

Spacing +15 added lines, -15 removed lines

@@ -41,8 +41,8 @@ 
         $this->commandLine = $commandLine;
         $this->output = $output;
         
-        foreach($errors as $error) {
-            if($error->isError()) {
+        foreach ($errors as $error) {
+            if ($error->isError()) {
                 $this->errors[] = $error;
             } else {
                 $this->warnings[] = $error;
@@ -62,8 +62,8 @@ 
     
     public function hasErrorCode($code)
     {
-        foreach($this->errors as $error) {
-            if($error->getCode() == $code) {
+        foreach ($this->errors as $error) {
+            if ($error->getCode() == $code) {
                 return true;
             }
         }
@@ -92,11 +92,11 @@ 
     * @param bool $asString
     * @return string|string[]
     */
-    public function getErrorMessages(bool $asString=false)
+    public function getErrorMessages(bool $asString = false)
     {
-        if($asString) {
+        if ($asString) {
             $lines = array();
-            foreach($this->errors as $error) {
+            foreach ($this->errors as $error) {
                 $lines[] = (string)$error;
             }
             
@@ -104,7 +104,7 @@ 
         }
         
         $messages = array();
-        foreach($this->errors as $error) {
+        foreach ($this->errors as $error) {
             $messages[] = (string)$error;
         }
         
@@ -123,7 +123,7 @@ 
     
     public function getLastLine()
     {
-        return $this->output[count($this->output)-1];
+        return $this->output[count($this->output) - 1];
     }
     
     public function getFirstLine()
@@ -138,8 +138,8 @@ 
     
     public function isConnectionFailed()
     {
-        foreach($this->errors as $error) {
-            if($error->isConnectionFailed()) {
+        foreach ($this->errors as $error) {
+            if ($error->isConnectionFailed()) {
                 return true;
             }
         }
@@ -149,8 +149,8 @@ 
     
     public function hasConflicts()
     {
-        foreach($this->errors as $error) {
-            if($error->isConflict()) {
+        foreach ($this->errors as $error) {
+            if ($error->isConflict()) {
                 return true;
             }
         }
@@ -160,8 +160,8 @@ 
     
     public function hasLocks()
     {
-        foreach($this->errors as $error) {
-            if($error->isLock()) {
+        foreach ($this->errors as $error) {
+            if ($error->isLock()) {
                 return true;
             }
         }

src/Transliteration.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
      * The converted string will be all lowercase.
      * @return Transliteration
      */
-    public function setLowercase(bool $lowercase=true) : Transliteration
+    public function setLowercase(bool $lowercase = true) : Transliteration
     {
         $this->setOption('lowercase', $lowercase);
 
@@ -97,8 +97,8 @@ 
 
         $result = implode('', $keep);
 
-        while (strstr($result, $space . $space)) {
-            $result = str_replace($space . $space, $space, $result);
+        while (strstr($result, $space.$space)) {
+            $result = str_replace($space.$space, $space, $result);
         }
 
         $result = trim($result, $space);

src/ConvertHelper/ByteConverter.php

Indentation +63 added lines, -63 removed lines

@@ -23,9 +23,9 @@ 
  */
 class ConvertHelper_ByteConverter
 {
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $bytes;
     
     public function __construct(int $bytes)
@@ -39,12 +39,12 @@ 
         }
     }
     
-   /**
-    * Detects the size matching the byte value for the specified base.
-    * 
-    * @param int $base
-    * @return ConvertHelper_StorageSizeEnum_Size
-    */
+    /**
+     * Detects the size matching the byte value for the specified base.
+     * 
+     * @param int $base
+     * @return ConvertHelper_StorageSizeEnum_Size
+     */
     protected function detectSize(int $base) : ConvertHelper_StorageSizeEnum_Size
     {
         $sizes = $this->getSizesSorted($base);   
@@ -70,13 +70,13 @@ 
         return ConvertHelper_StorageSizeEnum::getSizeByName('b');
     }
     
-   /**
-    * Retrieves all storage sizes for the specified base, 
-    * sorted from smallest byte size to highest.
-    * 
-    * @param int $base
-    * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
-    */
+    /**
+     * Retrieves all storage sizes for the specified base, 
+     * sorted from smallest byte size to highest.
+     * 
+     * @param int $base
+     * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
+     */
     protected function getSizesSorted(int $base)
     {
         $sizes = ConvertHelper_StorageSizeEnum::getSizesByBase($base);
@@ -89,16 +89,16 @@ 
         return $sizes;
     }
     
-   /**
-    * Converts the byte value to a human readable string, e.g. "5 KB", "140 MB".
-    * 
-    * @param int $precision The amount of decimals (rounded up)
-    * @param int $base The base to calculate bytes with.
-    * @return string
-    * 
-    * @see ConvertHelper_StorageSizeEnum::BASE_10
-    * @see ConvertHelper_StorageSizeEnum::BASE_2
-    */
+    /**
+     * Converts the byte value to a human readable string, e.g. "5 KB", "140 MB".
+     * 
+     * @param int $precision The amount of decimals (rounded up)
+     * @param int $base The base to calculate bytes with.
+     * @return string
+     * 
+     * @see ConvertHelper_StorageSizeEnum::BASE_10
+     * @see ConvertHelper_StorageSizeEnum::BASE_2
+     */
     public function toString(int $precision, int $base=ConvertHelper_StorageSizeEnum::BASE_10) : string
     {
         $size = $this->detectSize($base);
@@ -106,13 +106,13 @@ 
         return round($this->bytes / $size->getBytes(), $precision) . ' ' . $size->getSuffix();
     }
     
-   /**
-    * Converts the byte value to the amount of the corresponding units (KB, MB...).
-    * 
-    * @param int $precision The amount of decimals (rounded up)
-    * @param string $sizeName The lowercase storage size name (e.g. "kb", "kib")
-    * @return float
-    */
+    /**
+     * Converts the byte value to the amount of the corresponding units (KB, MB...).
+     * 
+     * @param int $precision The amount of decimals (rounded up)
+     * @param string $sizeName The lowercase storage size name (e.g. "kb", "kib")
+     * @return float
+     */
     public function toNumber(int $precision, string $sizeName) : float
     {
         $size = ConvertHelper_StorageSizeEnum::getSizeByName($sizeName);
@@ -120,56 +120,56 @@ 
         return round($this->bytes / $size->getBytes(), $precision);
     }
     
-   /**
-    * Converts the bytes to Kilobytes.
-    * 
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Kilobytes.
+     * 
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toKilobytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'kb');
     }
     
-   /**
-    * Converts the bytes to Megabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Megabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toMegabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'mb');
     }
 
-   /**
-    * Converts the bytes to Gigabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Gigabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toGigabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'gb');
     }
 
-   /**
-    * Converts the bytes to Terabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Terabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toTerabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'tb');
     }
     
-   /**
-    * Converts the bytes to Petabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Petabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toPetabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'pb');

Spacing +17 added lines, -17 removed lines

@@ -33,7 +33,7 @@ 
         $this->bytes = $bytes;
         
         // correct negative values
-        if($this->bytes < 0) 
+        if ($this->bytes < 0) 
         {
             $this->bytes = 0;
         }
@@ -49,19 +49,19 @@ 
     {
         $sizes = $this->getSizesSorted($base);   
 
-        if($this->bytes >= $sizes[0]->getBytes()) 
+        if ($this->bytes >= $sizes[0]->getBytes()) 
         {
             $total = count($sizes);
             
-            for($i=0; $i < $total; $i++)
+            for ($i = 0; $i < $total; $i++)
             {
                 $size = $sizes[$i];
                 
-                if(!isset($sizes[($i+1)])) {
+                if (!isset($sizes[($i + 1)])) {
                     return $size;
                 }
                 
-                if($this->bytes >= $size->getBytes() && $this->bytes < $sizes[($i+1)]->getBytes()) {
+                if ($this->bytes >= $size->getBytes() && $this->bytes < $sizes[($i + 1)]->getBytes()) {
                     return $size;
                 }
             }
@@ -99,11 +99,11 @@ 
     * @see ConvertHelper_StorageSizeEnum::BASE_10
     * @see ConvertHelper_StorageSizeEnum::BASE_2
     */
-    public function toString(int $precision, int $base=ConvertHelper_StorageSizeEnum::BASE_10) : string
+    public function toString(int $precision, int $base = ConvertHelper_StorageSizeEnum::BASE_10) : string
     {
         $size = $this->detectSize($base);
         
-        return round($this->bytes / $size->getBytes(), $precision) . ' ' . $size->getSuffix();
+        return round($this->bytes / $size->getBytes(), $precision).' '.$size->getSuffix();
     }
     
    /**
@@ -126,7 +126,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toKilobytes(int $precision=1) : float
+    public function toKilobytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'kb');
     }
@@ -137,7 +137,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toMegabytes(int $precision=1) : float
+    public function toMegabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'mb');
     }
@@ -148,7 +148,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toGigabytes(int $precision=1) : float
+    public function toGigabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'gb');
     }
@@ -159,7 +159,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toTerabytes(int $precision=1) : float
+    public function toTerabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'tb');
     }
@@ -170,7 +170,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toPetabytes(int $precision=1) : float
+    public function toPetabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'pb');
     }
@@ -181,7 +181,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toKibibytes(int $precision=1) : float
+    public function toKibibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'kib');
     }
@@ -192,7 +192,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toMebibytes(int $precision=1) : float
+    public function toMebibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'mib');
     }
@@ -203,7 +203,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toGibibytes(int $precision=1) : float
+    public function toGibibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'gib');
     }
@@ -214,7 +214,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toTebibytes(int $precision=1) : float
+    public function toTebibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'tib');
     }
@@ -225,7 +225,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toPebibytes(int $precision=1) : float
+    public function toPebibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'pib');
     }

src/ConvertHelper/StorageSizeEnum/Size.php

Indentation +18 added lines, -18 removed lines

@@ -25,34 +25,34 @@
  */
 class ConvertHelper_StorageSizeEnum_Size
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $name;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $base;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $exponent;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $singular;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $plural;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $suffix;
     
     public function __construct(string $name, int $base, int $exponent, string $suffix, string $singular, string $plural)

src/ConvertHelper/SizeNotation.php

Indentation +86 added lines, -86 removed lines

@@ -31,9 +31,9 @@ 
     
     const VALIDATION_ERROR_NEGATIVE_VALUE = 43803;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $sizeString;
 
     /**
@@ -41,41 +41,41 @@ 
      */
     protected $sizeDefinition;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $bytes = 0;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $valid = true;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $units = null;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $number = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $errorMessage = '';
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $errorCode = 0;
     
-   /**
-    * Create a new instance for the specified size string.
-    * 
-    * @param string $sizeString A size notation in the format "50 MB", or a number of bytes without units. Spaces are ignored, so "50MB" = "50 MB" = "  50   MB   ". Floating point values are accepted, both with dot and comma notation ("50.5" = "50,5"). To use Base 2 values, ose appropriate units, e.g. "50 MiB", "1.5 GiB". The units are case insensitive, so "50 MB" = "50 mb". 
-    */
+    /**
+     * Create a new instance for the specified size string.
+     * 
+     * @param string $sizeString A size notation in the format "50 MB", or a number of bytes without units. Spaces are ignored, so "50MB" = "50 MB" = "  50   MB   ". Floating point values are accepted, both with dot and comma notation ("50.5" = "50,5"). To use Base 2 values, ose appropriate units, e.g. "50 MiB", "1.5 GiB". The units are case insensitive, so "50 MB" = "50 mb". 
+     */
     public function __construct(string $sizeString)
     {
         $this->sizeString = $this->cleanString($sizeString);
@@ -83,31 +83,31 @@ 
         $this->convert();
     }
     
-   /**
-    * Gets the amount of bytes contained in the size notation.
-    * @return int
-    */
+    /**
+     * Gets the amount of bytes contained in the size notation.
+     * @return int
+     */
     public function toBytes() : int
     {
         return $this->bytes;
     }
     
-   /**
-    * Converts the size notation to a human readable string, e.g. "50 MB".
-    * 
-    * @param int $precision
-    * @return string
-    * @see ConvertHelper::bytes2readable()
-    */
+    /**
+     * Converts the size notation to a human readable string, e.g. "50 MB".
+     * 
+     * @param int $precision
+     * @return string
+     * @see ConvertHelper::bytes2readable()
+     */
     public function toString(int $precision=1) : string
     {
         return ConvertHelper::bytes2readable($this->bytes, $precision, $this->getBase());
     }
     
-   /**
-    * Retrieves the detected number's base.
-    * @return int The base number (1000 for Base 10, or 1024 for Base 2), or 0 if it is not valid.
-    */
+    /**
+     * Retrieves the detected number's base.
+     * @return int The base number (1000 for Base 10, or 1024 for Base 2), or 0 if it is not valid.
+     */
     public function getBase() : int
     {
         if($this->isValid()) {
@@ -117,13 +117,13 @@ 
         return 0;
     }
     
-   /**
-    * Retrieves the detected storage size instance, if 
-    * the size string is valid.
-    * 
-    * @return ConvertHelper_StorageSizeEnum_Size|NULL
-    * @see ConvertHelper_StorageSizeEnum_Size
-    */
+    /**
+     * Retrieves the detected storage size instance, if 
+     * the size string is valid.
+     * 
+     * @return ConvertHelper_StorageSizeEnum_Size|NULL
+     * @see ConvertHelper_StorageSizeEnum_Size
+     */
     public function getSizeDefinition() : ?ConvertHelper_StorageSizeEnum_Size
     {
         if($this->isValid()) {
@@ -133,27 +133,27 @@ 
         return null;
     }
     
-   /**
-    * Checks whether the size notation was valid and could be parsed
-    * into a meaningful byte value. If this returns `false`, it is 
-    * possible to use the `getErrorXXX` methods to retrieve information
-    * on what went wrong. 
-    * 
-    * @return bool
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
-    * @see ConvertHelper_SizeNotation::getErrorCode()
-    */
+    /**
+     * Checks whether the size notation was valid and could be parsed
+     * into a meaningful byte value. If this returns `false`, it is 
+     * possible to use the `getErrorXXX` methods to retrieve information
+     * on what went wrong. 
+     * 
+     * @return bool
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
+     * @see ConvertHelper_SizeNotation::getErrorCode()
+     */
     public function isValid() : bool
     {
         return $this->valid;
     }
     
-   /**
-    * Retrieves the error message if the size notation validation failed.
-    * 
-    * @return string
-    * @see ConvertHelper_SizeNotation::getErrorCode()
-    */
+    /**
+     * Retrieves the error message if the size notation validation failed.
+     * 
+     * @return string
+     * @see ConvertHelper_SizeNotation::getErrorCode()
+     */
     public function getErrorMessage() : string
     {
         return $this->errorMessage;
@@ -200,12 +200,12 @@ 
         );
     }
     
-   /**
-    * Detects the units and the number in the size notation string.
-    * Populates the `units` and `number` properties.
-    * 
-    * @return bool Whether the string could be parsed successfully.
-    */
+    /**
+     * Detects the units and the number in the size notation string.
+     * Populates the `units` and `number` properties.
+     * 
+     * @return bool Whether the string could be parsed successfully.
+     */
     protected function detectParts() : bool
     {
         $units = ConvertHelper_StorageSizeEnum::getSizeNames();
@@ -241,16 +241,16 @@ 
         return true;
     }
     
-   /**
-    * If the validation fails, this is used to store the reason for retrieval later.
-    *  
-    * @param string $message
-    * @param int $code
-    * 
-    * @see ConvertHelper_SizeNotation::isValid()
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
-    * @see ConvertHelper_SizeNotation::getErrorCode()
-    */
+    /**
+     * If the validation fails, this is used to store the reason for retrieval later.
+     *  
+     * @param string $message
+     * @param int $code
+     * 
+     * @see ConvertHelper_SizeNotation::isValid()
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
+     * @see ConvertHelper_SizeNotation::getErrorCode()
+     */
     protected function setError(string $message, int $code) : void
     {
         $this->valid = false;
@@ -258,12 +258,12 @@ 
         $this->errorCode = $code;
     }
     
-   /**
-    * Retrieves the error code, if the size notation validation failed.
-    * 
-    * @return int
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
-    */
+    /**
+     * Retrieves the error code, if the size notation validation failed.
+     * 
+     * @return int
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
+     */
     public function getErrorCode() : int
     {
         return $this->errorCode;

Spacing +11 added lines, -11 removed lines

@@ -99,7 +99,7 @@ 
     * @return string
     * @see ConvertHelper::bytes2readable()
     */
-    public function toString(int $precision=1) : string
+    public function toString(int $precision = 1) : string
     {
         return ConvertHelper::bytes2readable($this->bytes, $precision, $this->getBase());
     }
@@ -110,7 +110,7 @@ 
     */
     public function getBase() : int
     {
-        if($this->isValid()) {
+        if ($this->isValid()) {
             return $this->sizeDefinition->getBase(); 
         }
         
@@ -126,7 +126,7 @@ 
     */
     public function getSizeDefinition() : ?ConvertHelper_StorageSizeEnum_Size
     {
-        if($this->isValid()) {
+        if ($this->isValid()) {
             return $this->sizeDefinition;
         }
         
@@ -175,18 +175,18 @@ 
     
     protected function parseSize() : void
     {
-        if(!$this->detectParts()) {
+        if (!$this->detectParts()) {
             return;
         }
         
         // we detected units in the string: all good.
-        if($this->units !== null)
+        if ($this->units !== null)
         {
             return;
         }
         
         // just a numeric value: we assume this means we're dealing with bytes.
-        if(is_numeric($this->number)) 
+        if (is_numeric($this->number)) 
         {
             $this->units = 'b';
             return;
@@ -212,12 +212,12 @@ 
         
         $number = $this->sizeString;
         
-        foreach($units as $unit)
+        foreach ($units as $unit)
         {
-            if(stristr($number, $unit))
+            if (stristr($number, $unit))
             {
                 // there are more than 1 unit defined in the string
-                if($this->units !== null)
+                if ($this->units !== null)
                 {
                     $this->setError(
                         t(
@@ -273,14 +273,14 @@ 
     {
         $this->parseSize();
         
-        if(!$this->valid) {
+        if (!$this->valid) {
             return;
         }
         
         $int = intval($this->number);
         
         // negative values
-        if($int < 0) 
+        if ($int < 0) 
         {
             $this->setError(
                 t('Negative values cannot be used as size.'),