Mistralys / application-utils

localization/index.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     $autoload = realpath($root.'/../vendor/autoload.php');
     
     // we need the autoloader to be present
-    if($autoload === false) 
+    if ($autoload === false) 
     {
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }
@@ -22,7 +22,7 @@ 
      */
     require_once $autoload;
     
-    if(!class_exists('\AppLocalize\Localization')) 
+    if (!class_exists('\AppLocalize\Localization')) 
     {
         die(
             '<b>ERROR:</b> The translation user interface requires the 

src/XMLHelper.php

Spacing +17 added lines, -17 removed lines

@@ -107,7 +107,7 @@ 
      */
     function addAttribute($parent, $name, $value)
     {
-        if(!$parent instanceof \DOMNode) {
+        if (!$parent instanceof \DOMNode) {
             throw new XMLHelper_Exception(
                 'The specified parent node is not a node instance.',
                 sprintf('Tried adding attribute [%s].', $name),
@@ -229,7 +229,7 @@ 
 
         if (!empty($text)) {
             $fragment = $this->dom->createDocumentFragment();
-            if(!@$fragment->appendXML($text)) {
+            if (!@$fragment->appendXML($text)) {
                 throw new XMLHelper_Exception(
                     'Cannot append XML fragment',
                     sprintf(
@@ -271,7 +271,7 @@ 
      * @param array $attributes
      * @return \DOMNode
      */
-    function createRoot($name, $attributes=array())
+    function createRoot($name, $attributes = array())
     {
         $root = $this->dom->appendChild($this->dom->createElement($name));
         $this->addAttributes($root, $attributes);
@@ -291,8 +291,8 @@ 
         $string = str_replace('<', 'LT_ESCAPE', $string);
         $string = str_replace('>', 'GT_ESCAPE', $string);
 
-        $string = str_replace(' ',' ',  $string);
-        $string = str_replace('&','&',  $string);
+        $string = str_replace(' ', ' ', $string);
+        $string = str_replace('&', '&', $string);
 
         return $string;
     }
@@ -307,8 +307,8 @@ 
      */
     public static function downloadXML($xml, $filename = 'download.xml')
     {
-        if(!headers_sent() && !self::$simulation) {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+        if (!headers_sent() && !self::$simulation) {
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
         }
         
         echo $xml;
@@ -323,11 +323,11 @@ 
      */
     public static function displayXML($xml)
     {
-        if(!headers_sent() && !self::$simulation) {
+        if (!headers_sent() && !self::$simulation) {
             header('Content-Type:text/xml; charset=utf-8');
         }
         
-        if(self::$simulation) {
+        if (self::$simulation) {
             $xml = '<pre>'.htmlspecialchars($xml).'</pre>';
         }
         
@@ -345,10 +345,10 @@ 
      * @param string[] $customInfo Associative array with name => value pairs for custom tags to add to the output xml
      * @see buildErrorXML()
      */
-    public static function displayErrorXML($code, $message, $title, $customInfo=array())
+    public static function displayErrorXML($code, $message, $title, $customInfo = array())
     {
-        if(!headers_sent() && !self::$simulation) {
-            header('HTTP/1.1 400 Bad Request: ' . $title, true, 400);
+        if (!headers_sent() && !self::$simulation) {
+            header('HTTP/1.1 400 Bad Request: '.$title, true, 400);
         }
 
         self::displayXML(self::buildErrorXML($code, $message, $title, $customInfo));
@@ -356,7 +356,7 @@ 
     
     protected static $simulation = false;
     
-    public static function setSimulation($simulate=true)
+    public static function setSimulation($simulate = true)
     {
         self::$simulation = $simulate;
     }
@@ -404,7 +404,7 @@ 
      * @param string $title
      * @return string
      */
-    public static function buildErrorXML($code, $message, $title, $customInfo=array())
+    public static function buildErrorXML($code, $message, $title, $customInfo = array())
     {
         $xml = new \DOMDocument('1.0', 'UTF-8');
         $xml->formatOutput = true;
@@ -418,7 +418,7 @@ 
         $helper->addTextTag($root, 'title', $title);
         $helper->addTextTag($root, 'request_uri', $_SERVER['REQUEST_URI']);
         
-        foreach($customInfo as $name => $value) {
+        foreach ($customInfo as $name => $value) {
             $helper->addTextTag($root, $name, $value);
         }
 
@@ -463,7 +463,7 @@ 
     */
     public static function string2xml(string $string) : string
     {
-        if(stristr($string, '<body')) 
+        if (stristr($string, '<body')) 
         {
             throw new XMLHelper_Exception(
                 'Cannot convert string with existing body element',
@@ -493,7 +493,7 @@ 
         
         // capture all elements except the body tag itself
         $xml = '';
-        foreach($root->childNodes as $child) {
+        foreach ($root->childNodes as $child) {
             $xml .= $dom->saveXML($child);
         }
         

src/JSHelper.php

Spacing +18 added lines, -18 removed lines

@@ -95,20 +95,20 @@ 
         $quoteStyle = array_shift($params);
         $method = array_shift($params);
         
-        $call = $method . '(';
+        $call = $method.'(';
         
         $total = count($params);
-        if($total > 0) {
-            for($i=0; $i < $total; $i++) 
+        if ($total > 0) {
+            for ($i = 0; $i < $total; $i++) 
             {
                 $call .= self::phpVariable2JS($params[$i], $quoteStyle);
-                if($i < ($total-1)) {
+                if ($i < ($total - 1)) {
                     $call .= ',';
                 }
             }
         }
         
-        return $call . ');';
+        return $call.');';
     }
 
    /**
@@ -132,7 +132,7 @@ 
     */
     public static function buildVariable(string $varName, $varValue) : string
     {
-        return $varName . "=" . self::phpVariable2JS($varValue) . ';';
+        return $varName."=".self::phpVariable2JS($varValue).';';
     }
     
    /**
@@ -144,7 +144,7 @@ 
     * @param int $quoteStyle The quote style to use for strings
     * @return string
     */
-    public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
+    public static function phpVariable2JS($variable, int $quoteStyle = self::QUOTE_STYLE_DOUBLE) : string
     {
         // after much profiling, this variant of the method offers
         // the best performance. Repeat scalar values are cached 
@@ -152,22 +152,22 @@ 
         
         $type = gettype($variable);
         $hash = null;
-        if(is_scalar($variable) === true) 
+        if (is_scalar($variable) === true) 
         {
             $hash = $variable;
         
-            if($hash === true) 
+            if ($hash === true) 
             { 
                 $hash = 'true'; 
             } 
-            else if($hash === false) 
+            else if ($hash === false) 
             { 
                 $hash = 'false'; 
             }
             
             $hash .= '-'.$quoteStyle.'-'.$type;
             
-            if(isset(self::$variableCache[$hash])) {
+            if (isset(self::$variableCache[$hash])) {
                 return self::$variableCache[$hash];
             }
         }
@@ -175,19 +175,19 @@ 
         $result = 'null';
 
         // one gettype call is better than a strict if-else.
-        switch($type) 
+        switch ($type) 
         {
             case 'double':
             case 'string':
                 $string = json_encode($variable);
                 
-                if($string === false) 
+                if ($string === false) 
                 {
                     $string = '';
                 } 
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
+                else if ($quoteStyle === self::QUOTE_STYLE_SINGLE) 
                 {
-                    $string = mb_substr($string, 1, mb_strlen($string)-2);
+                    $string = mb_substr($string, 1, mb_strlen($string) - 2);
                     $string = "'".str_replace("'", "\'", $string)."'";
                 }
                 
@@ -195,7 +195,7 @@ 
                 break;
                 
             case 'boolean':
-                if($variable === true) {
+                if ($variable === true) {
                     $result = 'true';
                 } else {
                     $result = 'false';
@@ -213,7 +213,7 @@ 
         }
 
         // cache cacheable values
-        if($hash !== null) 
+        if ($hash !== null) 
         {
             self::$variableCache[$hash] = $result;
         }
@@ -245,7 +245,7 @@ 
     {
         self::$elementCounter++;
 
-        return self::$idPrefix . self::$elementCounter;
+        return self::$idPrefix.self::$elementCounter;
     }
     
    /**

src/RequestHelper.php

Spacing +12 added lines, -12 removed lines

@@ -97,10 +97,10 @@ 
         $contentLength = 0;
         if (!empty($this->variables)) {
             foreach ($this->variables as $name => $value) {
-                $this->data .= '--' . $this->mimeBoundary . $this->eol;
-                $this->data .= 'Content-Disposition: form-data; name="' . $name . '"' . $this->eol;
+                $this->data .= '--'.$this->mimeBoundary.$this->eol;
+                $this->data .= 'Content-Disposition: form-data; name="'.$name.'"'.$this->eol;
                 $this->data .= $this->eol;
-                $this->data .= $value . $this->eol;
+                $this->data .= $value.$this->eol;
 
                 $contentLength += strlen($value);
             }
@@ -108,17 +108,17 @@ 
 
         if (!empty($this->files)) {
             foreach ($this->files as $varName => $def) {
-                $this->data .= '--' . $this->mimeBoundary . $this->eol;
-                $this->data .= 'Content-Disposition: form-data; name="' . $varName . '"; filename="' . $def['fileName'] . '"' . $this->eol;
-                $this->data .= 'Content-Type: ' . $def['contentType'] . '; charset=' . $def['encoding'];
-                $this->data .= $this->eol . $this->eol;
-                $this->data .= $def['content'] . $this->eol;
+                $this->data .= '--'.$this->mimeBoundary.$this->eol;
+                $this->data .= 'Content-Disposition: form-data; name="'.$varName.'"; filename="'.$def['fileName'].'"'.$this->eol;
+                $this->data .= 'Content-Type: '.$def['contentType'].'; charset='.$def['encoding'];
+                $this->data .= $this->eol.$this->eol;
+                $this->data .= $def['content'].$this->eol;
 
                 $contentLength += strlen($def['content']);
             }
         }
 
-        $this->data .= "--" . $this->mimeBoundary . "--" . $this->eol . $this->eol; // finish with two eol's!!
+        $this->data .= "--".$this->mimeBoundary."--".$this->eol.$this->eol; // finish with two eol's!!
 
         //echo '<pre>'.print_r($this->data,true).'</pre>';
 
@@ -126,8 +126,8 @@ 
             'http' => array(
                 'method' => 'POST',
                 'header' =>
-                    'Content-Length: ' . $contentLength . $this->eol .
-                    'Content-Type: multipart/form-data; charset=UTF-8; boundary=' . $this->mimeBoundary . $this->eol
+                    'Content-Length: '.$contentLength.$this->eol.
+                    'Content-Type: multipart/form-data; charset=UTF-8; boundary='.$this->mimeBoundary.$this->eol
             ,
                 'content' => $this->data
             )
@@ -141,7 +141,7 @@ 
             $errorMessage = error_get_last();
             throw new RequestHelper_Exception(
                 'Request failed.',
-                'Request error message: ' . $errorMessage['message'] . ' in ' . $errorMessage['file'] . ':' . $errorMessage['line'],
+                'Request error message: '.$errorMessage['message'].' in '.$errorMessage['file'].':'.$errorMessage['line'],
                 self::ERROR_REQUEST_FAILED
             );
         }

src/functions.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
  * @param mixed $value
  * @return \AppUtils\NumberInfo
  */
-function parseNumber($value, $forceNew=false)
+function parseNumber($value, $forceNew = false)
 {
-    if($value instanceof NumberInfo && $forceNew !== true) {
+    if ($value instanceof NumberInfo && $forceNew !== true) {
         return $value;
     }
     
@@ -79,7 +79,7 @@ 
     $args = func_get_args();
     
     // is the localization package installed?
-    if(class_exists('\AppLocalize\Localization')) 
+    if (class_exists('\AppLocalize\Localization')) 
     {
         return call_user_func_array('\AppLocalize\t', $args);
     }
@@ -95,7 +95,7 @@ 
  */
 function init()
 {
-    if(!class_exists('\AppLocalize\Localization')) {
+    if (!class_exists('\AppLocalize\Localization')) {
         return;
     }
     

src/ImageHelper.php

Spacing +96 added lines, -96 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, true));
         }
     }
@@ -211,7 +211,7 @@ 
     * @param string $type The target file type when saving
     * @return ImageHelper
     */
-    public static function createNew($width, $height, $type='png')
+    public static function createNew($width, $height, $type = 'png')
     {
         return self::createFromResource(imagecreatetruecolor($width, $height), 'png');
     }
@@ -260,7 +260,7 @@ 
     */
     public static function setConfig($name, $value)
     {
-        if(isset(self::$config[$name])) {
+        if (isset(self::$config[$name])) {
             self::$config[$name] = $value;
         }
     }
@@ -271,7 +271,7 @@ 
     * 
     * @param bool $enabled
     */
-    public static function setAutoMemoryAdjustment($enabled=true)
+    public static function setAutoMemoryAdjustment($enabled = true)
     {
         self::setConfig('auto-memory-adjustment', $enabled);
     }
@@ -305,7 +305,7 @@ 
 
     public function enableAlpha()
     {
-        if(!$this->alpha) 
+        if (!$this->alpha) 
         {
             self::addAlphaSupport($this->newImage, false);
             $this->alpha = true;
@@ -336,9 +336,9 @@ 
      * @param number $percent
      * @return ImageHelper
      */
-    public function sharpen($percent=0)
+    public function sharpen($percent = 0)
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -347,9 +347,9 @@ 
         return $this->convolute($factor);
     }
     
-    public function blur($percent=0)
+    public function blur($percent = 0)
     {
-        if($percent <= 0) {
+        if ($percent <= 0) {
             return $this;
         }
         
@@ -362,12 +362,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;
         }
         
@@ -380,24 +380,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;
     }
@@ -523,7 +523,7 @@ 
     */
     public function resample($width = null, $height = null) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
         
@@ -544,7 +544,7 @@ 
 
     public function resampleAndCrop($width, $height) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
@@ -591,14 +591,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);
         }
     }
@@ -608,9 +608,9 @@ 
         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;
         }
         
@@ -622,7 +622,7 @@ 
             );
         }
 
-        if($this->newImage === false) {
+        if ($this->newImage === false) {
             throw new ImageHelper_Exception(
                 'Cannot save image, not a valid image resource',
                 'The image is not a resource, but boolean false',
@@ -634,7 +634,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',
@@ -655,7 +655,7 @@ 
             );
         }
 
-        if($dispose) {
+        if ($dispose) {
             $this->dispose();
         }
         
@@ -664,11 +664,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);
         }
     }
@@ -721,7 +721,7 @@ 
     */
     protected function adjustMemory() : bool
     {
-        if(!self::$config['auto-memory-adjustment']) {
+        if (!self::$config['auto-memory-adjustment']) {
             return true;
         }
         
@@ -750,7 +750,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;
         }
@@ -781,19 +781,19 @@ 
     */
     protected function resampleImage(int $newWidth, int $newHeight) : ImageHelper
     {
-        if($this->isVector()) {
+        if ($this->isVector()) {
             return $this;
         }
 
-        if(is_null($newWidth)) { $newWidth = $this->newWidth; }
-        if(is_null($newHeight)) { $newHeight = $this->newHeight; }
+        if (is_null($newWidth)) { $newWidth = $this->newWidth; }
+        if (is_null($newHeight)) { $newHeight = $this->newHeight; }
         
-        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();
 
@@ -857,11 +857,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',
                 sprintf(
@@ -872,9 +872,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);
         exit;
@@ -937,7 +937,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);
     }
@@ -950,15 +950,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, $color=null) : ImageHelper
+    protected function trimImage($img, $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 = imagecolorsforindex($img, $color);
         }
@@ -974,16 +974,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 = imagecolorsforindex($img, $ndx);
                 
-                if(!$this->colorsMatch($colors, $color)) 
+                if (!$this->colorsMatch($colors, $color)) 
                 {
                     if ($xmin > $ix) { $xmin = $ix; }
                     if ($xmax < $ix) { $xmax = $ix; }
@@ -991,7 +991,7 @@ 
                     
                     $ymax = $iy;
                     
-                    if($first)
+                    if ($first)
                     { 
                         $ix = $xmax; 
                         $first = false; 
@@ -1001,18 +1001,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);
@@ -1048,7 +1048,7 @@ 
         
         $this->newImage = $image;
         $this->newWidth = imagesx($image);
-        $this->newHeight= imagesy($image);
+        $this->newHeight = imagesy($image);
     }
     
    /**
@@ -1059,7 +1059,7 @@ 
     */
     protected static function requireResource($subject)
     {
-        if(is_resource($subject)) {
+        if (is_resource($subject)) {
             return;
         }
         
@@ -1107,8 +1107,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;
 			}
 		} 
@@ -1116,7 +1116,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);
@@ -1136,11 +1136,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;
@@ -1154,7 +1154,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);
         
@@ -1173,11 +1173,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();
         }
         
@@ -1193,7 +1193,7 @@ 
     * @throws ImageHelper_Exception
     * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
     */
-	public function getSize($exception=true) : ImageHelper_Size
+	public function getSize($exception = true) : ImageHelper_Size
     {
 	    return self::getImageSize($this->newImage, $exception);
     }
@@ -1223,10 +1223,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;
             }
         }
@@ -1238,7 +1238,7 @@ 
         $diffLast = $last['width'] - $matchWidth;
         $diffPrev = $matchWidth - $prev['width'];
     
-        if($diffLast <= $diffPrev) {
+        if ($diffLast <= $diffPrev) {
             return $last;
         }
     
@@ -1266,14 +1266,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;
         }
         
@@ -1307,9 +1307,9 @@ 
 	 * @see ImageHelper::ERROR_SVG_SOURCE_VIEWBOX_MISSING
 	 * @see ImageHelper::ERROR_SVG_VIEWBOX_INVALID
 	 */
-	public static function getImageSize($pathOrResource, $exception=true) : ImageHelper_Size
+	public static function getImageSize($pathOrResource, $exception = true) : ImageHelper_Size
 	{
-	    if(is_resource($pathOrResource)) 
+	    if (is_resource($pathOrResource)) 
 	    {
 	        return new ImageHelper_Size(array(
 	            'width' => imagesx($pathOrResource),
@@ -1323,7 +1323,7 @@ 
 	    
 	    $info = false;
 	    $method = 'getImageSize_'.$type;
-	    if(method_exists(__CLASS__, $method)) 
+	    if (method_exists(__CLASS__, $method)) 
 	    {
 	        $info = call_user_func(array(__CLASS__, $method), $pathOrResource);
 	    } 
@@ -1332,8 +1332,8 @@ 
 	        $info = getimagesize($pathOrResource);
 	    }
 	    
-	    if($info === false) {
-	        if($exception) {
+	    if ($info === false) {
+	        if ($exception) {
     	        throw new ImageHelper_Exception(
     	            'Error opening image file',
     	            sprintf(
@@ -1355,7 +1355,7 @@ 
 	    $xml = XMLHelper::createSimplexml();
 	    $xml->loadFile($imagePath);
 	    
-	    if($xml->hasErrors()) {
+	    if ($xml->hasErrors()) {
 	        throw new ImageHelper_Exception(
 	            'Error opening SVG image',
 	            sprintf(
@@ -1370,7 +1370,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(
@@ -1386,7 +1386,7 @@ 
 	    
 	    $viewBox = str_replace(' ', ',', $data['@attributes']['viewBox']);
 	    $viewBox = explode(',', $viewBox);
-	    if(count($viewBox) != 4) {
+	    if (count($viewBox) != 4) {
 	        throw new ImageHelper_Exception(
 	            'SVG image has an invalid viewBox attribute',
 	            sprintf(
@@ -1431,7 +1431,7 @@ 
     * @param integer $y
     * @return ImageHelper
     */
-    public function crop($width, $height, $x=0, $y=0)
+    public function crop($width, $height, $x = 0, $y = 0)
     {
         $new = $this->createNewImage($width, $height);
         
@@ -1459,7 +1459,7 @@ 
     * 
     * @return array
     */
-    public function calcAverageColor($format=self::COLORFORMAT_RGB)
+    public function calcAverageColor($format = self::COLORFORMAT_RGB)
     {
         $image = $this->duplicate();
         $image->resample(1, 1);
@@ -1488,9 +1488,9 @@ 
     * @param int $y
     * @return array
     */
-    public function getColorAt($x, $y, $format=self::COLORFORMAT_RGB)
+    public function getColorAt($x, $y, $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',
                 sprintf(
@@ -1507,7 +1507,7 @@ 
         $idx = imagecolorat($this->newImage, $x, $y);
         $rgb = imagecolorsforindex($this->newImage, $idx);
         
-        if($format == self::COLORFORMAT_HEX) {
+        if ($format == self::COLORFORMAT_HEX) {
             return self::rgb2hex($rgb);
         }
 
@@ -1522,7 +1522,7 @@ 
     */
     public static function rgb2luma($rgb)
     {
-        return (($rgb['red']*2)+$rgb['blue']+($rgb['green']*3))/6;
+        return (($rgb['red'] * 2) + $rgb['blue'] + ($rgb['green'] * 3)) / 6;
     }
     
    /**

src/SVNHelper.php

Spacing +18 added lines, -18 removed lines

@@ -65,7 +65,7 @@ 
     {
         $this->isWindows = substr(PHP_OS, 0, 3) == 'WIN';
         
-        if($this->isWindows) {
+        if ($this->isWindows) {
             $this->normalize['from'] = '/';
             $this->normalize['to'] = '\\';
         }
@@ -80,7 +80,7 @@ 
         //
         // NOTE: In case of symlinks, this resolves the symlink to its source (WIN/NIX)
         $realPath = realpath($this->sourcePath);
-        if(!is_dir($realPath)) {
+        if (!is_dir($realPath)) {
             throw new SVNHelper_Exception(
                 'Local repository path does not exist',
                 sprintf(
@@ -98,7 +98,7 @@ 
         $result = array();
         preg_match_all('%([^:]+):(.+)@(https|http|svn)://(.+)%sm', $repURL, $result, PREG_PATTERN_ORDER);
         
-        if(!isset($result[1]) || !isset($result[1][0])) {
+        if (!isset($result[1]) || !isset($result[1][0])) {
             throw new SVNHelper_Exception(
                 'Invalid SVN repository URL',
                 'The SVN URL must have the following format: [username:password@http://domain.com/path/to/rep].',
@@ -131,18 +131,18 @@ 
     * @throws SVNHelper_Exception
     * @return string
     */
-    public function normalizePath($path, $relativize=false)
+    public function normalizePath($path, $relativize = false)
     {
-        if(empty($path)) {
+        if (empty($path)) {
             return '';
         }
         
-        if($relativize) 
+        if ($relativize) 
         {
             $path = $this->normalizePath($path);
 
             // path is absolute, and does not match the realpath or the source path?
-            if(strstr($path, ':'.$this->getSlash()) && (!stristr($path, $this->path) && !stristr($path, $this->sourcePath))) {
+            if (strstr($path, ':'.$this->getSlash()) && (!stristr($path, $this->path) && !stristr($path, $this->sourcePath))) {
                 throw new SVNHelper_Exception(
                     'Cannot relativize path outside of repository',
                     sprintf(
@@ -223,14 +223,14 @@ 
     */
     protected function filterPath($path)
     {
-        if(empty($path)) {
+        if (empty($path)) {
             return '';
         }
         
         $path = $this->getPath().'/'.$this->relativizePath($path);
         
         $real = realpath($path);
-        if($real !== false) {
+        if ($real !== false) {
             return $real;
         }
         
@@ -257,13 +257,13 @@ 
         $key = $type.':'.$relativePath;
         
         $relativePath = $this->normalizePath($relativePath, true);
-        if(isset($this->targets[$key])) {
+        if (isset($this->targets[$key])) {
             return $this->targets[$key];
         }
 
         $target = null;
         
-        switch($type)
+        switch ($type)
         {
             case 'File':
                 $target = new SVNHelper_Target_File($this, $relativePath);
@@ -396,7 +396,7 @@ 
     */
     public function addFolder($path)
     {
-        if(is_dir($path)) {
+        if (is_dir($path)) {
             return $this->getFolder($path);
         }
         
@@ -404,12 +404,12 @@ 
         $tokens = explode($this->getSlash(), $path);
         
         $target = $this->path;
-        foreach($tokens as $folder) 
+        foreach ($tokens as $folder) 
         {
             $target .= $this->getSlash().$folder;
-            if(file_exists($target)) 
+            if (file_exists($target)) 
             {
-                if(!is_dir($target)) {
+                if (!is_dir($target)) {
                     throw new SVNHelper_Exception(
                         'Target folder is a file',
                         sprintf(
@@ -423,7 +423,7 @@ 
                 continue;
             }
             
-            if(!mkdir($target, 0777)) {
+            if (!mkdir($target, 0777)) {
                 throw new SVNHelper_Exception(
                     'Cannot create folder',
                     sprintf(
@@ -453,7 +453,7 @@ 
     */
     public static function setLogCallback($callback)
     {
-        if(!is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new SVNHelper_Exception(
                 'Not a valid logging callback',
                 'The specified argument is not callable.',
@@ -466,7 +466,7 @@ 
     
     public static function log($message)
     {
-        if(isset(self::$logCallback)) {
+        if (isset(self::$logCallback)) {
             call_user_func(self::$logCallback, 'SVNHelper | '.$message);
         }
     }

src/SVNHelper/Exception.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
     
     protected $logging = true;
     
-    public function __construct($message, $details=null, $code=null, $previous=null)
+    public function __construct($message, $details = null, $code = null, $previous = null)
     {
         parent::__construct($message, $details, $code, $previous);
         
@@ -31,17 +31,17 @@ 
     
     public function __destruct()
     {
-        if(!$this->logging) {
+        if (!$this->logging) {
             return;
         }
         
         $loggers = SVNHelper::getExceptionLoggers();
         
-        if(empty($loggers)) {
+        if (empty($loggers)) {
             return;
         }
         
-        foreach($loggers as $callback) {
+        foreach ($loggers as $callback) {
             call_user_func($callback, $this);
         }
     }

src/SVNHelper/CommandError.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
     public function hasAnyErrorCode($codes)
     {
         $items = array();
-        foreach($codes as $code) {
+        foreach ($codes as $code) {
             $items[] = ltrim($code, 'e');
         }