Mistralys / application-utils

src/XMLHelper.php

Indentation +40 added lines, -40 removed lines

@@ -34,41 +34,41 @@ 
         return new XMLHelper($dom);
     }
     
-   /**
-    * Creates a converter instance from an XML file.
-    * @param string $xmlFile
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Creates a converter instance from an XML file.
+     * @param string $xmlFile
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function convertFile(string $xmlFile)
     {
         return XMLHelper_Converter::fromFile($xmlFile);
     }
     
-   /**
-    * Creates a converter from an XML string.
-    * @param string $xmlString
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Creates a converter from an XML string.
+     * @param string $xmlString
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function convertString(string $xmlString)
     {
         return XMLHelper_Converter::fromString($xmlString);
     }
 
-   /**
-    * Creates a converter from a SimpleXMLElement instance.
-    * @param \SimpleXMLElement $element
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Creates a converter from a SimpleXMLElement instance.
+     * @param \SimpleXMLElement $element
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function convertElement(\SimpleXMLElement $element)
     {
         return XMLHelper_Converter::fromElement($element);
     }
    
-   /**
-    * Creates a converter from a DOMElement instance.
-    * @param \DOMElement $element
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Creates a converter from a DOMElement instance.
+     * @param \DOMElement $element
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function convertDOMElement(\DOMElement $element)
     {
         return XMLHelper_Converter::fromDOMElement($element);
@@ -436,31 +436,31 @@ 
         return $this->dom->saveXML();
     }
     
-   /**
-    * Creates a new SimpleXML helper instance: this
-    * object is useful to work with loading XML strings
-    * and files with easy access to any errors that 
-    * may occurr, since the simplexml functions can be
-    * somewhat cryptic.
-    * 
-    * @return XMLHelper_SimpleXML
-    */
+    /**
+     * Creates a new SimpleXML helper instance: this
+     * object is useful to work with loading XML strings
+     * and files with easy access to any errors that 
+     * may occurr, since the simplexml functions can be
+     * somewhat cryptic.
+     * 
+     * @return XMLHelper_SimpleXML
+     */
     public static function createSimplexml()
     {
         return new XMLHelper_SimpleXML();
     }
     
-   /**
-    * Converts a string to valid XML: can be a text only string
-    * or an HTML string. Returns valid XML code.
-    * 
-    * NOTE: The string may contain custom tags, which are 
-    * preserved.
-    * 
-    * @param string $string
-    * @throws XMLHelper_Exception
-    * @return string
-    */
+    /**
+     * Converts a string to valid XML: can be a text only string
+     * or an HTML string. Returns valid XML code.
+     * 
+     * NOTE: The string may contain custom tags, which are 
+     * preserved.
+     * 
+     * @param string $string
+     * @throws XMLHelper_Exception
+     * @return string
+     */
     public static function string2xml(string $string) : string
     {
         if(stristr($string, '<body')) 

src/IniHelper.php

Braces +1 added lines, -2 removed lines

@@ -163,8 +163,7 @@
             if($section->isDefault()) 
             {
                 $result = array_merge($result, $section->toArray());
-            } 
-            else 
+            } else 
             {
                 $result[$section->getName()] = $section->toArray();
             }

Indentation +85 added lines, -85 removed lines

@@ -60,23 +60,23 @@ 
         }
     }
     
-   /**
-    * The end of line character used in the INI source string.
-    * @return string
-    */
+    /**
+     * The end of line character used in the INI source string.
+     * @return string
+     */
     public function getEOLChar() : string
     {
         return $this->eol;
     }
     
-   /**
-    * Factory method: creates a new helper instance loading the
-    * ini content from the specified file.
-    * 
-    * @param string $iniPath
-    * @throws IniHelper_Exception
-    * @return \AppUtils\IniHelper
-    */
+    /**
+     * Factory method: creates a new helper instance loading the
+     * ini content from the specified file.
+     * 
+     * @param string $iniPath
+     * @throws IniHelper_Exception
+     * @return \AppUtils\IniHelper
+     */
     public static function createFromFile(string $iniPath)
     {
         $iniPath = FileHelper::requireFileExists($iniPath);
@@ -96,35 +96,35 @@ 
         );
     }
     
-   /**
-    * Factory method: Creates a new ini helper instance from an ini string.
-    * 
-    * @param string $iniContent
-    * @return \AppUtils\IniHelper
-    */
+    /**
+     * Factory method: Creates a new ini helper instance from an ini string.
+     * 
+     * @param string $iniContent
+     * @return \AppUtils\IniHelper
+     */
     public static function createFromString(string $iniContent)
     {
         return new IniHelper($iniContent);
     }
     
-   /**
-    * Factory method: Creates a new empty ini helper.
-    *  
-    * @return \AppUtils\IniHelper
-    */
+    /**
+     * Factory method: Creates a new empty ini helper.
+     *  
+     * @return \AppUtils\IniHelper
+     */
     public static function createNew()
     {
         return self::createFromString('');
     }
     
-   /**
-    * Adds a new data section, and returns the section instance.
-    * If a section with the name already exists, returns that
-    * section instead of creating a new one.
-    *  
-    * @param string $name
-    * @return IniHelper_Section
-    */
+    /**
+     * Adds a new data section, and returns the section instance.
+     * If a section with the name already exists, returns that
+     * section instead of creating a new one.
+     *  
+     * @param string $name
+     * @return IniHelper_Section
+     */
     public function addSection(string $name) : IniHelper_Section
     {
         if(!isset($this->sections[$name])) {
@@ -134,12 +134,12 @@ 
         return $this->sections[$name];
     }
     
-   /**
-    * Retrieves a section by its name, if it exists.
-    * 
-    * @param string $name
-    * @return IniHelper_Section|NULL
-    */
+    /**
+     * Retrieves a section by its name, if it exists.
+     * 
+     * @param string $name
+     * @return IniHelper_Section|NULL
+     */
     public function getSection(string $name) : ?IniHelper_Section
     {
         if(isset($this->sections[$name])) {
@@ -149,11 +149,11 @@ 
         return null;
     }
     
-   /**
-    * Gets the data from the INI file as an associative array.
-    * 
-    * @return array
-    */
+    /**
+     * Gets the data from the INI file as an associative array.
+     * 
+     * @return array
+     */
     public function toArray() : array
     {
         $result = array();
@@ -173,17 +173,17 @@ 
         return $result;
     }
     
-   /**
-    * Saves the INI content to the target file.
-    * 
-    * @param string $filePath
-    * @return IniHelper
-    * @throws FileHelper_Exception
-    * 
-    * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
-    * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
-    * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
-    */
+    /**
+     * Saves the INI content to the target file.
+     * 
+     * @param string $filePath
+     * @return IniHelper
+     * @throws FileHelper_Exception
+     * 
+     * @see FileHelper::ERROR_SAVE_FOLDER_NOT_WRITABLE
+     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
+     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
+     */
     public function saveToFile(string $filePath) : IniHelper
     {
         FileHelper::saveFile($filePath, $this->saveToString());
@@ -191,11 +191,11 @@ 
         return $this;
     }
     
-   /**
-    * Returns the INI content as string.
-    * 
-    * @return string
-    */
+    /**
+     * Returns the INI content as string.
+     * 
+     * @return string
+     */
     public function saveToString() : string
     {
         $parts = array();
@@ -208,15 +208,15 @@ 
         return implode($this->eol, $parts);
     }
     
-   /**
-    * Sets or adds the value of a setting in the INI content.
-    * If the setting does not exist, it is added. Otherwise,
-    * the existing value is overwritten.
-    * 
-    * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
-    * @param mixed $value
-    * @return IniHelper
-    */
+    /**
+     * Sets or adds the value of a setting in the INI content.
+     * If the setting does not exist, it is added. Otherwise,
+     * the existing value is overwritten.
+     * 
+     * @param string $path A variable path, either <code>varname</code> or <code>section.varname</code>.
+     * @param mixed $value
+     * @return IniHelper
+     */
     public function setValue(string $path, $value) : IniHelper
     {
         $path = $this->parsePath($path);
@@ -235,12 +235,12 @@ 
         return $this;
     }
     
-   /**
-    * Checks whether a section with the specified name exists.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Checks whether a section with the specified name exists.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function sectionExists(string $name) : bool
     {
         foreach($this->sections as $section) {
@@ -252,23 +252,23 @@ 
         return false;
     }
     
-   /**
-    * Retrieves the default section, which is used to add
-    * values in the root of the document.
-    * 
-    * @return IniHelper_Section
-    */
+    /**
+     * Retrieves the default section, which is used to add
+     * values in the root of the document.
+     * 
+     * @return IniHelper_Section
+     */
     public function getDefaultSection() : IniHelper_Section
     {
         return $this->addSection(self::SECTION_DEFAULT);
     }
     
-   /**
-    * Retrieves all variable lines for the specified path.
-    * 
-    * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
-    * @return array|\AppUtils\IniHelper_Line[]
-    */
+    /**
+     * Retrieves all variable lines for the specified path.
+     * 
+     * @param string $path A variable path. Either <code>varname</code> or <code>section.varname</code>.
+     * @return array|\AppUtils\IniHelper_Line[]
+     */
     public function getLinesByVariable(string $path)
     {
         $path = $this->parsePath($path);

src/JSHelper.php

Indentation +99 added lines, -99 removed lines

@@ -26,48 +26,48 @@ 
  */
 class JSHelper
 {
-   /**
-    * Quote style using single quotes.
-    * @var integer
-    */
+    /**
+     * Quote style using single quotes.
+     * @var integer
+     */
     const QUOTE_STYLE_SINGLE = 1;
     
-   /**
-    * Quote style using double quotes.
-    * @var integer
-    */
+    /**
+     * Quote style using double quotes.
+     * @var integer
+     */
     const QUOTE_STYLE_DOUBLE = 2;
 
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected static $variableCache = array();
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected static $elementCounter = 0;
 
-   /**
-    * @var string
-    */    
+    /**
+     * @var string
+     */    
     protected static $idPrefix = 'E';
     
-   /**
-    * Builds a javascript statement. The first parameter is the
-    * javascript function to call, any additional parameters are
-    * used as arguments for the javascript function call. Variable
-    * types are automagically converted to the javascript equivalents.
-    *
-    * Examples:
-    *
-    * // add an alert(); statement:
-    * JSHelper::buildStatement('alert');
-    *
-    * // add an alert('Alert text'); statement
-    * JSHelper::buildStatement('alert', 'Alert text');
-    *
-    */
+    /**
+     * Builds a javascript statement. The first parameter is the
+     * javascript function to call, any additional parameters are
+     * used as arguments for the javascript function call. Variable
+     * types are automagically converted to the javascript equivalents.
+     *
+     * Examples:
+     *
+     * // add an alert(); statement:
+     * JSHelper::buildStatement('alert');
+     *
+     * // add an alert('Alert text'); statement
+     * JSHelper::buildStatement('alert', 'Alert text');
+     *
+     */
     public static function buildStatement() : string
     {
         $args = func_get_args();
@@ -75,13 +75,13 @@ 
         return call_user_func_array(array(self::class, 'buildStatementQuoteStyle'), $args);
     }
     
-   /**
-    * Like {@link JSHelper::buildStatement()}, but using single quotes
-    * to make it possible to use the statement in an HTML tag attribute.
-    * 
-    * @return string
-    * @see JSHelper::buildStatement()
-    */
+    /**
+     * Like {@link JSHelper::buildStatement()}, but using single quotes
+     * to make it possible to use the statement in an HTML tag attribute.
+     * 
+     * @return string
+     * @see JSHelper::buildStatement()
+     */
     public static function buildStatementAttribute() : string
     {
         $args = func_get_args();
@@ -111,39 +111,39 @@ 
         return $call . ');';
     }
 
-   /**
-    * Builds a set variable statement. The variable value is
-    * automatically converted to the javascript equivalent.
-    *
-    * Examples:
-    *
-    * // foo = 'bar';
-    * JSHelper::buildVariable('foo', 'bar');
-    *
-    * // foo = 42;
-    * JSHelper::buildVariable('foo', 42);
-    *
-    * // foo = true;
-    * JSHelper::buildVariable('foo', true);
-    *
-    * @param string $varName
-    * @param mixed $varValue
-    * @return string
-    */
+    /**
+     * Builds a set variable statement. The variable value is
+     * automatically converted to the javascript equivalent.
+     *
+     * Examples:
+     *
+     * // foo = 'bar';
+     * JSHelper::buildVariable('foo', 'bar');
+     *
+     * // foo = 42;
+     * JSHelper::buildVariable('foo', 42);
+     *
+     * // foo = true;
+     * JSHelper::buildVariable('foo', true);
+     *
+     * @param string $varName
+     * @param mixed $varValue
+     * @return string
+     */
     public static function buildVariable(string $varName, $varValue) : string
     {
         return $varName . "=" . self::phpVariable2JS($varValue) . ';';
     }
     
-   /**
-    * Converts a PHP variable to its javascript equivalent. Note that
-    * if a variable cannot be converted (like a PHP resource), this will
-    * return a javascript "null".
-    *
-    * @param mixed $variable
-    * @param int $quoteStyle The quote style to use for strings
-    * @return string
-    */
+    /**
+     * Converts a PHP variable to its javascript equivalent. Note that
+     * if a variable cannot be converted (like a PHP resource), this will
+     * return a javascript "null".
+     *
+     * @param mixed $variable
+     * @param int $quoteStyle The quote style to use for strings
+     * @return string
+     */
     public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
     {
         // after much profiling, this variant of the method offers
@@ -221,26 +221,26 @@ 
         return $result;
     }
     
-   /**
-    * Converts a variable to a JS string that can be 
-    * used in an HTML attribute: it uses single quotes
-    * instead of the default double quotes.
-    * 
-    * @param mixed $variable
-    * @return string
-    */
+    /**
+     * Converts a variable to a JS string that can be 
+     * used in an HTML attribute: it uses single quotes
+     * instead of the default double quotes.
+     * 
+     * @param mixed $variable
+     * @return string
+     */
     public static function phpVariable2AttributeJS($variable) : string
     {
         return self::phpVariable2JS($variable, self::QUOTE_STYLE_SINGLE);
     }
 
-   /**
-    * Generates a dynamic element ID to be used with dynamically generated
-    * HTML code to tie in with clientside javascript when compact but unique
-    * IDs are needed in a  request.
-    *
-    * @return string
-    */
+    /**
+     * Generates a dynamic element ID to be used with dynamically generated
+     * HTML code to tie in with clientside javascript when compact but unique
+     * IDs are needed in a  request.
+     *
+     * @return string
+     */
     public static function nextElementID() : string
     {
         self::$elementCounter++;
@@ -248,33 +248,33 @@ 
         return self::$idPrefix . self::$elementCounter;
     }
     
-   /**
-    * Retrieves the ID prefix currently used.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the ID prefix currently used.
+     * 
+     * @return string
+     */
     public static function getIDPrefix() : string
     {
         return self::$idPrefix;
     }
     
-   /**
-    * Retrieves the value of the internal elements counter.
-    * 
-    * @return integer
-    */
+    /**
+     * Retrieves the value of the internal elements counter.
+     * 
+     * @return integer
+     */
     public static function getElementCounter() : int
     {
         return self::$elementCounter;
     }
     
-   /**
-    * Sets the prefix that is added in front of all IDs
-    * retrieved using the {@link nextElementID()} method.
-    * 
-    * @param string $prefix
-    * @see JSHelper::nextElementID()
-    */
+    /**
+     * Sets the prefix that is added in front of all IDs
+     * retrieved using the {@link nextElementID()} method.
+     * 
+     * @param string $prefix
+     * @see JSHelper::nextElementID()
+     */
     public static function setIDPrefix(string $prefix)
     {
         self::$idPrefix = $prefix;

Braces +2 added lines, -4 removed lines

@@ -159,8 +159,7 @@ 
             if($hash === true) 
             { 
                 $hash = 'true'; 
-            } 
-            else if($hash === false) 
+            } else if($hash === false) 
             { 
                 $hash = 'false'; 
             }
@@ -184,8 +183,7 @@ 
                 if($string === false) 
                 {
                     $string = '';
-                } 
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
+                } else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
                 {
                     $string = mb_substr($string, 1, mb_strlen($string)-2);
                     $string = "'".str_replace("'", "\'", $string)."'";

src/PaginationHelper.php

Indentation +115 added lines, -115 removed lines

@@ -24,56 +24,56 @@ 
  */
 class PaginationHelper
 {
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $total;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $perPage;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $current;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $next = 0;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $prev = 0;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $last = 0; 
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $adjacentPages = 3;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $offsetEnd = 0;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $offsetStart = 0;
     
-   /**
-    * @param int $totalItems The total amount of items available.
-    * @param int $itemsPerPage How many items to display per page.
-    * @param int $currentPage The current page number (1-based)
-    */
+    /**
+     * @param int $totalItems The total amount of items available.
+     * @param int $itemsPerPage How many items to display per page.
+     * @param int $currentPage The current page number (1-based)
+     */
     public function __construct(int $totalItems, int $itemsPerPage, int $currentPage)
     {
         $this->total = $totalItems;
@@ -83,34 +83,34 @@ 
         $this->calculate();
     }
     
-   /**
-    * Sets the amount of adjacent pages to display next to the
-    * current one when using the pages list.
-    *
-    * @param int $amount
-    * @return PaginationHelper
-    */
+    /**
+     * Sets the amount of adjacent pages to display next to the
+     * current one when using the pages list.
+     *
+     * @param int $amount
+     * @return PaginationHelper
+     */
     public function setAdjacentPages(int $amount) : PaginationHelper
     {
         $this->adjacentPages = $amount;
         return $this;
     }
     
-   /**
-    * Whether there is a next page after the current page.
-    * @return bool
-    */
+    /**
+     * Whether there is a next page after the current page.
+     * @return bool
+     */
     public function hasNextPage() : bool
     {
         return $this->next > 0;
     }
     
-   /**
-    * The next page number. Returns the last page
-    * number if there is no next page.
-    *  
-    * @return int
-    */
+    /**
+     * The next page number. Returns the last page
+     * number if there is no next page.
+     *  
+     * @return int
+     */
     public function getNextPage() : int
     {
         if($this->next === 0) {
@@ -120,21 +120,21 @@ 
         return $this->next;
     }
     
-   /**
-    * Whether there is a previous page before the current page.
-    * @return bool
-    */
+    /**
+     * Whether there is a previous page before the current page.
+     * @return bool
+     */
     public function hasPreviousPage() : bool
     {
         return $this->prev > 0;
     }
     
-   /**
-    * The previous page number. Returns the first page
-    * number if there is no previous page.
-    * 
-    * @return int
-    */
+    /**
+     * The previous page number. Returns the first page
+     * number if there is no previous page.
+     * 
+     * @return int
+     */
     public function getPreviousPage() : int
     {
         if($this->prev === 0) {
@@ -144,21 +144,21 @@ 
         return $this->prev;
     }
     
-   /**
-    * Retrieves the last page number.
-    * @return int
-    */
+    /**
+     * Retrieves the last page number.
+     * @return int
+     */
     public function getLastPage() : int
     {
         return $this->last;
     }
     
-   /**
-    * Whether there is more than one page, i.e. whether
-    * pagination is required at all.
-    *  
-    * @return bool
-    */
+    /**
+     * Whether there is more than one page, i.e. whether
+     * pagination is required at all.
+     *  
+     * @return bool
+     */
     public function hasPages() : bool
     {
         return $this->last > 1;
@@ -169,12 +169,12 @@ 
         return $this->current;
     }
     
-   /**
-    * Retrieves a list of page numbers for a page
-    * navigator, to quickly jump between pages.
-    *
-    * @return int[]
-    */
+    /**
+     * Retrieves a list of page numbers for a page
+     * navigator, to quickly jump between pages.
+     *
+     * @return int[]
+     */
     public function getPageNumbers() : array
     {
         $adjacent = $this->adjacentPages;
@@ -250,66 +250,66 @@ 
         return $numbers;
     }
     
-   /**
-    * Whether the specified page number is the current page.
-    * 
-    * @param int $pageNumber
-    * @return bool
-    */
+    /**
+     * Whether the specified page number is the current page.
+     * 
+     * @param int $pageNumber
+     * @return bool
+     */
     public function isCurrentPage(int $pageNumber) : bool
     {
         return $pageNumber === $this->current;
     }
     
-   /**
-    * Retrieves the 1-based starting offset of
-    * items currently displayed in the page.
-    * 
-    * Note: Use this to create a text like 
-    * "showing entries x to y".
-    * 
-    * @return int
-    * @see PaginationHelper::getOffsetEnd()
-    */
+    /**
+     * Retrieves the 1-based starting offset of
+     * items currently displayed in the page.
+     * 
+     * Note: Use this to create a text like 
+     * "showing entries x to y".
+     * 
+     * @return int
+     * @see PaginationHelper::getOffsetEnd()
+     */
     public function getItemsStart() : int
     {
         return $this->getOffsetStart() + 1;
     }
 
-   /**
-    * Retrieves the 1-based ending offset of
-    * items currently displayed in the page.
-    * 
-    * Note: Use this to create a text like 
-    * "showing entries x to y".
-    * 
-    * @return int
-    * @see PaginationHelper::getOffsetStart()
-    */
+    /**
+     * Retrieves the 1-based ending offset of
+     * items currently displayed in the page.
+     * 
+     * Note: Use this to create a text like 
+     * "showing entries x to y".
+     * 
+     * @return int
+     * @see PaginationHelper::getOffsetStart()
+     */
     public function getItemsEnd() : int
     {
         return $this->getOffsetEnd() + 1;
     }
     
-   /**
-    * Retrieves the 0-based starting offset of
-    * items currently displayed in the page.
-    * 
-    * @return int
-    * @see PaginationHelper::getItemsStart()
-    */
+    /**
+     * Retrieves the 0-based starting offset of
+     * items currently displayed in the page.
+     * 
+     * @return int
+     * @see PaginationHelper::getItemsStart()
+     */
     public function getOffsetStart() : int
     {
         return $this->offsetStart;
     }
     
-   /**
-    * Retrieves the 0-based ending offset of
-    * items currently displayed in the page.
-    * 
-    * @return int
-    * @see PaginationHelper::getItemsEnd()
-    */
+    /**
+     * Retrieves the 0-based ending offset of
+     * items currently displayed in the page.
+     * 
+     * @return int
+     * @see PaginationHelper::getItemsEnd()
+     */
     public function getOffsetEnd() : int
     {
         return $this->offsetEnd;

Braces +1 added lines, -2 removed lines

@@ -322,8 +322,7 @@
         if($this->current < 1)
         {
             $this->current = 1;
-        }
-        else if($this->current > $pages)
+        } else if($this->current > $pages)
         {
             $this->current = $pages;
         }

src/ImageHelper.php

Indentation +384 added lines, -384 removed lines

@@ -68,54 +68,54 @@ 
     
     const ERROR_GD_LIBRARY_NOT_INSTALLED = 513024;
 
-   /**
-    * @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;
 
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $newHeight;
 
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $quality = 85;
     
     protected static $imageTypes = array(
@@ -203,31 +203,31 @@ 
         }
     }
 
-   /**
-    * 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
-    */
+    /**
+     * 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
+     */
     public static function createNew($width, $height, $type='png')
     {
         return self::createFromResource(imagecreatetruecolor($width, $height), 'png');
     }
     
-   /**
-    * 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)
     {
         self::requireResource($resource);
@@ -235,29 +235,29 @@ 
         return new ImageHelper(null, $resource, $type);
     }
     
-   /**
-    * Factory method: creates an image helper from an
-    * image file on disk.
-    *
-    * @param string $path
-    * @return ImageHelper
-    */
+    /**
+     * Factory method: creates an image helper from an
+     * image file on disk.
+     *
+     * @param string $path
+     * @return ImageHelper
+     */
     public static function createFromFile($file)
     {
         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])) {
@@ -265,22 +265,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);
@@ -292,12 +292,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));
@@ -485,13 +485,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($width)
     {
         $size = $this->getSizeByWidth($width);
@@ -501,12 +501,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);
@@ -514,13 +514,13 @@ 
         return $this->resampleImage($size[0], $size[1]);
     }
 
-   /**
-    * 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($width = null, $height = null) : ImageHelper
     {
         if($this->isVector()) {
@@ -585,12 +585,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);
@@ -713,12 +713,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']) {
@@ -758,27 +758,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()) {
@@ -924,32 +924,32 @@ 
         exit;
     }
     
-   /**
-    * 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);
     }
         
-   /**
-    * 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, $color=null) : ImageHelper
     {
         if($this->isVector()) {
@@ -1036,12 +1036,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);
@@ -1051,12 +1051,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)) {
@@ -1073,14 +1073,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);
@@ -1097,54 +1097,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();
 
@@ -1165,9 +1165,9 @@ 
         return $this;
     }
     
-   /**
-    * @return resource
-    */
+    /**
+     * @return resource
+     */
     public function getImage()
     {
         return $this->newImage;
@@ -1185,27 +1185,27 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the size of the image.
-    * 
-    * @param bool $exception Whether to trigger an exception when the image does not exist
-    * @return ImageHelper_Size
-    * @throws ImageHelper_Exception
-    * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
-    */
-	public function getSize($exception=true) : ImageHelper_Size
+    /**
+     * Retrieves the size of the image.
+     * 
+     * @param bool $exception Whether to trigger an exception when the image does not exist
+     * @return ImageHelper_Size
+     * @throws ImageHelper_Exception
+     * @see ImageHelper::ERROR_CANNOT_GET_IMAGE_SIZE
+     */
+    public function getSize($exception=true) : ImageHelper_Size
     {
-	    return self::getImageSize($this->newImage, $exception);
+        return self::getImageSize($this->newImage, $exception);
     }
     
     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;
@@ -1277,160 +1277,160 @@ 
             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
-	 * @param bool $exception Whether to trigger an exception when the image does not exist
-	 * @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, $exception=true) : 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
+     * @param bool $exception Whether to trigger an exception when the image does not exist
+     * @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, $exception=true) : 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) {
-	        if($exception) {
-    	        throw new ImageHelper_Exception(
-    	            'Error opening image file',
-    	            sprintf(
-    	                'Could not get image size for image [%s]',
-    	                $pathOrResource
-	                ),
-    	            self::ERROR_CANNOT_GET_IMAGE_SIZE
-	            );
-	        }
+        if($info === false) {
+            if($exception) {
+                throw new ImageHelper_Exception(
+                    'Error opening image file',
+                    sprintf(
+                        'Could not get image size for image [%s]',
+                        $pathOrResource
+                    ),
+                    self::ERROR_CANNOT_GET_IMAGE_SIZE
+                );
+            }
 	        
-	        return false;
-	    }
+            return false;
+        }
 	    
-	    return new ImageHelper_Size($info);
-	}
+        return new ImageHelper_Size($info);
+    }
 	
-	protected static function getImageSize_svg($imagePath)
-	{
-	    $xml = XMLHelper::createSimplexml();
-	    $xml->loadFile($imagePath);
+    protected static function getImageSize_svg($imagePath)
+    {
+        $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']);
-	    $viewBox = explode(',', $viewBox);
-	    if(count($viewBox) != 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
+        $viewBox = str_replace(' ', ',', $data['@attributes']['viewBox']);
+        $viewBox = explode(',', $viewBox);
+        if(count($viewBox) != 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 = $viewBox[2];
-	    $boxHeight = $viewBox[3];
+        $boxWidth = $viewBox[2];
+        $boxHeight = $viewBox[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($width, $height, $x=0, $y=0)
     {
         $new = $this->createNewImage($width, $height);
@@ -1452,13 +1452,13 @@ 
         return $this->newHeight;
     }
 
-   /**
-    * Calculates the average color value used in 
-    * the image. Returns an associative array
-    * with the red, green, blue and alpha components.
-    * 
-    * @return array
-    */
+    /**
+     * Calculates the average color value used in 
+     * the image. Returns an associative array
+     * with the red, green, blue and alpha components.
+     * 
+     * @return array
+     */
     public function calcAverageColor($format=self::COLORFORMAT_RGB)
     {
         $image = $this->duplicate();
@@ -1480,14 +1480,14 @@ 
     
     const COLORFORMAT_HEX = 2;
     
-   /**
-    * Retrieves the color value at the specified pixel
-    * coordinates in the image.
-    * 
-    * @param int $x
-    * @param int $y
-    * @return array
-    */
+    /**
+     * Retrieves the color value at the specified pixel
+     * coordinates in the image.
+     * 
+     * @param int $x
+     * @param int $y
+     * @return array
+     */
     public function getColorAt($x, $y, $format=self::COLORFORMAT_RGB)
     {
         if($x > $this->getWidth() || $y > $this->getHeight()) {
@@ -1514,21 +1514,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($rgb)
     {
         return (($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->calcAverageColor());
@@ -1536,15 +1536,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();

Braces +4 added lines, -8 removed lines

@@ -153,8 +153,7 @@ 
             $this->sourceImage = $resource;
             $this->type = $type;
             $this->info = self::getImageSize($resource);
-        } 
-        else 
+        } else 
         {
             $this->file = $sourceFile;
             if (!file_exists($this->file)) {
@@ -551,8 +550,7 @@ 
         if ($this->width <= $this->height) 
         {
             return $this->resampleByWidth($width);
-        } 
-        else 
+        } else 
         {
             return $this->resampleByHeight($height);
         }
@@ -1016,8 +1014,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']);
         }
@@ -1326,8 +1323,7 @@ 
 	    if(method_exists(__CLASS__, $method)) 
 	    {
 	        $info = call_user_func(array(__CLASS__, $method), $pathOrResource);
-	    } 
-	    else 
+	    } else 
 	    {
 	        $info = getimagesize($pathOrResource);
 	    }

src/SVNHelper/Target.php

Indentation +45 added lines, -45 removed lines

@@ -76,10 +76,10 @@ 
         return $this instanceof SVNHelper_Target_Folder;
     }
     
-   /**
-    * Runs an update of the file or folder.
-    * @return SVNHelper_Command_Update
-    */
+    /**
+     * Runs an update of the file or folder.
+     * @return SVNHelper_Command_Update
+     */
     public function runUpdate()
     {
         $cmd = $this->createUpdate();
@@ -88,55 +88,55 @@ 
         return $cmd;
     }
     
-   /**
-    * Creates an update command instance for the target file or folder.
-    * @return SVNHelper_Command_Update
-    */
+    /**
+     * Creates an update command instance for the target file or folder.
+     * @return SVNHelper_Command_Update
+     */
     public function createUpdate()
     {
         return $this->helper->createUpdate($this);
     }
     
-   /**
-    * Creates a status command instance for the target file or folder.
-    * @return SVNHelper_Command_Status
-    */
+    /**
+     * Creates a status command instance for the target file or folder.
+     * @return SVNHelper_Command_Status
+     */
     public function createStatus()
     {
         return $this->helper->createStatus($this);
     }
     
-   /**
-    * Creates an info command instance for the target file or folder.
-    * @return SVNHelper_Command_Info
-    */
+    /**
+     * Creates an info command instance for the target file or folder.
+     * @return SVNHelper_Command_Info
+     */
     public function createInfo()
     {
         return $this->helper->createInfo($this);
     }
     
-   /**
-    * Creates a commit command instance for the target file or folder.
-    * @param string $message
-    * @return SVNHelper_Command_Commit
-    */
+    /**
+     * Creates a commit command instance for the target file or folder.
+     * @param string $message
+     * @return SVNHelper_Command_Commit
+     */
     public function createCommit($message)
     {
         return $this->helper->createCommit($this, $message);
     }
 
-   /**
-    * Creates an add command instance for the target file or folder.
-    * @return SVNHelper_Command_Add
-    */
+    /**
+     * Creates an add command instance for the target file or folder.
+     * @return SVNHelper_Command_Add
+     */
     public function createAdd()
     {
         return $this->helper->createAdd($this);
     }
     
-   /**
-    * @return SVNHelper_Command_Status
-    */
+    /**
+     * @return SVNHelper_Command_Status
+     */
     public function getStatus()
     {
         $cmd = $this->createStatus();
@@ -154,10 +154,10 @@ 
         return $this;
     }
     
-   /**
-    * Whether the target is versioned or needs to be added.
-    * @return boolean
-    */
+    /**
+     * Whether the target is versioned or needs to be added.
+     * @return boolean
+     */
     public function isVersioned()
     {
         return $this->getInfo()->isVersioned();
@@ -170,10 +170,10 @@ 
         $this->cache = array();
     }
     
-   /**
-    * Retrieves information on the target.
-    * @return SVNHelper_Command_Info
-    */
+    /**
+     * Retrieves information on the target.
+     * @return SVNHelper_Command_Info
+     */
     public function getInfo()
     {
         if(!isset($this->cache['info'])) {
@@ -183,15 +183,15 @@ 
         return $this->cache['info'];
     }
     
-   /**
-    * Commits the target file or folder. If it has
-    * not been added to the repository yet, it is 
-    * added automatically beforehand. If it does
-    * not need to be committed, no changes are made.
-    * 
-    * @param string $message
-    * @return SVNHelper_Target
-    */
+    /**
+     * Commits the target file or folder. If it has
+     * not been added to the repository yet, it is 
+     * added automatically beforehand. If it does
+     * not need to be committed, no changes are made.
+     * 
+     * @param string $message
+     * @return SVNHelper_Target
+     */
     public function runCommit($message)
     {
         if(!$this->isVersioned()) {

Braces +1 added lines, -2 removed lines

@@ -202,8 +202,7 @@
         if(!$this->isCommitted()) {
             $this->createCommit($message)->execute();
             $this->clearCache();
-        }
-        else 
+        } else 
         {
             $this->log('Already committed, nothing to do.');
         }

src/SVNHelper/Command.php

Indentation +24 added lines, -24 removed lines

@@ -21,18 +21,18 @@ 
     const SVN_ERROR_TYPE_WARNING = 'warning';
     
     /**
-    * @var SVNHelper
-    */
+     * @var SVNHelper
+     */
     protected $helper;
     
-   /**
-    * @var SVNHelper_Target
-    */
+    /**
+     * @var SVNHelper_Target
+     */
     protected $target;
     
-   /**
-    * @var SVNHelper_CommandResult
-    */
+    /**
+     * @var SVNHelper_CommandResult
+     */
     protected $result;
     
     public function __construct(SVNHelper $helper, SVNHelper_Target $target)
@@ -41,9 +41,9 @@ 
         $this->target = $target;
     }
     
-   /**
-    * @return SVNHelper
-    */
+    /**
+     * @return SVNHelper
+     */
     public function getSVN()
     {
         return $this->helper;
@@ -99,15 +99,15 @@ 
         return $cmd;
     }
 
-   /**
-    * Executes the specified command, and returns a result
-    * instance to read the results.
-    * 
-    * @param string $mode The command mode, e.g. commit / update...
-    * @param string $path The path to apply the command to
-    * @param array $params
-    * @return SVNHelper_CommandResult
-    */
+    /**
+     * Executes the specified command, and returns a result
+     * instance to read the results.
+     * 
+     * @param string $mode The command mode, e.g. commit / update...
+     * @param string $path The path to apply the command to
+     * @param array $params
+     * @return SVNHelper_CommandResult
+     */
     protected function execCommand($mode, $path=null, $params=array())
     {
         $relative = $this->helper->relativizePath($path);
@@ -194,10 +194,10 @@ 
         return $this->result;
     }
     
-   /**
-    * Retrieves the type of command, e.g. "Commit"
-    * @return string
-    */
+    /**
+     * Retrieves the type of command, e.g. "Commit"
+     * @return string
+     */
     public function getType()
     {
         return str_replace('SVNHelper_Command_', '', get_class($this));   

src/SVNHelper/CommandResult.php

Indentation +27 added lines, -27 removed lines

@@ -4,37 +4,37 @@ 
 
 class SVNHelper_CommandResult
 {
-   /**
-    * @var SVNHelper_Command
-    */
+    /**
+     * @var SVNHelper_Command
+     */
     protected $command;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $output;
     
-   /**
-    * @var SVNHelper_CommandError[]
-    */
+    /**
+     * @var SVNHelper_CommandError[]
+     */
     protected $errors = array();
     
-   /**
-    * @var SVNHelper_CommandError[]
-    */
+    /**
+     * @var SVNHelper_CommandError[]
+     */
     protected $warnings = array();
     
-   /**
-    * The actual command that has been executed
-    * @var string
-    */
+    /**
+     * The actual command that has been executed
+     * @var string
+     */
     protected $commandLine;
     
-   /**
-    * @param SVNHelper_Command $command
-    * @param string[] $output
-    * @param SVNHelper_CommandError[] $errors
-    */
+    /**
+     * @param SVNHelper_Command $command
+     * @param string[] $output
+     * @param SVNHelper_CommandError[] $errors
+     */
     public function __construct(SVNHelper_Command $command, $commandLine, $output, $errors)
     {
         $this->command = $command;
@@ -86,12 +86,12 @@ 
         return $this->command;
     }
     
-   /**
-    * Retrieves all error messages.
-    * 
-    * @param string $asString
-    * @return string|string[]
-    */
+    /**
+     * Retrieves all error messages.
+     * 
+     * @param string $asString
+     * @return string|string[]
+     */
     public function getErrorMessages($asString=false)
     {
         if($asString) {

src/SVNHelper/Command/Info.php

Indentation +6 added lines, -6 removed lines

@@ -44,12 +44,12 @@
         return $result;
     }
     
-   /**
-    * Whether the file or folder has already been committed
-    * and has no pending changes.
-    * 
-    * @return boolean
-    */
+    /**
+     * Whether the file or folder has already been committed
+     * and has no pending changes.
+     * 
+     * @return boolean
+     */
     public function isCommitted()
     {
         $status = $this->target->getStatus();