Mistralys / application-utils

src/FileHelper/PHPClassInfo/Class.php

Indentation +70 added lines, -70 removed lines

@@ -22,51 +22,51 @@ 
  */
 class FileHelper_PHPClassInfo_Class 
 {
-   /**
-    * @var FileHelper_PHPClassInfo
-    */
+    /**
+     * @var FileHelper_PHPClassInfo
+     */
     protected $info;
 
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $abstract = false;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $final = false;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $extends = '';
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $implements = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $name;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $declaration;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $keyword;
     
-   /**
-    * @param FileHelper_PHPClassInfo $info The class info instance.
-    * @param string $declaration The full class declaration, e.g. "class SomeName extends SomeOtherClass".
-    * @param string $keyword The class keyword, if any, i.e. "abstract" or "final".
-    */
+    /**
+     * @param FileHelper_PHPClassInfo $info The class info instance.
+     * @param string $declaration The full class declaration, e.g. "class SomeName extends SomeOtherClass".
+     * @param string $keyword The class keyword, if any, i.e. "abstract" or "final".
+     */
     public function __construct(FileHelper_PHPClassInfo $info, string $declaration, string $keyword)
     {
         $this->info = $info;
@@ -76,31 +76,31 @@ 
         $this->analyzeCode();
     }
     
-   /**
-    * Check if this class is a subclass of the specified
-    * class name.
-    * 
-    * @param string $className
-    * @return bool
-    */
+    /**
+     * Check if this class is a subclass of the specified
+     * class name.
+     * 
+     * @param string $className
+     * @return bool
+     */
     public function isSublassOf(string $className) : bool
     {
         return is_subclass_of($this->getNameNS(), $className);
     }
     
-   /**
-    * The class name without namespace.
-    * @return string
-    */
+    /**
+     * The class name without namespace.
+     * @return string
+     */
     public function getName() : string
     {
         return $this->name;
     }
     
-   /**
-    * The absolute class name with namespace (if any).
-    * @return string
-    */
+    /**
+     * The absolute class name with namespace (if any).
+     * @return string
+     */
     public function getNameNS() : string
     {
         $name = $this->getName();
@@ -112,48 +112,48 @@ 
         return $name;
     }
     
-   /**
-    * Whether it is an abstract class.
-    * @return bool
-    */
+    /**
+     * Whether it is an abstract class.
+     * @return bool
+     */
     public function isAbstract() : bool
     {
         return $this->abstract;
     }
     
-   /**
-    * Whether it is a final class.
-    * @return bool
-    */
+    /**
+     * Whether it is a final class.
+     * @return bool
+     */
     public function isFinal() : bool
     {
         return $this->final;
     }
 
-   /**
-    * The name of the class that this class extends (with namespace, if specified).
-    * @return string
-    */
+    /**
+     * The name of the class that this class extends (with namespace, if specified).
+     * @return string
+     */
     public function getExtends() : string
     {
         return $this->extends;
     }
     
-   /**
-    * A list of interfaces the class implements, if any.
-    * @return array
-    */
+    /**
+     * A list of interfaces the class implements, if any.
+     * @return array
+     */
     public function getImplements() : array
     {
         return $this->implements;
     }
     
-   /**
-    * The class declaration string, with normalized spaces and sorted interface names.
-    * NOTE: does not include the keyword "abstract" or "final".
-    * 
-    * @return string
-    */
+    /**
+     * The class declaration string, with normalized spaces and sorted interface names.
+     * NOTE: does not include the keyword "abstract" or "final".
+     * 
+     * @return string
+     */
     public function getDeclaration() : string
     {
         $parts = array();
@@ -173,10 +173,10 @@ 
         return implode(' ', $parts);
     }
     
-   /**
-    * The keyword before "class", e.g. "abstract".
-    * @return string
-    */
+    /**
+     * The keyword before "class", e.g. "abstract".
+     * @return string
+     */
     public function getKeyword() : string
     {
         return $this->keyword;

Spacing +10 added lines, -10 removed lines

@@ -105,7 +105,7 @@ 
     {
         $name = $this->getName();
         
-        if($this->info->hasNamespace()) {
+        if ($this->info->hasNamespace()) {
             $name = $this->info->getNamespace().'\\'.$this->name;
         }
         
@@ -160,12 +160,12 @@ 
         $parts[] = 'class';
         $parts[] = $this->getName();
         
-        if(!empty($this->extends)) {
+        if (!empty($this->extends)) {
             $parts[] = 'extends';
             $parts[] = $this->extends;
         }
         
-        if(!empty($this->implements)) {
+        if (!empty($this->implements)) {
             $parts[] = 'implements';
             $parts[] = implode(', ', $this->implements);
         }
@@ -184,9 +184,9 @@ 
     
     protected function analyzeCode()
     {
-        if($this->keyword == 'abstract') {
+        if ($this->keyword == 'abstract') {
             $this->abstract = true;
-        } else if($this->keyword == 'final') {
+        } else if ($this->keyword == 'final') {
             $this->final = true;
         }
         
@@ -203,16 +203,16 @@ 
         
         $tokenName = 'none';
         
-        foreach($parts as $part)
+        foreach ($parts as $part)
         {
             $part = str_replace(',', '', $part);
             $part = trim($part);
-            if(empty($part)) {
+            if (empty($part)) {
                 continue;
             }
             
             $name = strtolower($part);
-            if($name == 'extends' || $name == 'implements') {
+            if ($name == 'extends' || $name == 'implements') {
                 $tokenName = $name;
                 continue;
             }
@@ -222,13 +222,13 @@ 
         
         $this->implements = $tokens['implements'];
         
-        if(!empty($this->implements)) {
+        if (!empty($this->implements)) {
             usort($this->implements, function(string $a, string $b) {
                 return strnatcasecmp($a, $b);
             });
         }
         
-        if(!empty($tokens['extends'])) {
+        if (!empty($tokens['extends'])) {
             $this->extends = $tokens['extends'][0];
         }
     }

src/ImageHelper/Size.php

Spacing +7 added lines, -7 removed lines

@@ -18,23 +18,23 @@ 
     
     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;
         }
         
@@ -68,7 +68,7 @@ 
     
     public function offsetGet($offset)
     {
-        if(isset($this->size[$offset])) {
+        if (isset($this->size[$offset])) {
             return $this->size[$offset];
         }
         
@@ -77,7 +77,7 @@ 
     
     public function offsetSet($offset, $value)
     {
-        if(is_null($offset)) {
+        if (is_null($offset)) {
             $this->size[] = $value;
         } else {
             $this->size[$offset] = $value;

examples/URLInfo/highlighting.php

Indentation +3 added lines, -3 removed lines

@@ -7,9 +7,9 @@
  * @author Sebastian Mordziol <s.mordziol@mistralys.eu>
  */
 
-   /**
-    * Examples environment config
-    */
+    /**
+     * Examples environment config
+     */
     require_once '../prepend.php';
 
     use function AppUtils\parseURL;

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		<br>
         <?php
         
-            foreach($urls as $url)
+            foreach ($urls as $url)
             {
                 $info = parseURL($url);
                 

examples/prepend.php

Indentation +15 added lines, -15 removed lines

@@ -17,33 +17,33 @@
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }
     
-   /**
-    * The composer autoloader
-    */
+    /**
+     * The composer autoloader
+     */
     require_once $autoload;
 
-   /**
-    * Translation global function.
-    * @return string
-    */
+    /**
+     * Translation global function.
+     * @return string
+     */
     function t()
     {
         return call_user_func_array('\AppLocalize\t', func_get_args());
     }
     
-   /**
-    * Translation global function.
-    * @return string
-    */
+    /**
+     * Translation global function.
+     * @return string
+     */
     function pt()
     {
         return call_user_func_array('\AppLocalize\pt', func_get_args());
     }
     
-   /**
-    * Translation global function.
-    * @return string
-    */
+    /**
+     * Translation global function.
+     * @return string
+     */
     function pts()
     {
         return call_user_func_array('\AppLocalize\pts', func_get_args());

Spacing +1 added lines, -1 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.');
     }

src/CSVHelper.php

Indentation +130 added lines, -130 removed lines

@@ -50,20 +50,20 @@ 
         
     }
 
-   /**
-    * Creates and returns a new instance of the CSV builder which
-    * can be used to build CSV from scratch.
-    * 
-    * @return CSVHelper_Builder
-    */
+    /**
+     * Creates and returns a new instance of the CSV builder which
+     * can be used to build CSV from scratch.
+     * 
+     * @return CSVHelper_Builder
+     */
     public static function createBuilder()
     {
         return new CSVHelper_Builder();
     }
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $csv = '';
     
     protected $data = array();
@@ -72,16 +72,16 @@ 
     
     protected $headersPosition = self::HEADERS_NONE;
     
-   /**
-    * Loads CSV data from a string. 
-    * 
-    * Note: Use the {@link hasErrors()} method to 
-    * check if the string could be parsed correctly
-    * afterwards.
-    * 
-    * @param string $string
-    * @return CSVHelper
-    */
+    /**
+     * Loads CSV data from a string. 
+     * 
+     * Note: Use the {@link hasErrors()} method to 
+     * check if the string could be parsed correctly
+     * afterwards.
+     * 
+     * @param string $string
+     * @return CSVHelper
+     */
     public function loadString($string)
     {
         // remove any UTF byte order marks that may still be present in the string
@@ -95,20 +95,20 @@ 
         return $this;
     }
     
-   /**
-    * Loads CSV data from a file.
-    * 
-    * Note: Use the {@link hasErrors()} method to 
-    * check if the string could be parsed correctly
-    * afterwards.
-    * 
-    * @param string $file
-    * @throws FileHelper_Exception
-    * @return CSVHelper
-    * 
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
-    * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
-    */
+    /**
+     * Loads CSV data from a file.
+     * 
+     * Note: Use the {@link hasErrors()} method to 
+     * check if the string could be parsed correctly
+     * afterwards.
+     * 
+     * @param string $file
+     * @throws FileHelper_Exception
+     * @return CSVHelper
+     * 
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
+     * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
+     */
     public function loadFile(string $file) : CSVHelper
     {
         $csv = FileHelper::readContents($file);
@@ -122,28 +122,28 @@ 
     
     protected $rowCount = 0;
     
-   /**
-    * Specifies that headers are positioned on top, horizontally.
-    * @return CSVHelper
-    */
+    /**
+     * Specifies that headers are positioned on top, horizontally.
+     * @return CSVHelper
+     */
     public function setHeadersTop()
     {
         return $this->setHeadersPosition(self::HEADERS_TOP);
     }
     
-   /**
-    * Specifies that headers are positioned on the left, vertically.
-    * @return CSVHelper
-    */
+    /**
+     * Specifies that headers are positioned on the left, vertically.
+     * @return CSVHelper
+     */
     public function setHeadersLeft()
     {
         return $this->setHeadersPosition(self::HEADERS_LEFT);
     }
     
-   /**
-    * Specifies that there are no headers in the file (default).
-    * @return CSVHelper
-    */
+    /**
+     * Specifies that there are no headers in the file (default).
+     * @return CSVHelper
+     */
     public function setHeadersNone()
     {
         return $this->setHeadersPosition(self::HEADERS_NONE);
@@ -173,18 +173,18 @@ 
         return false;
     }
     
-   /**
-    * Specifies where the headers are positioned in the
-    * CSV, or turns them off entirely. Use the class constants
-    * to ensure the value is correct.
-    * 
-    * @param string $position
-    * @throws CSVHelper_Exception
-    * @return CSVHelper
-    * @see CSVHelper::HEADERS_LEFT
-    * @see CSVHelper::HEADERS_TOP
-    * @see CSVHelper::HEADERS_NONE
-    */
+    /**
+     * Specifies where the headers are positioned in the
+     * CSV, or turns them off entirely. Use the class constants
+     * to ensure the value is correct.
+     * 
+     * @param string $position
+     * @throws CSVHelper_Exception
+     * @return CSVHelper
+     * @see CSVHelper::HEADERS_LEFT
+     * @see CSVHelper::HEADERS_TOP
+     * @see CSVHelper::HEADERS_NONE
+     */
     public function setHeadersPosition($position)
     {
         $validPositions = array(
@@ -211,13 +211,13 @@ 
         return $this;
     }
     
-   /**
-    * Resets all internal data, allowing to start entirely anew
-    * with a new file, or to start building a new CSV file from
-    * scratch.
-    * 
-    * @return CSVHelper
-    */
+    /**
+     * Resets all internal data, allowing to start entirely anew
+     * with a new file, or to start building a new CSV file from
+     * scratch.
+     * 
+     * @return CSVHelper
+     */
     public function reset()
     {
         $this->data = array();
@@ -234,19 +234,19 @@ 
         return $this->data;
     }
     
-   /**
-    * Retrieves the row at the specified index.
-    * If there is no data at the index, this will
-    * return an array populated with empty strings
-    * for all available columns.
-    * 
-    * Tip: Use the {@link rowExists()} method to check
-    * whether the specified row exists.
-    * 
-    * @param integer $index
-    * @return array()
-    * @see rowExists()
-    */
+    /**
+     * Retrieves the row at the specified index.
+     * If there is no data at the index, this will
+     * return an array populated with empty strings
+     * for all available columns.
+     * 
+     * Tip: Use the {@link rowExists()} method to check
+     * whether the specified row exists.
+     * 
+     * @param integer $index
+     * @return array()
+     * @see rowExists()
+     */
     public function getRow($index)
     {
         if(isset($this->data[$index])) {
@@ -256,63 +256,63 @@ 
         return array_fill(0, $this->rowCount, '');
     }
     
-   /**
-    * Checks whether the specified row exists in the data set.
-    * @param integer $index
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified row exists in the data set.
+     * @param integer $index
+     * @return boolean
+     */
     public function rowExists($index)
     {
         return isset($this->data[$index]);
     }
     
-   /**
-    * Counts the amount of rows in the parsed CSV,
-    * excluding the headers if any, depending on 
-    * their position.
-    * 
-    * @return integer
-    */
+    /**
+     * Counts the amount of rows in the parsed CSV,
+     * excluding the headers if any, depending on 
+     * their position.
+     * 
+     * @return integer
+     */
     public function countRows()
     {
         return $this->rowCount;
     }
     
-   /**
-    * Counts the amount of rows in the parsed CSV, 
-    * excluding the headers if any, depending on
-    * their position.
-    * 
-    * @return integer
-    */
+    /**
+     * Counts the amount of rows in the parsed CSV, 
+     * excluding the headers if any, depending on
+     * their position.
+     * 
+     * @return integer
+     */
     public function countColumns()
     {
         return $this->columnCount;
     }
     
-   /**
-    * Retrieves the headers, if any. Specify the position of the
-    * headers first to ensure this works correctly.
-    * 
-    * @return array Indexed array with header names.
-    */
+    /**
+     * Retrieves the headers, if any. Specify the position of the
+     * headers first to ensure this works correctly.
+     * 
+     * @return array Indexed array with header names.
+     */
     public function getHeaders()
     {
         return $this->headers;
     }
     
-   /**
-    * Retrieves the column at the specified index. If there
-    * is no column at the index, this returns an array
-    * populated with empty strings.
-    * 
-    * Tip: Use the {@link columnExists()} method to check
-    * whether a column exists.
-    * 
-    * @param integer $index
-    * @return string[]
-    * @see columnExists()
-    */
+    /**
+     * Retrieves the column at the specified index. If there
+     * is no column at the index, this returns an array
+     * populated with empty strings.
+     * 
+     * Tip: Use the {@link columnExists()} method to check
+     * whether a column exists.
+     * 
+     * @param integer $index
+     * @return string[]
+     * @see columnExists()
+     */
     public function getColumn($index)
     {
         $data = array();
@@ -328,11 +328,11 @@ 
         return $data;
     }
     
-   /**
-    * Checks whether the specified column exists in the data set.
-    * @param integer $index
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified column exists in the data set.
+     * @param integer $index
+     * @return boolean
+     */
     public function columnExists($index)
     {
         if($index < $this->columnCount) {
@@ -396,22 +396,22 @@ 
         }
     }
     
-   /**
-    * Checks whether any errors have been encountered
-    * while parsing the CSV.
-    * 
-    * @return boolean
-    * @see getErrorMessages()
-    */
+    /**
+     * Checks whether any errors have been encountered
+     * while parsing the CSV.
+     * 
+     * @return boolean
+     * @see getErrorMessages()
+     */
     public function hasErrors()
     {
         return !empty($this->errors);
     }
     
-   /**
-    * Retrieves all error messages.
-    * @return array
-    */
+    /**
+     * Retrieves all error messages.
+     * @return array
+     */
     public function getErrorMessages()
     {
         return $this->errors;

Spacing +14 added lines, -14 removed lines

@@ -166,7 +166,7 @@ 
     
     public function isHeadersPosition($position)
     {
-        if($this->headersPosition === $position) {
+        if ($this->headersPosition === $position) {
             return true;
         }
         
@@ -193,7 +193,7 @@ 
             self::HEADERS_TOP
         );
         
-        if(!in_array($position, $validPositions)) {
+        if (!in_array($position, $validPositions)) {
             throw new CSVHelper_Exception(
                 'Invalid headers position',
                 sprintf(
@@ -249,7 +249,7 @@ 
     */
     public function getRow($index)
     {
-        if(isset($this->data[$index])) {
+        if (isset($this->data[$index])) {
             return $this->data[$index];
         }
         
@@ -316,9 +316,9 @@ 
     public function getColumn($index)
     {
         $data = array();
-        for($i=0; $i < $this->rowCount; $i++) {
+        for ($i = 0; $i < $this->rowCount; $i++) {
             $value = '';
-            if(isset($this->data[$i][$index])) {
+            if (isset($this->data[$i][$index])) {
                 $value = $this->data[$i][$index];
             }
             
@@ -335,7 +335,7 @@ 
     */
     public function columnExists($index)
     {
-        if($index < $this->columnCount) {
+        if ($index < $this->columnCount) {
             return true;
         }
         
@@ -346,7 +346,7 @@ 
     {
         $this->reset();
         
-        if(empty(trim($this->csv))) {
+        if (empty(trim($this->csv))) {
             $this->addError('Tried to parse an empty CSV string.');
             return;
         }
@@ -361,12 +361,12 @@ 
         $parser->delimiter = $this->detectSeparator();
         
         $result = $parser->parse_string(/** @scrutinizer ignore-type */ $this->csv);
-        if(!$result) {
+        if (!$result) {
             $this->addError('The CSV string could not be parsed.');
             return;
         }
         
-        switch($this->headersPosition)
+        switch ($this->headersPosition)
         {
             case self::HEADERS_TOP:
                 $this->headers = array_shift($result);
@@ -375,7 +375,7 @@ 
             case self::HEADERS_LEFT:
                 $keep = array();
                 $total = count($result);
-                for($i=0; $i < $total; $i++) {
+                for ($i = 0; $i < $total; $i++) {
                     $row = $result[$i];
                     $this->headers[] = array_shift($row);
                     $keep[] = $row;
@@ -388,9 +388,9 @@ 
         $this->data = $result;
         $this->rowCount = count($this->data);
         
-        for($i=0; $i < $this->rowCount; $i++) {
+        for ($i = 0; $i < $this->rowCount; $i++) {
             $amount = count($this->data[$i]);
-            if($amount > $this->columnCount) {
+            if ($amount > $this->columnCount) {
                 $this->columnCount = $amount;
             }
         }
@@ -434,8 +434,8 @@ 
             ',,' => ','
         );
         
-        foreach($search as $char => $separator) {
-            if(strstr($this->csv, $char)) {
+        foreach ($search as $char => $separator) {
+            if (strstr($this->csv, $char)) {
                 return $separator;
             }
         }

src/ConvertHelper/EOL.php

Indentation +26 added lines, -26 removed lines

@@ -29,19 +29,19 @@ 
     const TYPE_LF = 'LF';
     const TYPE_CR = 'CR';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $char;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $description;
     
     public function __construct(string $char, string $type, string $description)
@@ -51,33 +51,33 @@ 
         $this->description = $description;
     }
     
-   /**
-    * The actual EOL character.
-    * @return string
-    */
+    /**
+     * The actual EOL character.
+     * @return string
+     */
     public function getCharacter() : string
     {
         return $this->char;
     }
     
-   /**
-    * A more detailed, human readable description of the character.
-    * @return string
-    */
+    /**
+     * A more detailed, human readable description of the character.
+     * @return string
+     */
     public function getDescription() : string
     {
         return $this->description;
     }
     
-   /**
-    * The EOL character type, e.g. "CR+LF", "CR"...
-    * @return string
-    * 
-    * @see ConvertHelper_EOL::TYPE_CR
-    * @see ConvertHelper_EOL::TYPE_CRLF
-    * @see ConvertHelper_EOL::TYPE_LF
-    * @see ConvertHelper_EOL::TYPE_LFCR
-    */
+    /**
+     * The EOL character type, e.g. "CR+LF", "CR"...
+     * @return string
+     * 
+     * @see ConvertHelper_EOL::TYPE_CR
+     * @see ConvertHelper_EOL::TYPE_CRLF
+     * @see ConvertHelper_EOL::TYPE_LF
+     * @see ConvertHelper_EOL::TYPE_LFCR
+     */
     public function getType() : string
     {
         return $this->type;

src/Traits/Optionable.php

Spacing +15 added lines, -15 removed lines

@@ -41,7 +41,7 @@ 
     */
     public function setOption(string $name, $value)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -58,7 +58,7 @@ 
     */
     public function setOptions(array $options)
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
         
@@ -75,13 +75,13 @@ 
     * @param mixed $default The default value to return if the option does not exist.
     * @return mixed
     */
-    public function getOption(string $name, $default=null)
+    public function getOption(string $name, $default = null)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
-        if(isset($this->options[$name])) {
+        if (isset($this->options[$name])) {
             return $this->options[$name];
         }
         
@@ -98,11 +98,11 @@ 
     * @param string $default Used if the option does not exist, is invalid, or empty.
     * @return string
     */
-    public function getStringOption(string $name, string $default='') : string
+    public function getStringOption(string $name, string $default = '') : string
     {
         $value = $this->getOption($name, false);
         
-        if((is_string($value) || is_numeric($value)) && !empty($value)) {
+        if ((is_string($value) || is_numeric($value)) && !empty($value)) {
             return (string)$value;
         }
         
@@ -118,9 +118,9 @@ 
     * @param string $name
     * @return bool
     */
-    public function getBoolOption(string $name, bool $default=false) : bool
+    public function getBoolOption(string $name, bool $default = false) : bool
     {
-        if($this->getOption($name) === true) {
+        if ($this->getOption($name) === true) {
             return true;
         }
         
@@ -136,10 +136,10 @@ 
     * @param int $default
     * @return int
     */
-    public function getIntOption(string $name, int $default=0) : int
+    public function getIntOption(string $name, int $default = 0) : int
     {
         $value = $this->getOption($name);
-        if(ConvertHelper::isInteger($value)) {
+        if (ConvertHelper::isInteger($value)) {
             return (int)$value;
         }
         
@@ -157,7 +157,7 @@ 
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
-        if(is_array($val)) {
+        if (is_array($val)) {
             return $val;
         }
         
@@ -173,7 +173,7 @@ 
     */
     public function hasOption(string $name) : bool
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -186,7 +186,7 @@ 
     */
     public function getOptions() : array
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -240,7 +240,7 @@ 
     * @param mixed $default
     * @return Interface_Optionable
     */
-    function getOption(string $name, $default=null);
+    function getOption(string $name, $default = null);
     
    /**
     * @param array $options

Indentation +100 added lines, -100 removed lines

@@ -26,18 +26,18 @@ 
  */
 trait Traits_Optionable
 {
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $options;
     
-   /**
-    * Sets an option to the specified value. This can be any
-    * kind of variable type, including objects, as needed.
-    * 
-    * @param string $name
-    * @param mixed $value
-    */
+    /**
+     * Sets an option to the specified value. This can be any
+     * kind of variable type, including objects, as needed.
+     * 
+     * @param string $name
+     * @param mixed $value
+     */
     public function setOption(string $name, $value)
     {
         if(!isset($this->options)) {
@@ -48,12 +48,12 @@ 
         return $this;
     }
     
-   /**
-    * Sets a collection of options at once, from an
-    * associative array.
-    * 
-    * @param array $options
-    */
+    /**
+     * Sets a collection of options at once, from an
+     * associative array.
+     * 
+     * @param array $options
+     */
     public function setOptions(array $options)
     {
         foreach($options as $name => $value) {
@@ -63,16 +63,16 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves an option's value.
-    * 
-    * NOTE: Use the specialized type getters to ensure an option
-    * contains the expected type (for ex. getArrayOption()). 
-    * 
-    * @param string $name
-    * @param mixed $default The default value to return if the option does not exist.
-    * @return mixed
-    */
+    /**
+     * Retrieves an option's value.
+     * 
+     * NOTE: Use the specialized type getters to ensure an option
+     * contains the expected type (for ex. getArrayOption()). 
+     * 
+     * @param string $name
+     * @param mixed $default The default value to return if the option does not exist.
+     * @return mixed
+     */
     public function getOption(string $name, $default=null)
     {
         if(!isset($this->options)) {
@@ -86,16 +86,16 @@ 
         return $default;
     }
     
-   /**
-    * Enforces that the option value is a string. Numbers are converted
-    * to string, strings are passed through, and all other types will 
-    * return the default value. The default value is also returned if
-    * the string is empty.
-    * 
-    * @param string $name
-    * @param string $default Used if the option does not exist, is invalid, or empty.
-    * @return string
-    */
+    /**
+     * Enforces that the option value is a string. Numbers are converted
+     * to string, strings are passed through, and all other types will 
+     * return the default value. The default value is also returned if
+     * the string is empty.
+     * 
+     * @param string $name
+     * @param string $default Used if the option does not exist, is invalid, or empty.
+     * @return string
+     */
     public function getStringOption(string $name, string $default='') : string
     {
         $value = $this->getOption($name, false);
@@ -107,15 +107,15 @@ 
         return $default;
     }
     
-   /**
-    * Treats the option value as a boolean value: will return
-    * true if the value actually is a boolean true.
-    * 
-    * NOTE: boolean string representations are not accepted.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Treats the option value as a boolean value: will return
+     * true if the value actually is a boolean true.
+     * 
+     * NOTE: boolean string representations are not accepted.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function getBoolOption(string $name, bool $default=false) : bool
     {
         if($this->getOption($name) === true) {
@@ -125,15 +125,15 @@ 
         return $default;
     }
     
-   /**
-    * Treats the option value as an integer value: will return
-    * valid integer values (also from integer strings), or the
-    * default value otherwise.
-    * 
-    * @param string $name
-    * @param int $default
-    * @return int
-    */
+    /**
+     * Treats the option value as an integer value: will return
+     * valid integer values (also from integer strings), or the
+     * default value otherwise.
+     * 
+     * @param string $name
+     * @param int $default
+     * @return int
+     */
     public function getIntOption(string $name, int $default=0) : int
     {
         $value = $this->getOption($name);
@@ -144,14 +144,14 @@ 
         return $default;
     }
     
-   /**
-    * Treats an option as an array, and returns its value
-    * only if it contains an array - otherwise, an empty
-    * array is returned.
-    * 
-    * @param string $name
-    * @return array
-    */
+    /**
+     * Treats an option as an array, and returns its value
+     * only if it contains an array - otherwise, an empty
+     * array is returned.
+     * 
+     * @param string $name
+     * @return array
+     */
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
@@ -162,13 +162,13 @@ 
         return array();
     }
     
-   /**
-    * Checks whether the specified option exists - even
-    * if it has a NULL value.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Checks whether the specified option exists - even
+     * if it has a NULL value.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function hasOption(string $name) : bool
     {
         if(!isset($this->options)) {
@@ -178,10 +178,10 @@ 
         return array_key_exists($name, $this->options);
     }
     
-   /**
-    * Returns all options in one associative array.
-    * @return array
-    */
+    /**
+     * Returns all options in one associative array.
+     * @return array
+     */
     public function getOptions() : array
     {
         if(!isset($this->options)) {
@@ -191,24 +191,24 @@ 
         return $this->options;
     }
     
-   /**
-    * Checks whether the option's value is the one specified.
-    * 
-    * @param string $name
-    * @param mixed $value
-    * @return bool
-    */
+    /**
+     * Checks whether the option's value is the one specified.
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return bool
+     */
     public function isOption(string $name, $value) : bool
     {
         return $this->getOption($name) === $value;
     }
     
-   /**
-    * Retrieves the default available options as an 
-    * associative array with option name => value pairs.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves the default available options as an 
+     * associative array with option name => value pairs.
+     * 
+     * @return array
+     */
     abstract public function getDefaultOptions() : array;
 }
 
@@ -226,24 +226,24 @@ 
  */
 interface Interface_Optionable
 {
-   /**
-    * @param string $name
-    * @param mixed $value
-    * @return Interface_Optionable
-    */
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @return Interface_Optionable
+     */
     function setOption(string $name, $value);
     
-   /**
-    * @param string $name
-    * @param mixed $default
-    * @return Interface_Optionable
-    */
+    /**
+     * @param string $name
+     * @param mixed $default
+     * @return Interface_Optionable
+     */
     function getOption(string $name, $default=null);
     
-   /**
-    * @param array $options
-    * @return Interface_Optionable    
-    */
+    /**
+     * @param array $options
+     * @return Interface_Optionable    
+     */
     function setOptions(array $options);
     function getOptions() : array;
     function isOption(string $name, $value) : bool;

src/ImageHelper.php

Braces +4 added lines, -8 removed lines

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

Indentation +435 added lines, -435 removed lines

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

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/ConvertHelper.php

Braces +2 added lines, -4 removed lines

@@ -181,8 +181,7 @@ 
          if($datefrom instanceof \DateTime)
          {
              $converter->setDateFrom($datefrom);
-         }
-         else
+         } else
          {
              $converter->setDateFrom(self::timestamp2date($datefrom)); 
          }
@@ -190,8 +189,7 @@ 
          if($dateto instanceof \DateTime)
          {
              $converter->setDateTo($dateto);
-         }
-         else if($dateto > 0)
+         } else if($dateto > 0)
          {
              $converter->setDateTo(self::timestamp2date($dateto));
          }

Indentation +453 added lines, -453 removed lines

@@ -162,41 +162,41 @@ 
         return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last;
     }
 
-   /**
-    * Converts a timestamp into an easily understandable
-    * format, e.g. "2 hours", "1 day", "3 months"
-    *
-    * If you set the date to parameter, the difference
-    * will be calculated between the two dates and not
-    * the current time.
-    *
-    * @param integer|\DateTime $datefrom
-    * @param integer|\DateTime $dateto
-    * @return string
-    */
+    /**
+     * Converts a timestamp into an easily understandable
+     * format, e.g. "2 hours", "1 day", "3 months"
+     *
+     * If you set the date to parameter, the difference
+     * will be calculated between the two dates and not
+     * the current time.
+     *
+     * @param integer|\DateTime $datefrom
+     * @param integer|\DateTime $dateto
+     * @return string
+     */
     public static function duration2string($datefrom, $dateto = -1) : string
     {
-         $converter = new ConvertHelper_DurationConverter();
+            $converter = new ConvertHelper_DurationConverter();
          
-         if($datefrom instanceof \DateTime)
-         {
-             $converter->setDateFrom($datefrom);
-         }
-         else
-         {
-             $converter->setDateFrom(self::timestamp2date($datefrom)); 
-         }
+            if($datefrom instanceof \DateTime)
+            {
+                $converter->setDateFrom($datefrom);
+            }
+            else
+            {
+                $converter->setDateFrom(self::timestamp2date($datefrom)); 
+            }
 
-         if($dateto instanceof \DateTime)
-         {
-             $converter->setDateTo($dateto);
-         }
-         else if($dateto > 0)
-         {
-             $converter->setDateTo(self::timestamp2date($dateto));
-         }
+            if($dateto instanceof \DateTime)
+            {
+                $converter->setDateTo($dateto);
+            }
+            else if($dateto > 0)
+            {
+                $converter->setDateTo(self::timestamp2date($dateto));
+            }
 
-         return $converter->convert();
+            return $converter->convert();
     }
 
     /**
@@ -235,44 +235,44 @@ 
         return $geshi->parse_code();
     }
     
-   /**
-    * Converts a number of bytes to a human readable form,
-    * e.g. xx Kb / xx Mb / xx Gb
-    *
-    * @param int $bytes The amount of bytes to convert.
-    * @param int $precision The amount of decimals
-    * @param int $base The base to calculate with: Base 10 is default (=1000 Bytes in a KB), Base 2 is mainly used for Windows memory (=1024 Bytes in a KB).
-    * @return string
-    * 
-    * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
-    */
+    /**
+     * Converts a number of bytes to a human readable form,
+     * e.g. xx Kb / xx Mb / xx Gb
+     *
+     * @param int $bytes The amount of bytes to convert.
+     * @param int $precision The amount of decimals
+     * @param int $base The base to calculate with: Base 10 is default (=1000 Bytes in a KB), Base 2 is mainly used for Windows memory (=1024 Bytes in a KB).
+     * @return string
+     * 
+     * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
+     */
     public static function bytes2readable(int $bytes, int $precision = 1, int $base = ConvertHelper_StorageSizeEnum::BASE_10) : string
     {
         return self::parseBytes($bytes)->toString($precision, $base);
     }
     
-   /**
-    * Parses a number of bytes, and creates a converter instance which
-    * allows doing common operations with it.
-    * 
-    * @param int $bytes
-    * @return ConvertHelper_ByteConverter
-    */
+    /**
+     * Parses a number of bytes, and creates a converter instance which
+     * allows doing common operations with it.
+     * 
+     * @param int $bytes
+     * @return ConvertHelper_ByteConverter
+     */
     public static function parseBytes(int $bytes) : ConvertHelper_ByteConverter
     {
         return new ConvertHelper_ByteConverter($bytes);
     }
 
-   /**
-    * Cuts a text to the specified length if it is longer than the
-    * target length. Appends a text to signify it has been cut at 
-    * the end of the string.
-    * 
-    * @param string $text
-    * @param int $targetLength
-    * @param string $append
-    * @return string
-    */
+    /**
+     * Cuts a text to the specified length if it is longer than the
+     * target length. Appends a text to signify it has been cut at 
+     * the end of the string.
+     * 
+     * @param string $text
+     * @param int $targetLength
+     * @param string $append
+     * @return string
+     */
     public static function text_cut(string $text, int $targetLength, string $append = '...') : string
     {
         $length = mb_strlen($text);
@@ -296,14 +296,14 @@ 
         return $info->toString();
     }
     
-   /**
-    * Pretty print_r.
-    * 
-    * @param mixed $var The variable to dump.
-    * @param bool $return Whether to return the dumped code.
-    * @param bool $html Whether to style the dump as HTML.
-    * @return string
-    */
+    /**
+     * Pretty print_r.
+     * 
+     * @param mixed $var The variable to dump.
+     * @param bool $return Whether to return the dumped code.
+     * @param bool $html Whether to style the dump as HTML.
+     * @return string
+     */
     public static function print_r($var, bool $return=false, bool $html=true) : string
     {
         $result = parseVariable($var)->enableType()->toString();
@@ -333,15 +333,15 @@ 
         'no' => false
     );
 
-   /**
-    * Converts a string, number or boolean value to a boolean value.
-    * 
-    * @param string|number|bool $string
-    * @throws ConvertHelper_Exception
-    * @return bool
-    * 
-    * @see ConvertHelper::ERROR_INVALID_BOOLEAN_STRING
-    */
+    /**
+     * Converts a string, number or boolean value to a boolean value.
+     * 
+     * @param string|number|bool $string
+     * @throws ConvertHelper_Exception
+     * @return bool
+     * 
+     * @see ConvertHelper::ERROR_INVALID_BOOLEAN_STRING
+     */
     public static function string2bool($string) : bool
     {
         if($string === '' || $string === null || !is_scalar($string)) 
@@ -369,27 +369,27 @@ 
         );
     }
     
-   /**
-    * Whether the specified string is a boolean string or boolean value.
-    * Alias for {@link ConvertHelper::isBoolean()}.
-    * 
-    * @param mixed $string
-    * @return bool
-    * @deprecated
-    * @see ConvertHelper::isBoolean()
-    */
+    /**
+     * Whether the specified string is a boolean string or boolean value.
+     * Alias for {@link ConvertHelper::isBoolean()}.
+     * 
+     * @param mixed $string
+     * @return bool
+     * @deprecated
+     * @see ConvertHelper::isBoolean()
+     */
     public static function isBooleanString($string) : bool
     {
         return self::isBoolean($string);
     }
 
-   /**
-    * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
-    * 
-    * @param string $text
-    * @return string
-    * @deprecated
-    */
+    /**
+     * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
+     * 
+     * @param string $text
+     * @return string
+     * @deprecated
+     */
     public static function text_makeXMLCompliant($text)
     {
         return XMLHelper::string2xml($text);
@@ -491,13 +491,13 @@ 
         return $translit->convert($string);
     }
     
-   /**
-    * Retrieves the HEX character codes for all control
-    * characters that the {@link stripControlCharacters()} 
-    * method will remove.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves the HEX character codes for all control
+     * characters that the {@link stripControlCharacters()} 
+     * method will remove.
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsHex()
     {
         $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
@@ -533,13 +533,13 @@ 
         return $stack;
     }
     
-   /**
-    * Retrieves an array of all control characters that
-    * the {@link stripControlCharacters()} method will 
-    * remove, as the actual UTF-8 characters.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves an array of all control characters that
+     * the {@link stripControlCharacters()} method will 
+     * remove, as the actual UTF-8 characters.
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsUTF8()
     {
         $chars = self::getControlCharactersAsHex();
@@ -552,12 +552,12 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves all control characters as JSON encoded
-    * characters, e.g. "\u200b".
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves all control characters as JSON encoded
+     * characters, e.g. "\u200b".
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsJSON()
     {
         $chars = self::getControlCharactersAsHex();
@@ -614,20 +614,20 @@ 
         return preg_replace(self::$controlCharsRegex, '', $string);
     }
 
-   /**
-    * Converts a unicode character to the PHPO notation.
-    * 
-    * Example:
-    * 
-    * <pre>unicodeChar2php('"\u0000"')</pre>
-    * 
-    * Returns
-    * 
-    * <pre>\x0</pre>
-    * 
-    * @param string $unicodeChar
-    * @return string
-    */
+    /**
+     * Converts a unicode character to the PHPO notation.
+     * 
+     * Example:
+     * 
+     * <pre>unicodeChar2php('"\u0000"')</pre>
+     * 
+     * Returns
+     * 
+     * <pre>\x0</pre>
+     * 
+     * @param string $unicodeChar
+     * @return string
+     */
     public static function unicodeChar2php($unicodeChar) 
     {
         $unicodeChar = json_decode($unicodeChar);
@@ -750,25 +750,25 @@ 
         return 'false';
     }
     
-   /**
-    * Converts an associative array with attribute name > value pairs
-    * to an attribute string that can be used in an HTML tag. Empty 
-    * attribute values are ignored.
-    * 
-    * Example:
-    * 
-    * array2attributeString(array(
-    *     'id' => 45,
-    *     'href' => 'http://www.mistralys.com'
-    * ));
-    * 
-    * Result:
-    * 
-    * id="45" href="http://www.mistralys.com"
-    * 
-    * @param array $array
-    * @return string
-    */
+    /**
+     * Converts an associative array with attribute name > value pairs
+     * to an attribute string that can be used in an HTML tag. Empty 
+     * attribute values are ignored.
+     * 
+     * Example:
+     * 
+     * array2attributeString(array(
+     *     'id' => 45,
+     *     'href' => 'http://www.mistralys.com'
+     * ));
+     * 
+     * Result:
+     * 
+     * id="45" href="http://www.mistralys.com"
+     * 
+     * @param array $array
+     * @return string
+     */
     public static function array2attributeString($array)
     {
         $tokens = array();
@@ -787,14 +787,14 @@ 
         return ' '.implode(' ', $tokens);
     }
     
-   /**
-    * Converts a string so it can safely be used in a javascript
-    * statement in an HTML tag: uses single quotes around the string
-    * and encodes all special characters as needed.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Converts a string so it can safely be used in a javascript
+     * statement in an HTML tag: uses single quotes around the string
+     * and encodes all special characters as needed.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2attributeJS($string, $quoted=true)
     {
         $converted = addslashes(htmlspecialchars(strip_tags($string), ENT_QUOTES, 'UTF-8'));
@@ -805,15 +805,15 @@ 
         return $converted;
     }
     
-   /**
-    * Checks if the specified string is a boolean value, which
-    * includes string representations of boolean values, like 
-    * <code>yes</code> or <code>no</code>, and <code>true</code>
-    * or <code>false</code>.
-    * 
-    * @param mixed $value
-    * @return boolean
-    */
+    /**
+     * Checks if the specified string is a boolean value, which
+     * includes string representations of boolean values, like 
+     * <code>yes</code> or <code>no</code>, and <code>true</code>
+     * or <code>false</code>.
+     * 
+     * @param mixed $value
+     * @return boolean
+     */
     public static function isBoolean($value) : bool
     {
         if(is_bool($value)) {
@@ -827,12 +827,12 @@ 
         return array_key_exists($value, self::$booleanStrings);
     }
     
-   /**
-    * Converts an associative array to an HTML style attribute value string.
-    * 
-    * @param array $subject
-    * @return string
-    */
+    /**
+     * Converts an associative array to an HTML style attribute value string.
+     * 
+     * @param array $subject
+     * @return string
+     */
     public static function array2styleString(array $subject) : string
     {
         $tokens = array();
@@ -843,23 +843,23 @@ 
         return implode(';', $tokens);
     }
     
-   /**
-    * Converts a DateTime object to a timestamp, which
-    * is PHP 5.2 compatible.
-    * 
-    * @param \DateTime $date
-    * @return integer
-    */
+    /**
+     * Converts a DateTime object to a timestamp, which
+     * is PHP 5.2 compatible.
+     * 
+     * @param \DateTime $date
+     * @return integer
+     */
     public static function date2timestamp(\DateTime $date) : int
     {
         return (int)$date->format('U');
     }
     
-   /**
-    * Converts a timestamp into a DateTime instance.
-    * @param int $timestamp
-    * @return \DateTime
-    */
+    /**
+     * Converts a timestamp into a DateTime instance.
+     * @param int $timestamp
+     * @return \DateTime
+     */
     public static function timestamp2date(int $timestamp) : \DateTime
     {
         $date = new \DateTime();
@@ -867,50 +867,50 @@ 
         return $date;
     }
     
-   /**
-    * Strips an absolute path to a file within the application
-    * to make the path relative to the application root path.
-    * 
-    * @param string $path
-    * @return string
-    * 
-    * @see FileHelper::relativizePath()
-    * @see FileHelper::relativizePathByDepth()
-    */
+    /**
+     * Strips an absolute path to a file within the application
+     * to make the path relative to the application root path.
+     * 
+     * @param string $path
+     * @return string
+     * 
+     * @see FileHelper::relativizePath()
+     * @see FileHelper::relativizePathByDepth()
+     */
     public static function fileRelativize(string $path) : string
     {
         return FileHelper::relativizePathByDepth($path);
     }
     
     /**
-    * Converts a PHP regex to a javascript RegExp object statement.
-    * 
-    * NOTE: This is an alias for the JSHelper's `convertRegex` method. 
-    * More details are available on its usage there.
-    *
-    * @param string $regex A PHP preg regex
-    * @param string $statementType The type of statement to return: Defaults to a statement to create a RegExp object.
-    * @return array|string Depending on the specified return type.
-    * 
-    * @see JSHelper::buildRegexStatement()
-    */
+     * Converts a PHP regex to a javascript RegExp object statement.
+     * 
+     * NOTE: This is an alias for the JSHelper's `convertRegex` method. 
+     * More details are available on its usage there.
+     *
+     * @param string $regex A PHP preg regex
+     * @param string $statementType The type of statement to return: Defaults to a statement to create a RegExp object.
+     * @return array|string Depending on the specified return type.
+     * 
+     * @see JSHelper::buildRegexStatement()
+     */
     public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT)
     {
         return JSHelper::buildRegexStatement($regex, $statementType);
     }
     
-   /**
-    * Converts the specified variable to JSON. Works just
-    * like the native `json_encode` method, except that it
-    * will trigger an exception on failure, which has the 
-    * json error details included in its developer details.
-    * 
-    * @param mixed $variable
-    * @param int $options JSON encode options.
-    * @param int $depth 
-    * @throws ConvertHelper_Exception
-    * @return string
-    */
+    /**
+     * Converts the specified variable to JSON. Works just
+     * like the native `json_encode` method, except that it
+     * will trigger an exception on failure, which has the 
+     * json error details included in its developer details.
+     * 
+     * @param mixed $variable
+     * @param int $options JSON encode options.
+     * @param int $depth 
+     * @throws ConvertHelper_Exception
+     * @return string
+     */
     public static function var2json($variable, int $options=0, int $depth=512) : string
     {
         $result = json_encode($variable, $options, $depth);
@@ -931,12 +931,12 @@ 
         );
     }
     
-   /**
-    * Strips all known UTF byte order marks from the specified string.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Strips all known UTF byte order marks from the specified string.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function stripUTFBom($string)
     {
         $boms = FileHelper::getUTFBOMs();
@@ -951,13 +951,13 @@ 
         return $string;
     }
 
-   /**
-    * Converts a string to valid utf8, regardless
-    * of the string's encoding(s).
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Converts a string to valid utf8, regardless
+     * of the string's encoding(s).
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2utf8($string)
     {
         if(!self::isStringASCII($string)) {
@@ -967,15 +967,15 @@ 
         return $string;
     }
     
-   /**
-    * Checks whether the specified string is an ASCII
-    * string, without any special or UTF8 characters.
-    * Note: empty strings and NULL are considered ASCII.
-    * Any variable types other than strings are not.
-    * 
-    * @param mixed $string
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified string is an ASCII
+     * string, without any special or UTF8 characters.
+     * Note: empty strings and NULL are considered ASCII.
+     * Any variable types other than strings are not.
+     * 
+     * @param mixed $string
+     * @return boolean
+     */
     public static function isStringASCII($string) : bool
     {
         if($string === '' || $string === NULL) {
@@ -1000,22 +1000,22 @@ 
         return $url;
     }
 
-   /**
-    * Calculates a percentage match of the source string with the target string.
-    * 
-    * Options are:
-    * 
-    * - maxLevenshtein, default: 10
-    *   Any levenshtein results above this value are ignored.
-    *   
-    * - precision, default: 1
-    *   The precision of the percentage float value
-    * 
-    * @param string $source
-    * @param string $target
-    * @param array $options
-    * @return float
-    */
+    /**
+     * Calculates a percentage match of the source string with the target string.
+     * 
+     * Options are:
+     * 
+     * - maxLevenshtein, default: 10
+     *   Any levenshtein results above this value are ignored.
+     *   
+     * - precision, default: 1
+     *   The precision of the percentage float value
+     * 
+     * @param string $source
+     * @param string $target
+     * @param array $options
+     * @return float
+     */
     public static function matchString($source, $target, $options=array())
     {
         $defaults = array(
@@ -1039,14 +1039,14 @@ 
         return round(100 - $percent, $options['precision']);
     }
     
-   /**
-    * Converts a date interval to a human readable string with
-    * all necessary time components, e.g. "1 year, 2 months and 4 days".
-    * 
-    * @param \DateInterval $interval
-    * @return string
-    * @see ConvertHelper_IntervalConverter
-    */
+    /**
+     * Converts a date interval to a human readable string with
+     * all necessary time components, e.g. "1 year, 2 months and 4 days".
+     * 
+     * @param \DateInterval $interval
+     * @return string
+     * @see ConvertHelper_IntervalConverter
+     */
     public static function interval2string(\DateInterval $interval) : string
     {
         $converter = new ConvertHelper_IntervalConverter();
@@ -1061,60 +1061,60 @@ 
     
     const INTERVAL_SECONDS = 'seconds';
     
-   /**
-    * Converts an interval to its total amount of days.
-    * @param \DateInterval $interval
-    * @return int
-    */
+    /**
+     * Converts an interval to its total amount of days.
+     * @param \DateInterval $interval
+     * @return int
+     */
     public static function interval2days(\DateInterval $interval) : int
     {
         return self::interval2total($interval, self::INTERVAL_DAYS);
     }
 
-   /**
-    * Converts an interval to its total amount of hours.
-    * @param \DateInterval $interval
-    * @return int
-    */
+    /**
+     * Converts an interval to its total amount of hours.
+     * @param \DateInterval $interval
+     * @return int
+     */
     public static function interval2hours(\DateInterval $interval) : int
     {
         return self::interval2total($interval, self::INTERVAL_HOURS);
     }
     
-   /**
-    * Converts an interval to its total amount of minutes. 
-    * @param \DateInterval $interval
-    * @return int
-    */
+    /**
+     * Converts an interval to its total amount of minutes. 
+     * @param \DateInterval $interval
+     * @return int
+     */
     public static function interval2minutes(\DateInterval $interval) : int
     {
         return self::interval2total($interval, self::INTERVAL_MINUTES);
     }
     
-   /**
-    * Converts an interval to its total amount of seconds.
-    * @param \DateInterval $interval
-    * @return int
-    */    
+    /**
+     * Converts an interval to its total amount of seconds.
+     * @param \DateInterval $interval
+     * @return int
+     */    
     public static function interval2seconds(\DateInterval $interval) : int
     {
         return self::interval2total($interval, self::INTERVAL_SECONDS);
     }
     
-   /**
-    * Calculates the total amount of days / hours / minutes or seconds
-    * of a date interval object (depending in the specified units), and 
-    * returns the total amount.
-    * 
-    * @param \DateInterval $interval
-    * @param string $unit What total value to calculate.
-    * @return integer
-    * 
-    * @see ConvertHelper::INTERVAL_SECONDS
-    * @see ConvertHelper::INTERVAL_MINUTES
-    * @see ConvertHelper::INTERVAL_HOURS
-    * @see ConvertHelper::INTERVAL_DAYS
-    */
+    /**
+     * Calculates the total amount of days / hours / minutes or seconds
+     * of a date interval object (depending in the specified units), and 
+     * returns the total amount.
+     * 
+     * @param \DateInterval $interval
+     * @param string $unit What total value to calculate.
+     * @return integer
+     * 
+     * @see ConvertHelper::INTERVAL_SECONDS
+     * @see ConvertHelper::INTERVAL_MINUTES
+     * @see ConvertHelper::INTERVAL_HOURS
+     * @see ConvertHelper::INTERVAL_DAYS
+     */
     public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS) : int
     {
         $total = (int)$interval->format('%a');
@@ -1154,13 +1154,13 @@ 
         'Sunday'
     );
     
-   /**
-    * Converts a date to the corresponding day name.
-    * 
-    * @param \DateTime $date
-    * @param bool $short
-    * @return string|NULL
-    */
+    /**
+     * Converts a date to the corresponding day name.
+     * 
+     * @param \DateTime $date
+     * @param bool $short
+     * @return string|NULL
+     */
     public static function date2dayName(\DateTime $date, bool $short=false)
     {
         $day = $date->format('l');
@@ -1175,21 +1175,21 @@ 
         return null;
     }
     
-   /**
-    * Retrieves a list of english day names.
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of english day names.
+     * @return string[]
+     */
     public static function getDayNamesInvariant()
     {
         return self::$daysInvariant;
     }
     
-   /**
-    * Retrieves the day names list for the current locale.
-    * 
-    * @param bool $short
-    * @return array
-    */
+    /**
+     * Retrieves the day names list for the current locale.
+     * 
+     * @param bool $short
+     * @return array
+     */
     public static function getDayNames(bool $short=false) : array
     {
         if($short) {
@@ -1249,16 +1249,16 @@ 
         return $last;
     }
     
-   /**
-    * Splits a string into an array of all characters it is composed of.
-    * Unicode character safe.
-    * 
-    * NOTE: Spaces and newlines (both \r and \n) are also considered single
-    * characters.
-    * 
-    * @param string $string
-    * @return array
-    */
+    /**
+     * Splits a string into an array of all characters it is composed of.
+     * Unicode character safe.
+     * 
+     * NOTE: Spaces and newlines (both \r and \n) are also considered single
+     * characters.
+     * 
+     * @param string $string
+     * @return array
+     */
     public static function string2array(string $string) : array
     {
         $result = preg_split('//u', $string, null, PREG_SPLIT_NO_EMPTY);
@@ -1269,12 +1269,12 @@ 
         return array();
     }
     
-   /**
-    * Checks whether the specified string contains HTML code.
-    * 
-    * @param string $string
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified string contains HTML code.
+     * 
+     * @param string $string
+     * @return boolean
+     */
     public static function isStringHTML(string $string) : bool
     {
         if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
@@ -1289,17 +1289,17 @@ 
         return false;
     }
     
-   /**
-    * UTF8-safe wordwrap method: works like the regular wordwrap
-    * PHP function but compatible with UTF8. Otherwise the lengths
-    * are not calculated correctly.
-    * 
-    * @param string $str
-    * @param int $width
-    * @param string $break
-    * @param bool $cut
-    * @return string
-    */
+    /**
+     * UTF8-safe wordwrap method: works like the regular wordwrap
+     * PHP function but compatible with UTF8. Otherwise the lengths
+     * are not calculated correctly.
+     * 
+     * @param string $str
+     * @param int $width
+     * @param string $break
+     * @param bool $cut
+     * @return string
+     */
     public static function wordwrap(string $str, int $width = 75, string $break = "\n", bool $cut = false) : string 
     {
         $wrapper = new ConvertHelper_WordWrapper();
@@ -1311,27 +1311,27 @@ 
         ->wrapText($str);
     }
     
-   /**
-    * Calculates the byte length of a string, taking into 
-    * account any unicode characters.
-    * 
-    * @param string $string
-    * @return int
-    * @see https://stackoverflow.com/a/9718273/2298192
-    */
+    /**
+     * Calculates the byte length of a string, taking into 
+     * account any unicode characters.
+     * 
+     * @param string $string
+     * @return int
+     * @see https://stackoverflow.com/a/9718273/2298192
+     */
     public static function string2bytes($string)
     {
         return mb_strlen($string, '8bit');
     }
     
-   /**
-    * Creates a short, 8-character long hash for the specified string.
-    * 
-    * WARNING: Not cryptographically safe.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Creates a short, 8-character long hash for the specified string.
+     * 
+     * WARNING: Not cryptographically safe.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2shortHash($string)
     {
         return hash('crc32', $string, false);
@@ -1357,40 +1357,40 @@ 
         return ConvertHelper_ThrowableInfo::fromThrowable($e);
     }
     
-   /**
-    * Parses the specified query string like the native 
-    * function <code>parse_str</code>, without the key
-    * naming limitations.
-    * 
-    * Using parse_str, dots or spaces in key names are 
-    * replaced by underscores. This method keeps all names
-    * intact.
-    * 
-    * It still uses the parse_str implementation as it 
-    * is tested and tried, but fixes the parameter names
-    * after parsing, as needed.
-    * 
-    * @param string $queryString
-    * @return array
-    * @see ConvertHelper_QueryParser
-    */
+    /**
+     * Parses the specified query string like the native 
+     * function <code>parse_str</code>, without the key
+     * naming limitations.
+     * 
+     * Using parse_str, dots or spaces in key names are 
+     * replaced by underscores. This method keeps all names
+     * intact.
+     * 
+     * It still uses the parse_str implementation as it 
+     * is tested and tried, but fixes the parameter names
+     * after parsing, as needed.
+     * 
+     * @param string $queryString
+     * @return array
+     * @see ConvertHelper_QueryParser
+     */
     public static function parseQueryString(string $queryString) : array
     {
         $parser = new ConvertHelper_QueryParser();
         return $parser->parse($queryString);
     }
 
-   /**
-    * Searches for needle in the specified string, and returns a list
-    * of all occurrences, including the matched string. The matched 
-    * string is useful when doing a case insensitive search, as it 
-    * shows the exact matched case of needle.
-    *   
-    * @param string $needle
-    * @param string $haystack
-    * @param bool $caseInsensitive
-    * @return ConvertHelper_StringMatch[]
-    */
+    /**
+     * Searches for needle in the specified string, and returns a list
+     * of all occurrences, including the matched string. The matched 
+     * string is useful when doing a case insensitive search, as it 
+     * shows the exact matched case of needle.
+     *   
+     * @param string $needle
+     * @param string $haystack
+     * @param bool $caseInsensitive
+     * @return ConvertHelper_StringMatch[]
+     */
     public static function findString(string $needle, string $haystack, bool $caseInsensitive=false)
     {
         if($needle === '') {
@@ -1416,14 +1416,14 @@ 
         return $positions;
     }
     
-   /**
-    * Like explode, but trims all entries, and removes 
-    * empty entries from the resulting array.
-    * 
-    * @param string $delimiter
-    * @param string $string
-    * @return string[]
-    */
+    /**
+     * Like explode, but trims all entries, and removes 
+     * empty entries from the resulting array.
+     * 
+     * @param string $delimiter
+     * @param string $string
+     * @return string[]
+     */
     public static function explodeTrim(string $delimiter, string $string) : array
     {
         if(empty($string) || empty($delimiter)) {
@@ -1445,12 +1445,12 @@ 
     
     protected static $eolChars;
 
-   /**
-    * Detects the most used end-of-line character in the subject string.
-    * 
-    * @param string $subjectString The string to check.
-    * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
-    */
+    /**
+     * Detects the most used end-of-line character in the subject string.
+     * 
+     * @param string $subjectString The string to check.
+     * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
+     */
     public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL
     {
         if(empty($subjectString)) {
@@ -1462,27 +1462,27 @@ 
             $cr = chr((int)hexdec('0d'));
             $lf = chr((int)hexdec('0a'));
             
-           self::$eolChars = array(
-               array(
-                   'char' => $cr.$lf,
-                   'type' => ConvertHelper_EOL::TYPE_CRLF,
-                   'description' => t('Carriage return followed by a line feed'),
-               ),
-               array(
-                   'char' => $lf.$cr,
-                   'type' => ConvertHelper_EOL::TYPE_LFCR,
-                   'description' => t('Line feed followed by a carriage return'),
-               ),
-               array(
-                  'char' => $lf,
-                  'type' => ConvertHelper_EOL::TYPE_LF,
-                  'description' => t('Line feed'),
-               ),
-               array(
-                  'char' => $cr,
-                  'type' => ConvertHelper_EOL::TYPE_CR,
-                  'description' => t('Carriage Return'),
-               ),
+            self::$eolChars = array(
+                array(
+                    'char' => $cr.$lf,
+                    'type' => ConvertHelper_EOL::TYPE_CRLF,
+                    'description' => t('Carriage return followed by a line feed'),
+                ),
+                array(
+                    'char' => $lf.$cr,
+                    'type' => ConvertHelper_EOL::TYPE_LFCR,
+                    'description' => t('Line feed followed by a carriage return'),
+                ),
+                array(
+                    'char' => $lf,
+                    'type' => ConvertHelper_EOL::TYPE_LF,
+                    'description' => t('Line feed'),
+                ),
+                array(
+                    'char' => $cr,
+                    'type' => ConvertHelper_EOL::TYPE_CR,
+                    'description' => t('Carriage Return'),
+                ),
             );
         }
         
@@ -1510,13 +1510,13 @@ 
         );
     }
 
-   /**
-    * Removes the specified keys from the target array,
-    * if they exist.
-    * 
-    * @param array $array
-    * @param array $keys
-    */
+    /**
+     * Removes the specified keys from the target array,
+     * if they exist.
+     * 
+     * @param array $array
+     * @param array $keys
+     */
     public static function arrayRemoveKeys(array &$array, array $keys) : void
     {
         foreach($keys as $key) 
@@ -1527,13 +1527,13 @@ 
         }
     }
     
-   /**
-    * Checks if the specified variable is an integer or a string containing an integer.
-    * Accepts both positive and negative integers.
-    * 
-    * @param mixed $value
-    * @return bool
-    */
+    /**
+     * Checks if the specified variable is an integer or a string containing an integer.
+     * Accepts both positive and negative integers.
+     * 
+     * @param mixed $value
+     * @return bool
+     */
     public static function isInteger($value) : bool
     {
         if(is_int($value)) {
@@ -1553,40 +1553,40 @@ 
         return false;    
     }
     
-   /**
-    * Converts an amount of seconds to a DateInterval object.
-    * 
-    * @param int $seconds
-    * @return \DateInterval
-    * @throws ConvertHelper_Exception If the date interval cannot be created.
-    * 
-    * @see ConvertHelper::ERROR_CANNOT_GET_DATE_DIFF
-    */
+    /**
+     * Converts an amount of seconds to a DateInterval object.
+     * 
+     * @param int $seconds
+     * @return \DateInterval
+     * @throws ConvertHelper_Exception If the date interval cannot be created.
+     * 
+     * @see ConvertHelper::ERROR_CANNOT_GET_DATE_DIFF
+     */
     public static function seconds2interval(int $seconds) : \DateInterval
     {
         return ConvertHelper_DateInterval::fromSeconds($seconds)->getInterval();
     }
     
-   /**
-    * Converts a size string like "50 MB" to the corresponding byte size.
-    * It is case insensitive, ignores spaces, and supports both traditional
-    * "MB" and "MiB" notations.
-    * 
-    * @param string $size
-    * @return int
-    */
+    /**
+     * Converts a size string like "50 MB" to the corresponding byte size.
+     * It is case insensitive, ignores spaces, and supports both traditional
+     * "MB" and "MiB" notations.
+     * 
+     * @param string $size
+     * @return int
+     */
     public static function size2bytes(string $size) : int
     {
         return self::parseSize($size)->toBytes();
     }
     
-   /**
-    * Parses a size string like "50 MB" and returns a size notation instance
-    * that has utility methods to access information on it, and convert it.
-    * 
-    * @param string $size
-    * @return ConvertHelper_SizeNotation
-    */
+    /**
+     * Parses a size string like "50 MB" and returns a size notation instance
+     * that has utility methods to access information on it, and convert it.
+     * 
+     * @param string $size
+     * @return ConvertHelper_SizeNotation
+     */
     public static function parseSize(string $size) : ConvertHelper_SizeNotation
     {
         return new ConvertHelper_SizeNotation($size);

Spacing +92 added lines, -92 removed lines

@@ -59,7 +59,7 @@ 
             $amount = substr_count($line, "\t") - $min;
             $line = trim($line);
             if ($amount >= 1) {
-                $line = str_repeat("\t", $amount) . $line;
+                $line = str_repeat("\t", $amount).$line;
             }
 
             $converted[] = $line;
@@ -131,10 +131,10 @@ 
 
         // specifically handle zero
         if ($seconds <= 0) {
-            return '0 ' . t('seconds');
+            return '0 '.t('seconds');
         }
         
-        if($seconds < 1) {
+        if ($seconds < 1) {
             return t('less than a second');
         }
 
@@ -142,7 +142,7 @@ 
         foreach ($units as $def) {
             $quot = intval($seconds / $def['value']);
             if ($quot) {
-                $item = $quot . ' ';
+                $item = $quot.' ';
                 if (abs($quot) > 1) {
                     $item .= $def['plural'];
                 } else {
@@ -159,7 +159,7 @@ 
             return $last;
         }
 
-        return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last;
+        return implode(', ', $tokens).' '.t('and').' '.$last;
     }
 
    /**
@@ -178,7 +178,7 @@ 
     {
          $converter = new ConvertHelper_DurationConverter();
          
-         if($datefrom instanceof \DateTime)
+         if ($datefrom instanceof \DateTime)
          {
              $converter->setDateFrom($datefrom);
          }
@@ -187,11 +187,11 @@ 
              $converter->setDateFrom(self::timestamp2date($datefrom)); 
          }
 
-         if($dateto instanceof \DateTime)
+         if ($dateto instanceof \DateTime)
          {
              $converter->setDateTo($dateto);
          }
-         else if($dateto > 0)
+         else if ($dateto > 0)
          {
              $converter->setDateTo(self::timestamp2date($dateto));
          }
@@ -211,9 +211,9 @@ 
         return $geshi->parse_code();
     }
     
-    public static function highlight_xml($xml, $formatSource=false)
+    public static function highlight_xml($xml, $formatSource = false)
     {
-        if($formatSource) 
+        if ($formatSource) 
         {
             $dom = new \DOMDocument();
             $dom->loadXML($xml);
@@ -280,16 +280,16 @@ 
             return $text;
         }
 
-        $text = trim(mb_substr($text, 0, $targetLength)) . $append;
+        $text = trim(mb_substr($text, 0, $targetLength)).$append;
 
         return $text;
     }
 
-    public static function var_dump($var, $html=true) : string
+    public static function var_dump($var, $html = true) : string
     {
         $info = parseVariable($var);
         
-        if($html) {
+        if ($html) {
             return $info->toHTML();
         }
         
@@ -304,11 +304,11 @@ 
     * @param bool $html Whether to style the dump as HTML.
     * @return string
     */
-    public static function print_r($var, bool $return=false, bool $html=true) : string
+    public static function print_r($var, bool $return = false, bool $html = true) : string
     {
         $result = parseVariable($var)->enableType()->toString();
         
-        if($html) 
+        if ($html) 
         {
             $result = 
             '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'.
@@ -316,7 +316,7 @@ 
             '</pre>';
         }
         
-        if(!$return) 
+        if (!$return) 
         {
             echo $result;
         }
@@ -344,17 +344,17 @@ 
     */
     public static function string2bool($string) : bool
     {
-        if($string === '' || $string === null || !is_scalar($string)) 
+        if ($string === '' || $string === null || !is_scalar($string)) 
         {
             return false;
         }
         
-        if(is_bool($string)) 
+        if (is_bool($string)) 
         {
             return $string;
         }
 
-        if(array_key_exists($string, self::$booleanStrings)) 
+        if (array_key_exists($string, self::$booleanStrings)) 
         {
             return self::$booleanStrings[$string];
         }
@@ -409,10 +409,10 @@ 
     public static function date2listLabel(\DateTime $date, $includeTime = false, $shortMonth = false)
     {
         $today = new \DateTime();
-        if($date->format('d.m.Y') == $today->format('d.m.Y')) {
+        if ($date->format('d.m.Y') == $today->format('d.m.Y')) {
             $label = t('Today');
         } else {
-            $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' ';
+            $label = $date->format('d').'. '.self::month2string((int)$date->format('m'), $shortMonth).' ';
             if ($date->format('Y') != date('Y')) {
                 $label .= $date->format('Y');
             }
@@ -503,28 +503,28 @@ 
         $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
         
         $stack = array();
-        foreach(self::$controlChars as $char)
+        foreach (self::$controlChars as $char)
         {
             $tokens = explode('-', $char);
             $start = $tokens[0];
             $end = $tokens[1];
             $prefix = substr($start, 0, 3);
             $range = array();
-            foreach($hexAlphabet as $number) {
+            foreach ($hexAlphabet as $number) {
                 $range[] = $prefix.$number;
             }
             
             $use = false;
-            foreach($range as $number) {
-                if($number == $start) {
+            foreach ($range as $number) {
+                if ($number == $start) {
                     $use = true;
                 }
                 
-                if($use) {
+                if ($use) {
                     $stack[] = $number;
                 }
                 
-                if($number == $end) {
+                if ($number == $end) {
                     break;
                 }
             }
@@ -545,7 +545,7 @@ 
         $chars = self::getControlCharactersAsHex();
         
         $result = array();
-        foreach($chars as $char) {
+        foreach ($chars as $char) {
             $result[] = hex2bin($char);
         }
         
@@ -563,14 +563,14 @@ 
         $chars = self::getControlCharactersAsHex();
         
         $result = array();
-        foreach($chars as $char) {
+        foreach ($chars as $char) {
             $result[] = '\u'.strtolower($char);
         }
         
         return $result;
     }
     
-    protected static $controlChars =  array(
+    protected static $controlChars = array(
         '0000-0008', // control chars
         '000E-000F', // control chars
         '0010-001F', // control chars
@@ -592,19 +592,19 @@ 
      */
     public static function stripControlCharacters(string $string) : string
     {
-        if(empty($string)) {
+        if (empty($string)) {
             return $string;
         }
         
         // create the regex from the unicode characters list
-        if(!isset(self::$controlCharsRegex)) 
+        if (!isset(self::$controlCharsRegex)) 
         {
             $chars = self::getControlCharactersAsHex();
 
             // we use the notation \x{0000} to specify the unicode character key
             // in the regular expression.
             $stack = array();
-            foreach($chars as $char) {
+            foreach ($chars as $char) {
                 $stack[] = '\x{'.$char.'}';
             }
             
@@ -638,7 +638,7 @@ 
             $ordInt = ord($octet);
             // Convert from int (base 10) to hex (base 16), for PHP \x syntax
             $ordHex = base_convert($ordInt, 10, 16);
-            $output .= '\x' . $ordHex;
+            $output .= '\x'.$ordHex;
         }
         return $output;
     }
@@ -670,19 +670,19 @@ 
     
     protected static function convertScalarForComparison($scalar)
     {
-        if($scalar === '' || is_null($scalar)) {
+        if ($scalar === '' || is_null($scalar)) {
             return null;
         }
         
-        if(is_bool($scalar)) {
+        if (is_bool($scalar)) {
             return self::bool2string($scalar);
         }
         
-        if(is_array($scalar)) {
+        if (is_array($scalar)) {
             $scalar = md5(serialize($scalar));
         }
         
-        if($scalar !== null && !is_scalar($scalar)) {
+        if ($scalar !== null && !is_scalar($scalar)) {
             throw new ConvertHelper_Exception(
                 'Not a scalar value in comparison',
                 null,
@@ -731,7 +731,7 @@ 
     public static function bool2string($boolean, bool $yesno = false) : string
     {
         // allow 'yes', 'true', 'no', 'false' string notations as well
-        if(!is_bool($boolean)) {
+        if (!is_bool($boolean)) {
             $boolean = self::string2bool($boolean);
         }
         
@@ -772,15 +772,15 @@ 
     public static function array2attributeString($array)
     {
         $tokens = array();
-        foreach($array as $attr => $value) {
-            if($value == '' || $value == null) {
+        foreach ($array as $attr => $value) {
+            if ($value == '' || $value == null) {
                 continue;
             }
             
             $tokens[] = $attr.'="'.$value.'"';
         }
         
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             return '';
         }
         
@@ -795,10 +795,10 @@ 
     * @param string $string
     * @return string
     */
-    public static function string2attributeJS($string, $quoted=true)
+    public static function string2attributeJS($string, $quoted = true)
     {
         $converted = addslashes(htmlspecialchars(strip_tags($string), ENT_QUOTES, 'UTF-8'));
-        if($quoted) {
+        if ($quoted) {
             $converted = "'".$converted."'";
         } 
         
@@ -816,11 +816,11 @@ 
     */
     public static function isBoolean($value) : bool
     {
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return true;
         }
         
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return false;
         }
         
@@ -836,7 +836,7 @@ 
     public static function array2styleString(array $subject) : string
     {
         $tokens = array();
-        foreach($subject as $name => $value) {
+        foreach ($subject as $name => $value) {
             $tokens[] = $name.':'.$value;
         }
         
@@ -894,7 +894,7 @@ 
     * 
     * @see JSHelper::buildRegexStatement()
     */
-    public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT)
+    public static function regex2js(string $regex, string $statementType = JSHelper::JS_REGEX_OBJECT)
     {
         return JSHelper::buildRegexStatement($regex, $statementType);
     }
@@ -911,11 +911,11 @@ 
     * @throws ConvertHelper_Exception
     * @return string
     */
-    public static function var2json($variable, int $options=0, int $depth=512) : string
+    public static function var2json($variable, int $options = 0, int $depth = 512) : string
     {
         $result = json_encode($variable, $options, $depth);
         
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
         
@@ -940,10 +940,10 @@ 
     public static function stripUTFBom($string)
     {
         $boms = FileHelper::getUTFBOMs();
-        foreach($boms as $bomChars) {
+        foreach ($boms as $bomChars) {
             $length = mb_strlen($bomChars);
             $text = mb_substr($string, 0, $length);
-            if($text==$bomChars) {
+            if ($text == $bomChars) {
                 return mb_substr($string, $length);
             }
         }
@@ -960,7 +960,7 @@ 
     */
     public static function string2utf8($string)
     {
-        if(!self::isStringASCII($string)) {
+        if (!self::isStringASCII($string)) {
             return \ForceUTF8\Encoding::toUTF8($string);
         }
         
@@ -978,11 +978,11 @@ 
     */
     public static function isStringASCII($string) : bool
     {
-        if($string === '' || $string === NULL) {
+        if ($string === '' || $string === NULL) {
             return true;
         }
         
-        if(!is_string($string)) {
+        if (!is_string($string)) {
             return false;
         }
         
@@ -1016,7 +1016,7 @@ 
     * @param array $options
     * @return float
     */
-    public static function matchString($source, $target, $options=array())
+    public static function matchString($source, $target, $options = array())
     {
         $defaults = array(
             'maxLevenshtein' => 10,
@@ -1026,12 +1026,12 @@ 
         $options = array_merge($defaults, $options);
         
         // avoid doing this via levenshtein
-        if($source == $target) {
+        if ($source == $target) {
             return 100;
         }
         
         $diff = levenshtein($source, $target);
-        if($diff > $options['maxLevenshtein']) {
+        if ($diff > $options['maxLevenshtein']) {
             return 0;
         }
         
@@ -1115,24 +1115,24 @@ 
     * @see ConvertHelper::INTERVAL_HOURS
     * @see ConvertHelper::INTERVAL_DAYS
     */
-    public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS) : int
+    public static function interval2total(\DateInterval $interval, $unit = self::INTERVAL_SECONDS) : int
     {
         $total = (int)$interval->format('%a');
         if ($unit == self::INTERVAL_DAYS) {
             return $total;
         }
         
-        $total = ($total * 24) + ((int)$interval->h );
+        $total = ($total * 24) + ((int)$interval->h);
         if ($unit == self::INTERVAL_HOURS) {
             return $total;
         }
     
-        $total = ($total * 60) + ((int)$interval->i );
+        $total = ($total * 60) + ((int)$interval->i);
         if ($unit == self::INTERVAL_MINUTES) {
             return $total;
         }
 
-        $total = ($total * 60) + ((int)$interval->s );
+        $total = ($total * 60) + ((int)$interval->s);
         if ($unit == self::INTERVAL_SECONDS) {
             return $total;
         }
@@ -1161,13 +1161,13 @@ 
     * @param bool $short
     * @return string|NULL
     */
-    public static function date2dayName(\DateTime $date, bool $short=false)
+    public static function date2dayName(\DateTime $date, bool $short = false)
     {
         $day = $date->format('l');
         $invariant = self::getDayNamesInvariant();
         
         $idx = array_search($day, $invariant);
-        if($idx !== false) {
+        if ($idx !== false) {
             $localized = self::getDayNames($short);
             return $localized[$idx];
         }
@@ -1190,10 +1190,10 @@ 
     * @param bool $short
     * @return array
     */
-    public static function getDayNames(bool $short=false) : array
+    public static function getDayNames(bool $short = false) : array
     {
-        if($short) {
-            if(!isset(self::$daysShort)) {
+        if ($short) {
+            if (!isset(self::$daysShort)) {
                 self::$daysShort = array(
                     t('Mon'),
                     t('Tue'),
@@ -1208,7 +1208,7 @@ 
             return self::$daysShort;
         }
         
-        if(!isset(self::$days)) {
+        if (!isset(self::$days)) {
             self::$days = array(
                 t('Monday'),
                 t('Tuesday'),
@@ -1233,17 +1233,17 @@ 
      */
     public static function implodeWithAnd(array $list, $sep = ', ', $conjunction = null)
     {
-        if(empty($list)) {
+        if (empty($list)) {
             return '';
         }
         
-        if(empty($conjunction)) {
+        if (empty($conjunction)) {
             $conjunction = t('and');
         }
         
         $last = array_pop($list);
-        if($list) {
-            return implode($sep, $list) . $conjunction . ' ' . $last;
+        if ($list) {
+            return implode($sep, $list).$conjunction.' '.$last;
         }
         
         return $last;
@@ -1262,7 +1262,7 @@ 
     public static function string2array(string $string) : array
     {
         $result = preg_split('//u', $string, null, PREG_SPLIT_NO_EMPTY);
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
         
@@ -1277,12 +1277,12 @@ 
     */
     public static function isStringHTML(string $string) : bool
     {
-        if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
+        if (preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
             return true;
         }
         
         $decoded = html_entity_decode($string);
-        if($decoded !== $string) {
+        if ($decoded !== $string) {
             return true;
         }
         
@@ -1391,14 +1391,14 @@ 
     * @param bool $caseInsensitive
     * @return ConvertHelper_StringMatch[]
     */
-    public static function findString(string $needle, string $haystack, bool $caseInsensitive=false)
+    public static function findString(string $needle, string $haystack, bool $caseInsensitive = false)
     {
-        if($needle === '') {
+        if ($needle === '') {
             return array();
         }
         
         $function = 'mb_strpos';
-        if($caseInsensitive) {
+        if ($caseInsensitive) {
             $function = 'mb_stripos';
         }
         
@@ -1406,7 +1406,7 @@ 
         $positions = array();
         $length = mb_strlen($needle);
         
-        while( ($pos = $function($haystack, $needle, $pos)) !== false) 
+        while (($pos = $function($haystack, $needle, $pos)) !== false) 
         {
             $match = mb_substr($haystack, $pos, $length);
             $positions[] = new ConvertHelper_StringMatch($pos, $match);
@@ -1426,7 +1426,7 @@ 
     */
     public static function explodeTrim(string $delimiter, string $string) : array
     {
-        if(empty($string) || empty($delimiter)) {
+        if (empty($string) || empty($delimiter)) {
             return array();
         }
         
@@ -1434,8 +1434,8 @@ 
         $tokens = array_map('trim', $tokens);
         
         $keep = array();
-        foreach($tokens as $token) {
-            if($token !== '') {
+        foreach ($tokens as $token) {
+            if ($token !== '') {
                 $keep[] = $token;
             }
         }
@@ -1453,11 +1453,11 @@ 
     */
     public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL
     {
-        if(empty($subjectString)) {
+        if (empty($subjectString)) {
             return null;
         }
         
-        if(!isset(self::$eolChars))
+        if (!isset(self::$eolChars))
         {
             $cr = chr((int)hexdec('0d'));
             $lf = chr((int)hexdec('0a'));
@@ -1488,18 +1488,18 @@ 
         
         $max = 0;
         $results = array();
-        foreach(self::$eolChars as $def) 
+        foreach (self::$eolChars as $def) 
         {
             $amount = substr_count($subjectString, $def['char']);
             
-            if($amount > $max)
+            if ($amount > $max)
             {
                 $max = $amount;
                 $results[] = $def;
             }
         }
         
-        if(empty($results)) {
+        if (empty($results)) {
             return null;
         }
         
@@ -1519,9 +1519,9 @@ 
     */
     public static function arrayRemoveKeys(array &$array, array $keys) : void
     {
-        foreach($keys as $key) 
+        foreach ($keys as $key) 
         {
-            if(array_key_exists($key, $array)) {
+            if (array_key_exists($key, $array)) {
                 unset($array[$key]); 
             }
         }
@@ -1536,17 +1536,17 @@ 
     */
     public static function isInteger($value) : bool
     {
-        if(is_int($value)) {
+        if (is_int($value)) {
             return true;
         }
         
         // booleans get converted to numbers, so they would
         // actually match the regex.
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return false;
         }
         
-        if(is_string($value) && $value !== '') {
+        if (is_string($value) && $value !== '') {
             return preg_match('/\A-?\d+\z/', $value) === 1;
         }