Mistralys / application-utils

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);
     }
     
    /**

src/RequestHelper/Response.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
     
     protected function getInfoKey(string $name) : string
     {
-        if(isset($this->info[$name])) {
+        if (isset($this->info[$name])) {
             return (string)$this->info[$name];
         }
         

src/NumberInfo.php

Spacing +38 added lines, -38 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function setValue($value) : NumberInfo
     {
-        if($value instanceof NumberInfo) {
+        if ($value instanceof NumberInfo) {
             $value = $value->getValue();
         }
         
@@ -117,7 +117,7 @@ 
     
     public function isPositive() : bool
     {
-        if(!$this->isEmpty()) {
+        if (!$this->isEmpty()) {
             $number = $this->getNumber();
             return $number > 0;
         }
@@ -148,7 +148,7 @@ 
      */
     public function hasValue() : bool
     {
-        if(!$this->isEmpty() && !$this->isZero()) {
+        if (!$this->isEmpty() && !$this->isZero()) {
             return true;
         }
         
@@ -221,7 +221,7 @@ 
      */
     public function getUnits()
     {
-        if(!$this->hasUnits()) {
+        if (!$this->hasUnits()) {
             return 'px';
         }
         
@@ -255,15 +255,15 @@ 
      */
     public function toAttribute() : string
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
-        if($this->isPercent()) {
+        if ($this->isPercent()) {
             return $this->getNumber().$this->getUnits();
         }
         
@@ -276,11 +276,11 @@ 
      */
     public function toCSS() : string
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
@@ -289,7 +289,7 @@ 
     
     public function __toString()
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
@@ -307,7 +307,7 @@ 
     public function isBiggerThan($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -325,7 +325,7 @@ 
     public function isSmallerThan($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -335,7 +335,7 @@ 
     public function isBiggerEqual($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -352,14 +352,14 @@ 
      */
     public function add($value)
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             $this->setValue($value);
             return $this;
         }
         
         $number = parseNumber($value);
         
-        if($number->getUnits() == $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() == $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() + $number->getNumber();
             $this->setValue($new.$this->getUnits());
@@ -378,14 +378,14 @@ 
      */
     public function subtract($value)
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             $this->setValue($value);
             return $this;
         }
         
         $number = parseNumber($value);
         
-        if($number->getUnits() == $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() == $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() - $number->getNumber();
             $this->setValue($new.$this->getUnits());
@@ -412,25 +412,25 @@ 
     
     protected function percentOperation($operation, $percent)
     {
-        if($this->isZeroOrEmpty()) {
+        if ($this->isZeroOrEmpty()) {
             return $this;
         }
         
         $percent = parseNumber($percent);
-        if($percent->hasUnits() && !$percent->isPercent()) {
+        if ($percent->hasUnits() && !$percent->isPercent()) {
             return $this;
         }
         
         $number = $this->getNumber();
         $value = $number * $percent->getNumber() / 100;
         
-        if($operation == '-') {
+        if ($operation == '-') {
             $number = $number - $value;
         } else {
             $number = $number + $value;
         }
         
-        if($this->isUnitInteger()) {
+        if ($this->isUnitInteger()) {
             $number = intval($number);
         }
         
@@ -481,7 +481,7 @@ 
         
         $key = $this->createValueKey($value);
 
-        if(array_key_exists($key, $cache)) {
+        if (array_key_exists($key, $cache)) {
             return $cache[$key];
         }
         
@@ -491,13 +491,13 @@ 
             'number' => null
         );
         
-        if($key === '_EMPTY_') 
+        if ($key === '_EMPTY_') 
         {
             $cache[$key]['empty'] = true;
             return $cache[$key];
         }
         
-        if($value === 0 || $value === '0') 
+        if ($value === 0 || $value === '0') 
         {
             $cache[$key]['number'] = 0;
             $cache[$key] = $this->filterInfo($cache[$key]);
@@ -506,20 +506,20 @@ 
         
         $test = trim((string)$value);
         
-        if($test === '') 
+        if ($test === '') 
         {
             $cache[$key]['empty'] = true;
             return $cache[$key];
         }
         
         // replace comma notation (which is only possible if it's a string)
-        if(is_string($value))
+        if (is_string($value))
         {
             $test = $this->preProcess($test, $cache, $value);
         }
         
         // convert to a number if it's numeric
-        if(is_numeric($test)) 
+        if (is_numeric($test)) 
         {
             $cache[$key]['number'] = (float)$test * 1;
             $cache[$key] = $this->filterInfo($cache[$key]);
@@ -545,19 +545,19 @@ 
         $empty = false;
         
         $found = $this->findUnits($test);
-        if($found !== null) 
+        if ($found !== null) 
         {
             $number = $found['number'];
             $units = $found['units'];
         }
         
         // the filters have to restore the value
-        if($this->postProcess)
+        if ($this->postProcess)
         {
             $number = $this->postProcess($number, $test);
         }
         // empty number
-        else if($number === '' || $number === null || is_bool($number))
+        else if ($number === '' || $number === null || is_bool($number))
         {
             $number = null;
             $empty = true;
@@ -568,7 +568,7 @@ 
             $number = trim($number);
             
             // may be an arbitrary string in some cases
-            if(!is_numeric($number))
+            if (!is_numeric($number))
             {
                 $number = null;
                 $empty = true;
@@ -600,17 +600,17 @@ 
         $vlength = strlen($value);
         $names = array_keys($this->knownUnits);
         
-        foreach($names as $unit)
+        foreach ($names as $unit)
         {
             $ulength = strlen($unit);
-            $start = $vlength-$ulength;
-            if($start < 0) {
+            $start = $vlength - $ulength;
+            if ($start < 0) {
                 continue;
             }
             
             $search = substr($value, $start, $ulength);
             
-            if($search==$unit) 
+            if ($search == $unit) 
             {
                 return array(
                     'units' => $unit,
@@ -630,7 +630,7 @@ 
     */
     private function createValueKey($value) : string
     {
-        if(!is_string($value) && !is_numeric($value))
+        if (!is_string($value) && !is_numeric($value))
         {
             return '_EMPTY_';
         }
@@ -696,12 +696,12 @@ 
     protected function filterInfo(array $info) : array
     {
         $useUnits = 'px';
-        if($info['units'] !== null) {
+        if ($info['units'] !== null) {
             $useUnits = $info['units'];
         }
         
         // the units are non-decimal: convert decimal values
-        if($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
+        if ($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
         {
             $info['number'] = intval($info['number']);
         }

src/Traits/Classable.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
     
     public function addClass(string $name)
     {
-        if(!in_array($name, $this->classes)) {
+        if (!in_array($name, $this->classes)) {
             $this->classes[] = $name;
         }
         
@@ -38,7 +38,7 @@ 
     
     public function addClasses(array $names)
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->addClass($name);
         }
         
@@ -54,7 +54,7 @@ 
     {
         $idx = array_search($name, $this->classes);
         
-        if($idx !== false) {
+        if ($idx !== false) {
             unset($this->classes[$idx]);
             sort($this->classes);
         }

src/ConvertHelper/StorageSizeEnum.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
     */
     protected static function init() : void
     {
-        if(!empty(self::$sizes)) {
+        if (!empty(self::$sizes)) {
             return;
         }
         
@@ -62,7 +62,7 @@ 
         
         self::addSize('b', 1, 1, t('B'), t('Byte'), t('Bytes'));
         
-        if(class_exists('AppLocalize\Localization')) 
+        if (class_exists('AppLocalize\Localization')) 
         {
             \AppLocalize\Localization::onLocaleChanged(array(self::class, 'handle_localeChanged'));
         }
@@ -131,7 +131,7 @@ 
         
         $name = strtolower($name);
         
-        if(isset(self::$sizes[$name])) {
+        if (isset(self::$sizes[$name])) {
             return self::$sizes[$name];
         }
         
@@ -173,9 +173,9 @@ 
         
         $result = array();
         
-        foreach(self::$sizes as $size)
+        foreach (self::$sizes as $size)
         {
-            if($size->getBase() === $base) {
+            if ($size->getBase() === $base) {
                 $result[] = $size;
             }
         }

src/ConvertHelper/TabsNormalizer.php

Spacing +10 added lines, -10 removed lines

@@ -57,7 +57,7 @@ 
     * @param bool $enable
     * @return ConvertHelper_TabsNormalizer
     */
-    public function convertTabsToSpaces(bool $enable=true) : ConvertHelper_TabsNormalizer
+    public function convertTabsToSpaces(bool $enable = true) : ConvertHelper_TabsNormalizer
     {
         $this->tabs2spaces = $enable;
         
@@ -94,7 +94,7 @@ 
         
         $result = $this->_normalize();
         
-        if($this->tabs2spaces) 
+        if ($this->tabs2spaces) 
         {
             $result = ConvertHelper::tabs2spaces($result, $this->tabSize);
         }
@@ -108,7 +108,7 @@ 
     {
         $eol = ConvertHelper::detectEOLCharacter($string);
         
-        if($eol !== null) 
+        if ($eol !== null) 
         {
             $this->eol = $eol->getCharacter();
         }
@@ -126,15 +126,15 @@ 
     {
         $converted = array();
         
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             $amount = substr_count($line, "\t") - $this->min;
             
             $line = trim($line, "\n\r\t");
             
-            if($amount >= 1) 
+            if ($amount >= 1) 
             {
-                $line = str_repeat("\t", $amount) . $line;
+                $line = str_repeat("\t", $amount).$line;
             }
             
             $converted[] = $line;
@@ -149,23 +149,23 @@ 
     */
     protected function countOccurrences() : void
     {
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             $amount = substr_count($line, "\t");
             
-            if($amount > $this->max) 
+            if ($amount > $this->max) 
             {
                 $this->max = $amount;
                 continue;
             }
             
-            if($amount > 0 && $amount < $this->min) 
+            if ($amount > 0 && $amount < $this->min) 
             {
                 $this->min = $amount;
             }
         }
         
-        if($this->min === PHP_INT_MAX) {
+        if ($this->min === PHP_INT_MAX) {
             $this->min = 0;
         }
     }

src/ConvertHelper/HiddenConverter.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
     */
     public function selectCharacters(string $type) : ConvertHelper_HiddenConverter
     {
-        if(!in_array($type, $this->selected)) {
+        if (!in_array($type, $this->selected)) {
             $this->selected[] = $type;
         }
         
@@ -109,7 +109,7 @@ 
     {
         $selected = $this->selected;
         
-        if(empty($this->selected)) 
+        if (empty($this->selected)) 
         {
             $selected = array(
                 self::CHARS_WHITESPACE,
@@ -119,9 +119,9 @@ 
         
         $result = array();
         
-        foreach($selected as $type) 
+        foreach ($selected as $type) 
         {
-            if(isset($this->characters[$type])) 
+            if (isset($this->characters[$type])) 
             {
                 $result = array_merge($result, $this->characters[$type]);
             }

src/Request/Param.php

Spacing +15 added lines, -15 removed lines

@@ -126,9 +126,9 @@ 
     * @param array $args
     * @return Request_Param
     */
-    public function setCallback($callback, array $args=array()) : Request_Param
+    public function setCallback($callback, array $args = array()) : Request_Param
     {
-        if(!is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new Request_Exception(
                 'Not a valid callback',
                 'The specified callback is not a valid callable entity.',
@@ -159,22 +159,22 @@ 
         // first off, apply filtering
         $value = $this->filter($value);
         
-        if($this->valueType === self::VALUE_TYPE_LIST)
+        if ($this->valueType === self::VALUE_TYPE_LIST)
         {
-            if(!is_array($value))
+            if (!is_array($value))
             {
                 $value = explode(',', $value);
             }
             
             $keep = array();
             
-            foreach($value as $subval)
+            foreach ($value as $subval)
             {
                 $subval = $this->filter($subval);
                 
                 $subval = $this->applyValidations($subval, true);
 
-                if($subval !== null) {
+                if ($subval !== null) {
                     $keep[] = $subval;
                 }
             }
@@ -195,11 +195,11 @@ 
     * @param mixed $value
     * @return mixed
     */
-    protected function applyValidations($value, bool $subval=false)
+    protected function applyValidations($value, bool $subval = false)
     {
         // go through all enqueued validations in turn, each time
         // replacing the value with the adjusted, validated value.
-        foreach($this->validations as $validateDef)
+        foreach ($this->validations as $validateDef)
         {
             $value = $this->validateType($value, $validateDef['type'], $validateDef['params'], $subval);
         }
@@ -222,7 +222,7 @@ 
     {
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Request_Exception(
                 'Unknown validation type.',
@@ -376,7 +376,7 @@ 
     {
         $args = func_get_args(); // cannot be used as function parameter in some PHP versions
         
-        if(is_array($args[0])) 
+        if (is_array($args[0])) 
         {
             $args = $args[0];
         }
@@ -521,10 +521,10 @@ 
     * @param mixed $default
     * @return mixed
     */
-    public function get($default=null)
+    public function get($default = null)
     {
         $value = $this->request->getParam($this->paramName);
-        if($value !== null && $value !== '') {
+        if ($value !== null && $value !== '') {
             return $value;
         }
 
@@ -543,7 +543,7 @@ 
     {
         $total = count($this->filters);
         for ($i = 0; $i < $total; $i++) {
-            $method = 'applyFilter_' . $this->filters[$i]['type'];
+            $method = 'applyFilter_'.$this->filters[$i]['type'];
             $value = $this->$method($value, $this->filters[$i]['params']);
         }
 
@@ -700,7 +700,7 @@ 
     * @param bool $stripEmptyEntries Remove empty entries from the array?
     * @return \AppUtils\Request_Param
     */
-    public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param
+    public function addCommaSeparatedFilter(bool $trimEntries = true, bool $stripEmptyEntries = true) : Request_Param
     {
         $this->setArray();
         
@@ -713,7 +713,7 @@ 
         );
     }
     
-    protected function addClassFilter(string $name, array $params=array()) : Request_Param
+    protected function addClassFilter(string $name, array $params = array()) : Request_Param
     {
         return $this->addFilter(
             self::FILTER_TYPE_CLASS,