Mistralys / application-utils

src/PHP8Shims/CurlHandleShim.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-if(!class_exists('CurlHandle'))
+if (!class_exists('CurlHandle'))
 {
     /**
      * Shim to support PHPStan analysis on PHP7, while

src/PHP8Shims/GDImageShim.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-if(!class_exists('GdImage'))
+if (!class_exists('GdImage'))
 {
     /**
      * Shim to support PHPStan analysis on PHP7, while

src/FileHelper/PathInfoInterface.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 interface PathInfoInterface extends Interface_Stringable
 {
     public function getName() : string;
-    public function getExtension(bool $lowercase=true) : string;
+    public function getExtension(bool $lowercase = true) : string;
     public function getPath() : string;
     public function getFolderPath() : string;
     public function exists() : bool;

src/FileHelper/FileDownloader.php

Spacing +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function setTimeout(int $timeout) : FileDownloader
     {
-        if($timeout > 0)
+        if ($timeout > 0)
         {
             $this->timeout = $timeout;
         }
@@ -53,7 +53,7 @@ 
      * @param bool $enabled
      * @return FileDownloader
      */
-    public function setSSLEnabled(bool $enabled=true) : FileDownloader
+    public function setSSLEnabled(bool $enabled = true) : FileDownloader
     {
         $this->SSLEnabled = $enabled;
         return $this;
@@ -74,7 +74,7 @@ 
 
         $output = curl_exec($ch);
 
-        if($output === false)
+        if ($output === false)
         {
             throw new FileHelper_Exception(
                 'Unable to open URL',
@@ -89,7 +89,7 @@ 
 
         curl_close($ch);
 
-        if(is_string($output))
+        if (is_string($output))
         {
             return $output;
         }
@@ -117,7 +117,7 @@ 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
 
-        if(!$this->SSLEnabled)
+        if (!$this->SSLEnabled)
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

src/StyleCollection/StyleBuilder/ColorContainer.php

Spacing +4 added lines, -4 removed lines

@@ -11,17 +11,17 @@ 
 
 abstract class ColorContainer extends StyleContainer
 {
-    public function rgbaValues(int $red, int $green, int $blue, float $alpha=0) : StyleBuilder
+    public function rgbaValues(int $red, int $green, int $blue, float $alpha = 0) : StyleBuilder
     {
         return $this->rgba(ColorFactory::createCSS($red, $green, $blue, $alpha));
     }
 
-    public function rgba(RGBAColor $color, bool $important=false) : StyleBuilder
+    public function rgba(RGBAColor $color, bool $important = false) : StyleBuilder
     {
         return $this->setStyle($color->toCSS(), $important);
     }
 
-    public function hex(RGBAColor $color, bool $important=false) : StyleBuilder
+    public function hex(RGBAColor $color, bool $important = false) : StyleBuilder
     {
         return $this->setStyle('#'.$color->toHEX(), $important);
     }
@@ -34,7 +34,7 @@ 
      * @return StyleBuilder
      * @throws ColorException
      */
-    public function hexString(string $hex, bool $important=false) : StyleBuilder
+    public function hexString(string $hex, bool $important = false) : StyleBuilder
     {
         return $this->hex(ColorFactory::createFromHEX($hex), $important);
     }

src/ImageHelper.php

Indentation +213 added lines, -213 removed lines

@@ -73,13 +73,13 @@ 
     protected array $colors = array();
 
     /**
-    * @var resource|NULL
-    */
+     * @var resource|NULL
+     */
     protected $newImage;
 
-   /**
-    * @var resource
-    */
+    /**
+     * @var resource
+     */
     protected $sourceImage;
 
     /**
@@ -188,17 +188,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(int $width, int $height, string $type='png') : self
     {
         $img = imagecreatetruecolor($width, $height);
@@ -249,17 +249,17 @@ 
         return new ImageHelper($file, null, self::getFileImageType($file));
     }
     
-   /**
-    * Sets a global image helper configuration value. Available
-    * configuration settings are:
-    * 
-    * <ul>
-    * <li><code>auto-memory-adjustment</code> <i>boolean</i> Whether to try and adjust the memory limit automatically so there will be enough to load/process the target image.</li>
-    * </ul>
-    * 
-    * @param string $name
-    * @param mixed|NULL $value
-    */
+    /**
+     * Sets a global image helper configuration value. Available
+     * configuration settings are:
+     * 
+     * <ul>
+     * <li><code>auto-memory-adjustment</code> <i>boolean</i> Whether to try and adjust the memory limit automatically so there will be enough to load/process the target image.</li>
+     * </ul>
+     * 
+     * @param string $name
+     * @param mixed|NULL $value
+     */
     public static function setConfig(string $name, $value) : void
     {
         if(isset(self::$config[$name])) {
@@ -267,13 +267,13 @@ 
         }
     }
 
-   /**
-    * Shorthand for setting the automatic memory adjustment
-    * global configuration setting.
-    *
-    * @param bool $enabled
-    * @return void
-    */
+    /**
+     * Shorthand for setting the automatic memory adjustment
+     * global configuration setting.
+     *
+     * @param bool $enabled
+     * @return void
+     */
     public static function setAutoMemoryAdjustment(bool $enabled=true) : void
     {
         self::setConfig('auto-memory-adjustment', $enabled);
@@ -747,12 +747,12 @@ 
         return $this;
     }
 
-   /**
-    * 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']) {
@@ -805,15 +805,15 @@ 
         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()) {
@@ -885,17 +885,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);
@@ -979,11 +979,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
     {
         self::displayImageStream(
@@ -1097,14 +1097,14 @@ 
         return $this;
     }
     
-   /**
-    * Requires the subject to be a resource.
-    * 
-    * @param resource|GdImage|mixed $subject
-    *
-    * @throws ImageHelper_Exception
-    * @see ImageHelper::ERROR_NOT_A_RESOURCE
-    */
+    /**
+     * Requires the subject to be a resource.
+     * 
+     * @param resource|GdImage|mixed $subject
+     *
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_NOT_A_RESOURCE
+     */
     public static function requireResource($subject) : void
     {
         if(is_resource($subject) && imagesx($subject)) {
@@ -1125,14 +1125,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
+     */
     public function createNewImage(int $width, int $height)
     {
         $img = imagecreatetruecolor($width, $height);
@@ -1156,38 +1156,38 @@ 
      * @param int $y
      * @return $this
      */
-	public function fillWhite(int $x=0, int $y=0) : self
-	{
-	    $this->addRGBColor('white', 255, 255, 255);
+    public function fillWhite(int $x=0, int $y=0) : self
+    {
+        $this->addRGBColor('white', 255, 255, 255);
         return $this->fill('white', $x, $y);
-	}
+    }
 
     /**
      * @return $this
      * @throws ImageHelper_Exception
      */
-	public function fillTransparent() : self
-	{
+    public function fillTransparent() : self
+    {
         $this->enableAlpha();
 	    
-	    self::fillImageTransparent($this->newImage);
+        self::fillImageTransparent($this->newImage);
 	    
-	    return $this;
-	}
+        return $this;
+    }
 
     /**
      * @param resource $resource
      * @return void
      * @throws ImageHelper_Exception
      */
-	public static function fillImageTransparent($resource) : void
-	{
-	    self::requireResource($resource);
+    public static function fillImageTransparent($resource) : void
+    {
+        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);
+    }
 
     /**
      * @param string $colorName
@@ -1195,11 +1195,11 @@ 
      * @param int $y
      * @return $this
      */
-	public function fill(string $colorName, int $x=0, int $y=0) : self
-	{
-	    imagefill($this->newImage, $x, $y, $this->colors[$colorName]);
-	    return $this;
-	}
+    public function fill(string $colorName, int $x=0, int $y=0) : self
+    {
+        imagefill($this->newImage, $x, $y, $this->colors[$colorName]);
+        return $this;
+    }
 
     /**
      * @param string $name
@@ -1243,9 +1243,9 @@ 
         return $this;
     }
     
-   /**
-    * @return resource
-    */
+    /**
+     * @return resource
+     */
     public function getImage()
     {
         return $this->newImage;
@@ -1293,17 +1293,17 @@ 
      *
      * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
      */
-	public function getSize() : ImageHelper_Size
+    public function getSize() : ImageHelper_Size
     {
-	    return self::getImageSize($this->newImage);
+        return self::getImageSize($this->newImage);
     }
     
-   /**
-    * Sets the TTF font file to use for text operations.
-    * 
-    * @param string $filePath
-    * @return $this
-    */
+    /**
+     * Sets the TTF font file to use for text operations.
+     * 
+     * @param string $filePath
+     * @return $this
+     */
     public function setFontTTF(string $filePath) : self
     {
         $this->TTFFile = $filePath;
@@ -1381,7 +1381,7 @@ 
             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    
@@ -1404,37 +1404,37 @@ 
      * @see ImageHelper::ERROR_SVG_SOURCE_VIEWBOX_MISSING
      * @see ImageHelper::ERROR_SVG_VIEWBOX_INVALID
      */
-	public static function getImageSize($pathOrResource) : ImageHelper_Size
-	{
-	    if(is_resource($pathOrResource) || $pathOrResource instanceof GdImage)
-	    {
-	        return new ImageHelper_Size(array(
-	            'width' => imagesx($pathOrResource),
-	            'height' => imagesy($pathOrResource),
-	            'channels' => 1,
-	            'bits' => 8
-	        ));
-	    }
+    public static function getImageSize($pathOrResource) : ImageHelper_Size
+    {
+        if(is_resource($pathOrResource) || $pathOrResource instanceof GdImage)
+        {
+            return new ImageHelper_Size(array(
+                'width' => imagesx($pathOrResource),
+                'height' => imagesy($pathOrResource),
+                'channels' => 1,
+                'bits' => 8
+            ));
+        }
 
-	    $type = self::getFileImageType($pathOrResource);
+        $type = self::getFileImageType($pathOrResource);
 
         $sizeMethods = array(
             'svg' => array(self::class, 'getImageSize_svg')
         );
 
-	    if(isset($sizeMethods[$type]))
-	    {
-	        return ClassHelper::requireObjectInstanceOf(
+        if(isset($sizeMethods[$type]))
+        {
+            return ClassHelper::requireObjectInstanceOf(
                 ImageHelper_Size::class,
                 $sizeMethods[$type]($pathOrResource)
             );
-	    }
+        }
 
-	    $info = getimagesize($pathOrResource);
+        $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',
@@ -1444,7 +1444,7 @@ 
             ),
             self::ERROR_CANNOT_GET_IMAGE_SIZE
         );
-	}
+    }
 
     /**
      * @param string $imagePath
@@ -1454,78 +1454,78 @@ 
      * @throws XMLHelper_Exception
      * @throws JsonException
      */
-	protected static function getImageSize_svg(string $imagePath) : ImageHelper_Size
-	{
-	    $xml = XMLHelper::createSimplexml();
-	    $xml->loadFile($imagePath);
+    protected static function getImageSize_svg(string $imagePath) : ImageHelper_Size
+    {
+        $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']['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']['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 = (float)$size[2];
-	    $boxHeight = (float)$size[3];
+        $boxWidth = (float)$size[2];
+        $boxHeight = (float)$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 height 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
         //
-	    $xUnits = $svgWidth / $boxWidth;
-	    $yUnits = $svgHeight / $boxHeight;
+        // The viewbox combined with the width and height 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;
 	    
-	    $pxWidth = $xUnits * $svgWidth;
-	    $pxHeight = $yUnits * $svgHeight;
+        $pxWidth = $xUnits * $svgWidth;
+        $pxHeight = $yUnits * $svgHeight;
 	    
-	    return new ImageHelper_Size(array(
+        return new ImageHelper_Size(array(
             (int)$pxWidth,
             (int)$pxHeight,
-	        'bits' => 8
-	    ));
-	}
+            'bits' => 8
+        ));
+    }
 
     /**
      * Crops the image to the specified width and height, optionally
@@ -1584,26 +1584,26 @@ 
         return $image->getColorAt(0, 0);
     }
     
-   /**
-    * Calculates the image's average color value, and
-    * returns an associative array with red, green,
-    * blue and alpha keys.
-    * 
-    * @throws ImageHelper_Exception
-    * @return RGBAColor
-    */
+    /**
+     * Calculates the image's average color value, and
+     * returns an associative array with red, green,
+     * blue and alpha keys.
+     * 
+     * @throws ImageHelper_Exception
+     * @return RGBAColor
+     */
     public function calcAverageColorRGB() : RGBAColor
     {
-       return $this->calcAverageColor();
+        return $this->calcAverageColor();
     }
     
-   /**
-    * 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
     {
         return $this->calcAverageColor()->toHEX();
@@ -1653,15 +1653,15 @@ 
         return $this->calcAverageColorRGB()->getBrightness();
     }
     
-   /**
-    * Retrieves a 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 a 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 +83 added lines, -83 removed lines

@@ -120,10 +120,10 @@ 
      *
      * @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.',
@@ -132,7 +132,7 @@ 
             );
         }
         
-        if(is_resource($resource) || $resource instanceof GdImage)
+        if (is_resource($resource) || $resource instanceof GdImage)
         {
             $this->sourceImage = $resource;
             $this->type = $type;
@@ -156,7 +156,7 @@ 
             if ($type === null) {
                 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
                 );
             }
@@ -164,14 +164,14 @@ 
             $this->type = $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
                     );
                 }
@@ -183,7 +183,7 @@ 
         $this->width = $this->info->getWidth();
         $this->height = $this->info->getHeight();
 
-        if(!$this->isVector()) {
+        if (!$this->isVector()) {
             $this->setNewImage($this->duplicateImage($this->sourceImage));
         }
     }
@@ -199,10 +199,10 @@ 
     *
     * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_OBJECT
     */
-    public static function createNew(int $width, int $height, string $type='png') : self
+    public static function createNew(int $width, int $height, string $type = 'png') : self
     {
         $img = imagecreatetruecolor($width, $height);
-        if($img !== false) {
+        if ($img !== false) {
             return self::createFromResource($img, $type);
         }
         
@@ -226,7 +226,7 @@ 
      * @return ImageHelper
      * @throws ImageHelper_Exception
      */
-    public static function createFromResource($resource, ?string $type=null) : ImageHelper
+    public static function createFromResource($resource, ?string $type = null) : ImageHelper
     {
         self::requireResource($resource);
         
@@ -262,7 +262,7 @@ 
     */
     public static function setConfig(string $name, $value) : void
     {
-        if(isset(self::$config[$name])) {
+        if (isset(self::$config[$name])) {
             self::$config[$name] = $value;
         }
     }
@@ -274,7 +274,7 @@ 
     * @param bool $enabled
     * @return void
     */
-    public static function setAutoMemoryAdjustment(bool $enabled=true) : void
+    public static function setAutoMemoryAdjustment(bool $enabled = true) : void
     {
         self::setConfig('auto-memory-adjustment', $enabled);
     }
@@ -314,7 +314,7 @@ 
      */
     public function enableAlpha() : self
     {
-        if(!$this->alpha) 
+        if (!$this->alpha) 
         {
             self::addAlphaSupport($this->newImage, false);
             $this->alpha = true;
@@ -354,9 +354,9 @@ 
      * @param int|float $percent
      * @return $this
      */
-    public function sharpen($percent=0) : self
+    public function sharpen($percent = 0) : self
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -369,9 +369,9 @@ 
      * @param int|float $percent
      * @return $this
      */
-    public function blur($percent=0) : self
+    public function blur($percent = 0) : self
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -388,12 +388,12 @@ 
     {
         // get a value that's equal to 64 - abs( factor )
         // ( using min/max to limit 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;
         }
         
@@ -406,24 +406,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;
     }
@@ -552,7 +552,7 @@ 
      */
     public function resample(?int $width = null, ?int $height = null) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
         
@@ -573,7 +573,7 @@ 
 
     public function resampleAndCrop(int $width, int $height) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
@@ -619,14 +619,14 @@ 
      * @param bool $fill Whether to fill the whole canvas with the transparency
      * @throws ImageHelper_Exception
      */
-    public static function addAlphaSupport($canvas, bool $fill=true) : void
+    public static function addAlphaSupport($canvas, bool $fill = true) : void
     {
         self::requireResource($canvas);
         
-        imagealphablending($canvas,true);
+        imagealphablending($canvas, true);
         imagesavealpha($canvas, true);
 
-        if($fill) {
+        if ($fill) {
             self::fillImageTransparent($canvas);
         }
     }
@@ -642,13 +642,13 @@ 
      * @return $this
      * @throws ImageHelper_Exception
      */
-    public function save(string $targetFile, bool $dispose=true) : self
+    public function save(string $targetFile, bool $dispose = true) : self
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
         
-        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.',
@@ -660,7 +660,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',
@@ -681,7 +681,7 @@ 
             );
         }
 
-        if($dispose) {
+        if ($dispose) {
             $this->dispose();
         }
         
@@ -693,11 +693,11 @@ 
      */
     public function dispose() : self
     {
-        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);
         }
 
@@ -755,7 +755,7 @@ 
     */
     protected function adjustMemory() : bool
     {
-        if(!self::$config['auto-memory-adjustment']) {
+        if (!self::$config['auto-memory-adjustment']) {
             return true;
         }
         
@@ -784,7 +784,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;
         }
@@ -816,16 +816,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();
 
@@ -856,7 +856,7 @@ 
      */
     public static function getFileImageType($pathOrResource) : ?string
     {
-        if(!is_string($pathOrResource)) {
+        if (!is_string($pathOrResource)) {
             return 'png';
         }
 
@@ -896,15 +896,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);
     }
@@ -921,7 +921,7 @@ 
     {
         $imageType = strtolower($imageType);
 
-        if(in_array($imageType, self::$streamTypes))
+        if (in_array($imageType, self::$streamTypes))
         {
             return $imageType;
         }
@@ -948,7 +948,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
             );
         }
@@ -965,16 +965,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);
     }
@@ -1005,7 +1005,7 @@ 
      * @see ImageHelper::ERROR_NOT_A_RESOURCE
      * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_CANVAS
      */
-    public function trim(?RGBAColor $color=null) : ImageHelper
+    public function trim(?RGBAColor $color = null) : ImageHelper
     {
         return $this->trimImage($this->newImage, $color);
     }
@@ -1054,9 +1054,9 @@ 
      *
      * @throws ImageHelper_Exception
      */
-    protected function trimImage($img, ?RGBAColor $trimColor=null) : ImageHelper
+    protected function trimImage($img, ?RGBAColor $trimColor = null) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
@@ -1065,7 +1065,7 @@ 
         $trimmer = new ImageTrimmer($this, $img, $trimColor);
         $new = $trimmer->trim();
 
-        if($new === null) {
+        if ($new === null) {
             return $this;
         }
         
@@ -1092,7 +1092,7 @@ 
         
         $this->newImage = $image;
         $this->newWidth = imagesx($image);
-        $this->newHeight= imagesy($image);
+        $this->newHeight = imagesy($image);
 
         return $this;
     }
@@ -1107,11 +1107,11 @@ 
     */
     public static function requireResource($subject) : void
     {
-        if(is_resource($subject) && imagesx($subject)) {
+        if (is_resource($subject) && imagesx($subject)) {
             return;
         }
 
-        if($subject instanceof GdImage) {
+        if ($subject instanceof GdImage) {
             return;
         }
         
@@ -1137,7 +1137,7 @@ 
     {
         $img = imagecreatetruecolor($width, $height);
         
-        if($img === false) 
+        if ($img === false) 
         {
             throw new ImageHelper_Exception(
                 'Error creating new image',
@@ -1156,7 +1156,7 @@ 
      * @param int $y
      * @return $this
      */
-	public function fillWhite(int $x=0, int $y=0) : self
+	public function fillWhite(int $x = 0, int $y = 0) : self
 	{
 	    $this->addRGBColor('white', 255, 255, 255);
         return $this->fill('white', $x, $y);
@@ -1185,7 +1185,7 @@ 
 	    self::requireResource($resource);
 	    
 	    $transparent = imagecolorallocatealpha($resource, 89, 14, 207, 127);
-	    imagecolortransparent ($resource, $transparent);
+	    imagecolortransparent($resource, $transparent);
 	    imagefill($resource, 0, 0, $transparent);
 	}
 
@@ -1195,7 +1195,7 @@ 
      * @param int $y
      * @return $this
      */
-	public function fill(string $colorName, int $x=0, int $y=0) : self
+	public function fill(string $colorName, int $x = 0, int $y = 0) : self
 	{
 	    imagefill($this->newImage, $x, $y, $this->colors[$colorName]);
 	    return $this;
@@ -1223,7 +1223,7 @@ 
      * @param int|float $angle
      * @return $this
      */
-    public function textTTF(string $text, $size, string $colorName, int $x=0, int $y=0, $angle=0) : self
+    public function textTTF(string $text, $size, string $colorName, int $x = 0, int $y = 0, $angle = 0) : self
     {
         imagealphablending($this->newImage, true);
         
@@ -1260,11 +1260,11 @@ 
      * @return $this
      * @throws ImageHelper_Exception
      */
-    public function paste(ImageHelper $target, int $xpos=0, int $ypos=0, int $sourceX=0, int $sourceY=0) : self
+    public function paste(ImageHelper $target, int $xpos = 0, int $ypos = 0, int $sourceX = 0, int $sourceY = 0) : self
     {
         $img = $target->getImage();
         
-        if($target->isAlpha()) {
+        if ($target->isAlpha()) {
             $this->enableAlpha();
         }
         
@@ -1326,10 +1326,10 @@ 
          */
         $sizes = array();
 
-        for($i=1; $i<=1000; $i += 0.1) {
+        for ($i = 1; $i <= 1000; $i += 0.1) {
             $size = $this->calcTextSize($text, $i);
             $sizes[] = $size;
-            if($size->getWidth() >= $matchWidth) {
+            if ($size->getWidth() >= $matchWidth) {
                 break;
             }
         }
@@ -1341,7 +1341,7 @@ 
         $diffLast = $last->getWidth() - $matchWidth;
         $diffPrev = $matchWidth - $prev->getWidth();
     
-        if($diffLast <= $diffPrev) {
+        if ($diffLast <= $diffPrev) {
             return $last;
         }
     
@@ -1370,14 +1370,14 @@ 
             'bottom_left_y' => $box[1],
             'bottom_right_x' => $box[2],
             'bottom_right_y' => $box[3],
-            'width' => $box[4]-$box[0],
-            'height' => $box[1]-$box[7]
+            'width' => $box[4] - $box[0],
+            'height' => $box[1] - $box[7]
         ));
     }
     
     protected function requireTTFFont() : void
     {
-        if(!empty($this->TTFFile)) {
+        if (!empty($this->TTFFile)) {
             return;
         }
         
@@ -1406,7 +1406,7 @@ 
      */
 	public static function getImageSize($pathOrResource) : ImageHelper_Size
 	{
-	    if(is_resource($pathOrResource) || $pathOrResource instanceof GdImage)
+	    if (is_resource($pathOrResource) || $pathOrResource instanceof GdImage)
 	    {
 	        return new ImageHelper_Size(array(
 	            'width' => imagesx($pathOrResource),
@@ -1422,7 +1422,7 @@ 
             'svg' => array(self::class, 'getImageSize_svg')
         );
 
-	    if(isset($sizeMethods[$type]))
+	    if (isset($sizeMethods[$type]))
 	    {
 	        return ClassHelper::requireObjectInstanceOf(
                 ImageHelper_Size::class,
@@ -1432,7 +1432,7 @@ 
 
 	    $info = getimagesize($pathOrResource);
 
-	    if($info !== false) {
+	    if ($info !== false) {
 	        return new ImageHelper_Size($info);
 	    }
 	    
@@ -1459,7 +1459,7 @@ 
 	    $xml = XMLHelper::createSimplexml();
 	    $xml->loadFile($imagePath);
 	    
-	    if($xml->hasErrors()) {
+	    if ($xml->hasErrors()) {
 	        throw new ImageHelper_Exception(
 	            'Error opening SVG image',
 	            sprintf(
@@ -1474,7 +1474,7 @@ 
 	    $xml->dispose();
 	    unset($xml);
 	    
-	    if(!isset($data['@attributes']['viewBox'])) {
+	    if (!isset($data['@attributes']['viewBox'])) {
 	        throw new ImageHelper_Exception(
 	            'SVG Image is corrupted',
 	            sprintf(
@@ -1491,7 +1491,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',
@@ -1538,7 +1538,7 @@ 
      * @return $this
      * @throws ImageHelper_Exception
      */
-    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);
         
@@ -1622,7 +1622,7 @@ 
      */
     public function getColorAt(int $x, int $y) : RGBAColor
     {
-        if($x > $this->getWidth() || $y > $this->getHeight()) 
+        if ($x > $this->getWidth() || $y > $this->getHeight()) 
         {
             throw new ImageHelper_Exception(
                 'Position out of bounds',
@@ -1664,7 +1664,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.',

Braces +2 added lines, -4 removed lines

@@ -137,8 +137,7 @@ 
             $this->sourceImage = $resource;
             $this->type = $type;
             $this->info = self::getImageSize($resource);
-        } 
-        else 
+        } else 
         {
             $this->file = $sourceFile;
             if (!file_exists($this->file)) {
@@ -580,8 +579,7 @@ 
         if ($this->width <= $this->height) 
         {
             $this->resampleByWidth($width);
-        } 
-        else 
+        } else 
         {
             $this->resampleByHeight($height);
         }

src/ImageHelper/Size.php

Spacing +7 added lines, -7 removed lines

@@ -30,27 +30,27 @@ 
      */
     public function __construct(array $size)
     {
-        if(!isset($size['width'])) {
+        if (!isset($size['width'])) {
             $size['width'] = $size[0];
         }
         
-        if(!isset($size['height'])) {
+        if (!isset($size['height'])) {
             $size['height'] = $size[1];
         }
         
-        if(!isset($size[0])) {
+        if (!isset($size[0])) {
             $size[0] = $size['width'];
         }
         
-        if(!isset($size[1])) {
+        if (!isset($size[1])) {
             $size[1] = $size['height'];
         }
         
-        if(!isset($size['channels'])) {
+        if (!isset($size['channels'])) {
             $size['channels'] = 1;
         }
 
-        if(!isset($size['bits'])) {
+        if (!isset($size['bits'])) {
             $size['bits'] = -1;
         }
         
@@ -63,7 +63,7 @@ 
      */
     public static function create($arrayOrInstance) : ImageHelper_Size
     {
-        if($arrayOrInstance instanceof self) {
+        if ($arrayOrInstance instanceof self) {
             return new self($arrayOrInstance->toArray());
         }
 

src/ImageHelper/ImageTrimmer.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
      * @param RGBAColor|null $trimColor
      * @throws ImageHelper_Exception
      */
-    public function __construct(ImageHelper $helper, $sourceImage, ?RGBAColor $trimColor=null)
+    public function __construct(ImageHelper $helper, $sourceImage, ?RGBAColor $trimColor = null)
     {
         ImageHelper::requireResource($sourceImage);
 
@@ -50,7 +50,7 @@ 
     {
         $targetColor = ColorFactory::createAuto($trimColor);
 
-        if($targetColor !== null)
+        if ($targetColor !== null)
         {
             return $targetColor;
         }
@@ -79,7 +79,7 @@ 
             )
         );
 
-        if($img !== false) {
+        if ($img !== false) {
             return $img;
         }