Mistralys / application-utils

src/Request/Param/Validator/Regex.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     
     protected function _validate()
     {
-        if(!is_scalar($this->value)) {
+        if (!is_scalar($this->value)) {
             return null;
         }
         
@@ -35,13 +35,13 @@ 
         // is a boolan, which is converted to an integer when
         // converted to string, which in turn can be validated
         // with a regex.
-        if(is_bool($this->value)) {
+        if (is_bool($this->value)) {
             return null;
         }
         
         $value = (string)$this->value;
         
-        if(preg_match($this->getStringOption('regex'), $value)) {
+        if (preg_match($this->getStringOption('regex'), $value)) {
             return $value;
         }
         

src/Request/Param/Validator/Enum.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     
     protected function _validate()
     {
-        if(in_array($this->value, $this->getArrayOption('values'))) {
+        if (in_array($this->value, $this->getArrayOption('values'))) {
             return $this->value;
         }
         

src/VariableInfo/Renderer/HTML.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             str_replace(' ', '-', $this->type)
         );
         
-        if($this->info->getBoolOption('prepend-type') && !$this->info->isNull())
+        if ($this->info->getBoolOption('prepend-type') && !$this->info->isNull())
         {
             $typeLabel = '<span style="color:#1c2eb1" class="variable-type">'.$this->info->getType().'</span> ';
             $converted = $typeLabel.' '.$converted;

src/VariableInfo/Renderer/String/Callable.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     {
         $string = '';
         
-        if(is_string($this->value[0])) 
+        if (is_string($this->value[0])) 
         {
             $string .= $this->value[0].'::';
         } 

src/XMLHelper/Converter/Decorator.php

Spacing +7 added lines, -7 removed lines

@@ -107,13 +107,13 @@ 
     
     protected function detectAttributes()
     {
-        if(!$this->options['@attributes']) {
+        if (!$this->options['@attributes']) {
             return;
         }
         
         $attributes = $this->subject->attributes();
         
-        if(!empty($attributes)) 
+        if (!empty($attributes)) 
         {
             $this->result['@attributes'] = array_map('strval', iterator_to_array($attributes));
         }
@@ -124,7 +124,7 @@ 
         $children = $this->subject;
         $depth = $this->options['depth'] - 1;
         
-        if($depth <= 0) 
+        if ($depth <= 0) 
         {
             $children = [];
         }
@@ -137,9 +137,9 @@ 
             
             $decorator->options = ['depth' => $depth] + $this->options;
             
-            if(isset($this->result[$name])) 
+            if (isset($this->result[$name])) 
             {
-                if(!is_array($this->result[$name])) 
+                if (!is_array($this->result[$name])) 
                 {
                     $this->result[$name] = [$this->result[$name]];
                 }
@@ -158,9 +158,9 @@ 
         // json encode non-whitespace element simplexml text values.
         $text = trim((string)$this->subject);
         
-        if(strlen($text)) 
+        if (strlen($text)) 
         {
-            if($this->options['@text']) 
+            if ($this->options['@text']) 
             {
                 $this->result['@text'] = $text;
             } 

src/FileHelper/FileFinder.php

Spacing +17 added lines, -17 removed lines

@@ -7,7 +7,7 @@ 
  * @see FileHelper_FileFinder
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppUtils;
 
@@ -55,7 +55,7 @@ 
     {
         $real = realpath($path);
         
-        if($real === false) 
+        if ($real === false) 
         {
             throw new FileHelper_Exception(
                 'Target path does not exist',
@@ -290,22 +290,22 @@ 
         return $this->getAll();
     }
     
-    protected function find(string $path, bool $isRoot=false) : void
+    protected function find(string $path, bool $isRoot = false) : void
     {
-        if($isRoot) {
+        if ($isRoot) {
             $this->found = array();
         }
         
         $recursive = $this->getBoolOption('recursive');
         
         $d = new \DirectoryIterator($path);
-        foreach($d as $item)
+        foreach ($d as $item)
         {
             $pathname = $item->getPathname();
             
-            if($item->isDir())
+            if ($item->isDir())
             {
-                if($recursive && !$item->isDot()) {
+                if ($recursive && !$item->isDot()) {
                     $this->find($pathname);
                 }
                 
@@ -314,7 +314,7 @@ 
             
             $file = $this->filterFile($pathname);
             
-            if($file !== null) 
+            if ($file !== null) 
             {
                 $this->found[] = $file;
             }
@@ -327,23 +327,23 @@ 
         
         $extension = FileHelper::getExtension($path);
         
-        if(!$this->filterExclusion($extension)) {
+        if (!$this->filterExclusion($extension)) {
             return null;
         }
         
         $path = $this->filterPath($path);
         
-        if($this->getOption('strip-extensions') === true)
+        if ($this->getOption('strip-extensions') === true)
         {
             $path = str_replace('.'.$extension, '', $path);
         }
         
-        if($path === '') {
+        if ($path === '') {
             return null;
         }
         
         $replace = $this->getOption('slash-replacement');
-        if(!empty($replace)) {
+        if (!empty($replace)) {
             $path = str_replace('/', $replace, $path);
         }
         
@@ -362,15 +362,15 @@ 
         $include = $this->getOption('include-extensions');
         $exclude = $this->getOption('exclude-extensions');
         
-        if(!empty($include))
+        if (!empty($include))
         {
-            if(!in_array($extension, $include)) {
+            if (!in_array($extension, $include)) {
                 return false;
             }
         }
-        else if(!empty($exclude))
+        else if (!empty($exclude))
         {
-            if(in_array($extension, $exclude)) {
+            if (in_array($extension, $exclude)) {
                 return false;
             }
         }
@@ -386,7 +386,7 @@ 
     */
     protected function filterPath(string $path) : string
     {
-        switch($this->getStringOption('pathmode'))
+        switch ($this->getStringOption('pathmode'))
         {
             case self::PATH_MODE_STRIP:
                 return basename($path);

src/Request/URLComparer.php

Spacing +12 added lines, -12 removed lines

@@ -79,7 +79,7 @@ 
     
     public function addLimitParam(string $name) : Request_URLComparer
     {
-        if(!in_array($name, $this->limitParams)) {
+        if (!in_array($name, $this->limitParams)) {
             $this->limitParams[] = $name;
         }
         
@@ -88,14 +88,14 @@ 
     
     public function addLimitParams(array $names) : Request_URLComparer
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->addLimitParam($name);
         }
         
         return $this;
     }
     
-    public function setIgnoreFragment(bool $ignore=true) : Request_URLComparer
+    public function setIgnoreFragment(bool $ignore = true) : Request_URLComparer
     {
         $this->ignoreFragment = $ignore;
         return $this;
@@ -121,13 +121,13 @@ 
             'query' 
         );
         
-        if(!$this->ignoreFragment) {
+        if (!$this->ignoreFragment) {
             $keys[] = 'fragment';
         }
         
-        foreach($keys as $key)
+        foreach ($keys as $key)
         {
-            if(!$this->compareKey($key)) {
+            if (!$this->compareKey($key)) {
                 return false;
             }
         }
@@ -142,7 +142,7 @@ 
         
         $filter = 'filter_'.$key;
         
-        if(method_exists($this, $filter)) 
+        if (method_exists($this, $filter)) 
         {
             $sVal = $this->$filter($sVal);
             $tVal = $this->$filter($tVal);
@@ -154,7 +154,7 @@ 
     protected function filter_path(string $path) : string
     {
         // fix double slashes in URLs
-        while(stristr($path, '//')) {
+        while (stristr($path, '//')) {
             $path = str_replace('//', '/', $path);
         }
         
@@ -163,7 +163,7 @@ 
     
     protected function filter_query(string $query) : string
     {
-        if(empty($query)) {
+        if (empty($query)) {
             return '';
         }
         
@@ -178,15 +178,15 @@ 
     
     protected function limitParams(array $params) : array
     {
-        if(empty($this->limitParams)) {
+        if (empty($this->limitParams)) {
             return $params;
         }
         
         $keep = array();
         
-        foreach($this->limitParams as $name)
+        foreach ($this->limitParams as $name)
         {
-            if(isset($params[$name])) {
+            if (isset($params[$name])) {
                 $keep[$name] = $params[$name];
             }
         }

src/ConvertHelper/ThrowableInfo.php

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
     
     protected function __construct($subject)
     {
-        if(is_array($subject))
+        if (is_array($subject))
         {
             $this->parseSerialized($subject);
         }
@@ -115,7 +115,7 @@ 
     */
     public function getPrevious() : ConvertHelper_ThrowableInfo
     {
-        if(isset($this->previous)) {
+        if (isset($this->previous)) {
             return $this->previous;
         }
         
@@ -140,18 +140,18 @@ 
         
         $string = 'Exception';
         
-        if($this->hasCode()) {
+        if ($this->hasCode()) {
             $string .= ' #'.$this->code;
         }
         
         $string .= ': '.$this->getMessage().PHP_EOL;
         
-        foreach($calls as $call) 
+        foreach ($calls as $call) 
         {
             $string .= $call->toString().PHP_EOL;
         }
         
-        if($this->hasPrevious())
+        if ($this->hasPrevious())
         {
             $string .= PHP_EOL.PHP_EOL.
             'Previous error:'.PHP_EOL.PHP_EOL.
@@ -242,11 +242,11 @@ 
             'previous' => null,
         );
         
-        if($this->hasPrevious()) {
-            $result['previous'] =  $this->previous->serialize();
+        if ($this->hasPrevious()) {
+            $result['previous'] = $this->previous->serialize();
         }
         
-        foreach($this->calls as $call)
+        foreach ($this->calls as $call)
         {
             $result['calls'][] = $call->serialize(); 
         }
@@ -275,7 +275,7 @@ 
     public function getFolderDepth() : int
     {
         $depth = $this->getOption('folder-depth');
-        if(!empty($depth)) {
+        if (!empty($depth)) {
             return $depth;
         }
         
@@ -311,12 +311,12 @@ 
         
         $this->setOptions($serialized['options']);
         
-        if(!empty($serialized['previous']))
+        if (!empty($serialized['previous']))
         {
             $this->previous = ConvertHelper_ThrowableInfo::fromSerialized($serialized['previous']);
         }
         
-        foreach($serialized['calls'] as $def)
+        foreach ($serialized['calls'] as $def)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromSerialized($this, $def);
         }
@@ -328,16 +328,16 @@ 
         $this->message = $e->getMessage();
         $this->code = intval($e->getCode());
         
-        if(!isset($_REQUEST['REQUEST_URI'])) {
+        if (!isset($_REQUEST['REQUEST_URI'])) {
             $this->context = self::CONTEXT_COMMAND_LINE;
         }
         
         $previous = $e->getPrevious();
-        if(!empty($previous)) {
+        if (!empty($previous)) {
             $this->previous = ConvertHelper::throwable2info($previous);
         }
         
-        if(isset($_SERVER['REQUEST_URI'])) {
+        if (isset($_SERVER['REQUEST_URI'])) {
             $this->referer = $_SERVER['REQUEST_URI'];
         }
         
@@ -351,7 +351,7 @@ 
         
         $idx = 1;
         
-        foreach($trace as $entry)
+        foreach ($trace as $entry)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromTrace($this, $idx, $entry);
             

src/ImageHelper.php

Spacing +97 added lines, -97 removed lines

@@ -136,10 +136,10 @@ 
         'gif'
     );
     
-    public function __construct($sourceFile=null, $resource=null, $type=null)
+    public function __construct($sourceFile = null, $resource = null, $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.',
@@ -148,7 +148,7 @@ 
             );
         }
         
-        if(is_resource($resource)) 
+        if (is_resource($resource)) 
         {
             $this->sourceImage = $resource;
             $this->type = $type;
@@ -172,21 +172,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
                     );
                 }
@@ -198,7 +198,7 @@ 
         $this->width = $this->info->getWidth();
         $this->height = $this->info->getHeight();
 
-        if(!$this->isVector()) {
+        if (!$this->isVector()) {
             $this->setNewImage($this->duplicateImage($this->sourceImage));
         }
     }
@@ -214,10 +214,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');
         }
         
@@ -240,7 +240,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);
         
@@ -272,7 +272,7 @@ 
     */
     public static function setConfig($name, $value)
     {
-        if(isset(self::$config[$name])) {
+        if (isset(self::$config[$name])) {
             self::$config[$name] = $value;
         }
     }
@@ -283,7 +283,7 @@ 
     * 
     * @param bool $enabled
     */
-    public static function setAutoMemoryAdjustment($enabled=true)
+    public static function setAutoMemoryAdjustment($enabled = true)
     {
         self::setConfig('auto-memory-adjustment', $enabled);
     }
@@ -317,7 +317,7 @@ 
 
     public function enableAlpha()
     {
-        if(!$this->alpha) 
+        if (!$this->alpha) 
         {
             self::addAlphaSupport($this->newImage, false);
             $this->alpha = true;
@@ -348,9 +348,9 @@ 
      * @param number $percent
      * @return ImageHelper
      */
-    public function sharpen($percent=0)
+    public function sharpen($percent = 0)
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -359,9 +359,9 @@ 
         return $this->convolute($factor);
     }
     
-    public function blur($percent=0)
+    public function blur($percent = 0)
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -374,12 +374,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;
         }
         
@@ -392,24 +392,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;
     }
@@ -535,7 +535,7 @@ 
     */
     public function resample(?int $width = null, ?int $height = null) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
         
@@ -556,7 +556,7 @@ 
 
     public function resampleAndCrop($width, $height) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
@@ -603,14 +603,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);
         }
     }
@@ -620,13 +620,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.',
@@ -638,7 +638,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',
@@ -659,7 +659,7 @@ 
             );
         }
 
-        if($dispose) {
+        if ($dispose) {
             $this->dispose();
         }
         
@@ -668,11 +668,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);
         }
     }
@@ -725,7 +725,7 @@ 
     */
     protected function adjustMemory() : bool
     {
-        if(!self::$config['auto-memory-adjustment']) {
+        if (!self::$config['auto-memory-adjustment']) {
             return true;
         }
         
@@ -754,7 +754,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;
         }
@@ -785,16 +785,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();
 
@@ -858,11 +858,11 @@ 
     * @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 
     */
-    public static function displayImageStream($resource, $imageType, $quality=-1)
+    public static function displayImageStream($resource, $imageType, $quality = -1)
     {
         $imageType = strtolower($imageType);
         
-        if(!in_array($imageType, self::$streamTypes)) 
+        if (!in_array($imageType, self::$streamTypes)) 
         {
             throw new ImageHelper_Exception(
                 'Invalid image stream type',
@@ -874,9 +874,9 @@ 
             );
         }
         
-        header('Content-type:image/' . $imageType);
+        header('Content-type:image/'.$imageType);
 
-        $function = 'image' . $imageType;
+        $function = 'image'.$imageType;
         
         $function($resource, null, $quality);
     }
@@ -892,7 +892,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
             );
         }
@@ -909,16 +909,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);
     }
@@ -936,7 +936,7 @@ 
     * 
     * @param array $color A color definition, as an associative array with red, green, and blue keys. If not specified, the color at pixel position 0,0 will be used.
     */
-    public function trim($color=null)
+    public function trim($color = null)
     {
         return $this->trimImage($this->newImage, $color);
     }
@@ -953,7 +953,7 @@ 
         $color = imagecolorsforindex($img, $colorIndex);
         
         // it seems imagecolorsforindex may return false (undocumented, unproven)
-        if(is_array($color)) {
+        if (is_array($color)) {
             return $color;
         }
         
@@ -973,15 +973,15 @@ 
     * @param array $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
     */
-    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);
@@ -998,16 +998,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; }
@@ -1015,7 +1015,7 @@ 
                     
                     $ymax = $iy;
                     
-                    if($first)
+                    if ($first)
                     { 
                         $ix = $xmax; 
                         $first = false; 
@@ -1025,18 +1025,18 @@ 
         }
         
         // no trimming border found
-        if($ymax === null && $ymax === null) {
+        if ($ymax === null && $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);
@@ -1072,7 +1072,7 @@ 
         
         $this->newImage = $image;
         $this->newWidth = imagesx($image);
-        $this->newHeight= imagesy($image);
+        $this->newHeight = imagesy($image);
     }
     
    /**
@@ -1083,7 +1083,7 @@ 
     */
     protected static function requireResource($subject)
     {
-        if(is_resource($subject)) {
+        if (is_resource($subject)) {
             return;
         }
         
@@ -1109,7 +1109,7 @@ 
     {
         $img = imagecreatetruecolor($width, $height);
         
-        if($img === false) 
+        if ($img === false) 
         {
             throw new ImageHelper_Exception(
                 'Error creating new image',
@@ -1133,8 +1133,8 @@ 
 	protected function colorsMatch($a, $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;
 			}
 		} 
@@ -1142,7 +1142,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);
@@ -1162,11 +1162,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;
@@ -1180,7 +1180,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);
         
@@ -1199,11 +1199,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();
         }
         
@@ -1248,10 +1248,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;
             }
         }
@@ -1263,7 +1263,7 @@ 
         $diffLast = $last['width'] - $matchWidth;
         $diffPrev = $matchWidth - $prev['width'];
     
-        if($diffLast <= $diffPrev) {
+        if ($diffLast <= $diffPrev) {
             return $last;
         }
     
@@ -1291,14 +1291,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;
         }
         
@@ -1333,7 +1333,7 @@ 
 	 */
 	public static function getImageSize($pathOrResource) : ImageHelper_Size
 	{
-	    if(is_resource($pathOrResource)) 
+	    if (is_resource($pathOrResource)) 
 	    {
 	        return new ImageHelper_Size(array(
 	            'width' => imagesx($pathOrResource),
@@ -1347,7 +1347,7 @@ 
 	    
 	    $info = false;
 	    $method = 'getImageSize_'.$type;
-	    if(method_exists(__CLASS__, $method)) 
+	    if (method_exists(__CLASS__, $method)) 
 	    {
 	        $info = call_user_func(array(__CLASS__, $method), $pathOrResource);
 	    } 
@@ -1356,7 +1356,7 @@ 
 	        $info = getimagesize($pathOrResource);
 	    }
 	    
-	    if($info !== false) {
+	    if ($info !== false) {
 	        return new ImageHelper_Size($info);
 	    }
 	    
@@ -1382,7 +1382,7 @@ 
 	    $xml = XMLHelper::createSimplexml();
 	    $xml->loadFile($imagePath);
 	    
-	    if($xml->hasErrors()) {
+	    if ($xml->hasErrors()) {
 	        throw new ImageHelper_Exception(
 	            'Error opening SVG image',
 	            sprintf(
@@ -1397,7 +1397,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(
@@ -1414,7 +1414,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',
@@ -1460,7 +1460,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);
         
@@ -1497,7 +1497,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);
@@ -1516,7 +1516,7 @@ 
     public function calcAverageColorRGB() : array
     {
        $result = $this->calcAverageColor(self::COLORFORMAT_RGB);
-       if(is_array($result)) {
+       if (is_array($result)) {
            return $result;
        }
        
@@ -1537,7 +1537,7 @@ 
     public function calcAverageColorHex() : string
     {
         $result = $this->calcAverageColor(self::COLORFORMAT_HEX);
-        if(is_string($result)) {
+        if (is_string($result)) {
             return $result;
         }
         
@@ -1574,9 +1574,9 @@ 
     * @see ImageHelper::COLORFORMAT_RGB
     * @see ImageHelper::COLORFORMAT_HEX
     */
-    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',
@@ -1594,7 +1594,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);
         }
 
@@ -1609,7 +1609,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);
     }
     
    /**