Mistralys / application-utils

localization/index.php

Spacing +2 added lines, -2 removed lines

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

src/XMLHelper.php

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')) 

Spacing +17 added lines, -17 removed lines

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

src/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);

Spacing +14 added lines, -14 removed lines

@@ -35,12 +35,12 @@ 
     {
         $section = $this->addSection(self::SECTION_DEFAULT);
         
-        if(empty($iniString)) {
+        if (empty($iniString)) {
             return;
         }
         
         $eol = ConvertHelper::detectEOLCharacter($iniString);
-        if($eol !== null) {
+        if ($eol !== null) {
             $this->eol = $eol->getCharacter();
         }
         
@@ -48,11 +48,11 @@ 
         
         $total = count($lines);
         
-        for($i=0; $i < $total; $i++) 
+        for ($i = 0; $i < $total; $i++) 
         {
             $line = new IniHelper_Line($lines[$i], $i);
             
-            if($line->isSection()) {
+            if ($line->isSection()) {
                 $section = $this->addSection($line->getSectionName());
             }
 
@@ -82,7 +82,7 @@ 
         $iniPath = FileHelper::requireFileExists($iniPath);
         
         $content = file_get_contents($iniPath);
-        if($content !== false) {
+        if ($content !== false) {
             return self::createFromString($content);
         }
         
@@ -127,7 +127,7 @@ 
     */
     public function addSection(string $name) : IniHelper_Section
     {
-        if(!isset($this->sections[$name])) {
+        if (!isset($this->sections[$name])) {
             $this->sections[$name] = new IniHelper_Section($this, $name);
         }
         
@@ -142,7 +142,7 @@ 
     */
     public function getSection(string $name) : ?IniHelper_Section
     {
-        if(isset($this->sections[$name])) {
+        if (isset($this->sections[$name])) {
             return $this->sections[$name];
         }
         
@@ -158,9 +158,9 @@ 
     {
         $result = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
-            if($section->isDefault()) 
+            if ($section->isDefault()) 
             {
                 $result = array_merge($result, $section->toArray());
             } 
@@ -200,7 +200,7 @@ 
     {
         $parts = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
             $parts[] = $section->toString();
         }
@@ -243,8 +243,8 @@ 
     */
     public function sectionExists(string $name) : bool
     {
-        foreach($this->sections as $section) {
-            if($section->getName() === $name) {
+        foreach ($this->sections as $section) {
+            if ($section->getName() === $name) {
                 return true;
             }
         }
@@ -273,7 +273,7 @@ 
     {
         $path = $this->parsePath($path);
         
-        if(!$this->sectionExists($path['section'])) {
+        if (!$this->sectionExists($path['section'])) {
             return array();
         }
         
@@ -284,7 +284,7 @@ 
     {
         $path = explode($this->pathSeparator, $path);
         
-        if(count($path) === 1)
+        if (count($path) === 1)
         {
             return array(
                 'section' => self::SECTION_DEFAULT,

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)."'";

Spacing +22 added lines, -22 removed lines

@@ -95,20 +95,20 @@ 
         $quoteStyle = array_shift($params);
         $method = array_shift($params);
         
-        $call = $method . '(';
+        $call = $method.'(';
         
         $total = count($params);
-        if($total > 0) {
-            for($i=0; $i < $total; $i++) 
+        if ($total > 0) {
+            for ($i = 0; $i < $total; $i++) 
             {
                 $call .= self::phpVariable2JS($params[$i], $quoteStyle);
-                if($i < ($total-1)) {
+                if ($i < ($total - 1)) {
                     $call .= ',';
                 }
             }
         }
         
-        return $call . ');';
+        return $call.');';
     }
 
    /**
@@ -132,7 +132,7 @@ 
     */
     public static function buildVariable(string $varName, $varValue) : string
     {
-        return $varName . "=" . self::phpVariable2JS($varValue) . ';';
+        return $varName."=".self::phpVariable2JS($varValue).';';
     }
     
    /**
@@ -144,7 +144,7 @@ 
     * @param int $quoteStyle The quote style to use for strings
     * @return string
     */
-    public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
+    public static function phpVariable2JS($variable, int $quoteStyle = self::QUOTE_STYLE_DOUBLE) : string
     {
         // after much profiling, this variant of the method offers
         // the best performance. Repeat scalar values are cached 
@@ -152,22 +152,22 @@ 
         
         $type = gettype($variable);
         $hash = null;
-        if(is_scalar($variable) === true) 
+        if (is_scalar($variable) === true) 
         {
             $hash = $variable;
         
-            if($hash === true) 
+            if ($hash === true) 
             { 
                 $hash = 'true'; 
             } 
-            else if($hash === false) 
+            else if ($hash === false) 
             { 
                 $hash = 'false'; 
             }
             
             $hash .= '-'.$quoteStyle.'-'.$type;
             
-            if(isset(self::$variableCache[$hash])) {
+            if (isset(self::$variableCache[$hash])) {
                 return self::$variableCache[$hash];
             }
         }
@@ -175,19 +175,19 @@ 
         $result = 'null';
 
         // one gettype call is better than a strict if-else.
-        switch($type) 
+        switch ($type) 
         {
             case 'double':
             case 'string':
                 $string = json_encode($variable);
                 
-                if($string === false) 
+                if ($string === false) 
                 {
                     $string = '';
                 } 
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
+                else if ($quoteStyle === self::QUOTE_STYLE_SINGLE) 
                 {
-                    $string = mb_substr($string, 1, mb_strlen($string)-2);
+                    $string = mb_substr($string, 1, mb_strlen($string) - 2);
                     $string = "'".str_replace("'", "\'", $string)."'";
                 }
                 
@@ -195,7 +195,7 @@ 
                 break;
                 
             case 'boolean':
-                if($variable === true) {
+                if ($variable === true) {
                     $result = 'true';
                 } else {
                     $result = 'false';
@@ -213,7 +213,7 @@ 
         }
 
         // cache cacheable values
-        if($hash !== null) 
+        if ($hash !== null) 
         {
             self::$variableCache[$hash] = $result;
         }
@@ -245,7 +245,7 @@ 
     {
         self::$elementCounter++;
 
-        return self::$idPrefix . self::$elementCounter;
+        return self::$idPrefix.self::$elementCounter;
     }
     
    /**
@@ -319,7 +319,7 @@ 
      * @see JSHelper::JS_REGEX_OBJECT
      * @see JSHelper::JS_REGEX_JSON
      */
-    public static function buildRegexStatement(string $regex, string $statementType=self::JS_REGEX_OBJECT) : string
+    public static function buildRegexStatement(string $regex, string $statementType = self::JS_REGEX_OBJECT) : string
     {
         $regex = trim($regex);
         $separator = substr($regex, 0, 1);
@@ -327,7 +327,7 @@ 
         array_shift($parts);
         
         $modifiers = array_pop($parts);
-        if($modifiers == $separator) {
+        if ($modifiers == $separator) {
             $modifiers = '';
         }
         
@@ -343,7 +343,7 @@ 
         // convert the anchors that are not supported in js regexes
         $format = str_replace(array('\\A', '\\Z', '\\z'), array('^', '$', ''), $format);
         
-        if($statementType==self::JS_REGEX_JSON)
+        if ($statementType == self::JS_REGEX_JSON)
         {
             return ConvertHelper::var2json(array(
                 'format' => $format,
@@ -351,7 +351,7 @@ 
             ));
         }
         
-        if(!empty($modifiers)) {
+        if (!empty($modifiers)) {
             return sprintf(
                 'new RegExp(%s, %s)',
                 ConvertHelper::var2json($format),

src/RequestHelper.php

Spacing +12 added lines, -12 removed lines

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

src/functions.php

Spacing +4 added lines, -4 removed lines

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

src/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;
         }

Spacing +14 added lines, -14 removed lines

@@ -113,7 +113,7 @@ 
     */
     public function getNextPage() : int
     {
-        if($this->next === 0) {
+        if ($this->next === 0) {
             return $this->last;
         }
         
@@ -137,7 +137,7 @@ 
     */
     public function getPreviousPage() : int
     {
-        if($this->prev === 0) {
+        if ($this->prev === 0) {
             return 1;
         }
         
@@ -182,7 +182,7 @@ 
         // adjust the adjacent value if it exceeds the
         // total amount of pages
         $adjacentTotal = ($adjacent * 2) + 1;
-        if($adjacentTotal > $this->last) 
+        if ($adjacentTotal > $this->last) 
         {
             $adjacent = (int)floor($this->last / 2);
         }
@@ -195,13 +195,13 @@ 
         $back = 0;
         $fwd = 0;
         
-        if($maxBack >= $adjacent) {
+        if ($maxBack >= $adjacent) {
             $back = $adjacent; 
         } else {
             $back = $maxBack;
         }
         
-        if($maxFwd >= $adjacent)  {
+        if ($maxFwd >= $adjacent) {
             $fwd = $adjacent;
         } else {
             $fwd = $maxFwd;
@@ -217,16 +217,16 @@ 
         $fwd += $backDiff;
         $back += $fwdDiff;
         
-        if($fwd > $maxFwd) { $fwd = $maxFwd; }
-        if($back > $maxBack) { $back = $maxBack; }
+        if ($fwd > $maxFwd) { $fwd = $maxFwd; }
+        if ($back > $maxBack) { $back = $maxBack; }
         
         // calculate the first and last page in the list
         $prev = $this->current - $back;
         $next = $this->current + $fwd;
         
         // failsafe so we stay within the bounds
-        if($prev < 1) { $prev = 1; }
-        if($next > $this->last) { $next = $this->last; }
+        if ($prev < 1) { $prev = 1; }
+        if ($next > $this->last) { $next = $this->last; }
         
         // create and return the page numbers list
         $numbers = range($prev, $next);
@@ -319,11 +319,11 @@ 
     {
         $pages = (int)ceil($this->total / $this->perPage);
         
-        if($this->current < 1)
+        if ($this->current < 1)
         {
             $this->current = 1;
         }
-        else if($this->current > $pages)
+        else if ($this->current > $pages)
         {
             $this->current = $pages;
         }
@@ -331,19 +331,19 @@ 
         $this->last = $pages;
         
         $nextPage = $this->current + 1;
-        if($nextPage <= $pages) {
+        if ($nextPage <= $pages) {
             $this->next = $nextPage;
         }
         
         $prevPage = $this->current - 1;
-        if($prevPage > 0) {
+        if ($prevPage > 0) {
             $this->prev = $prevPage;
         }
         
         $this->offsetStart = ($this->current - 1) * $this->perPage;
         
         $this->offsetEnd = $this->offsetStart + $this->perPage;
-        if($this->offsetEnd > ($this->total - 1)) {
+        if ($this->offsetEnd > ($this->total - 1)) {
             $this->offsetEnd = ($this->total - 1);
         }
     }

src/SVNHelper.php

Spacing +18 added lines, -18 removed lines

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

Indentation +161 added lines, -161 removed lines

@@ -23,91 +23,91 @@ 
  */
 class SVNHelper
 {
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     const ERROR_LOCAL_PATH_DOES_NOT_EXIST = 22401;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     const ERROR_INVALID_REP_URL = 22402;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     const ERROR_PATH_IS_OUTSIDE_REPOSITORY = 22403;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     const ERROR_TARGET_FOLDER_IS_A_FILE = 22404;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     const ERROR_CANNOT_ADD_INEXISTENT_FILE = 22405;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     const ERROR_TARGET_PATH_NOT_FOUND = 22406;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     const ERROR_INVALID_TARGET_TYPE = 22407;
     
-   /**
-    * @var SVNHelper_Target_Folder
-    */
+    /**
+     * @var SVNHelper_Target_Folder
+     */
     protected $target;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $path;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $url;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $user;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $pass;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $options = array(
         'binaries-path' => ''
     );
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     protected $isWindows = false;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $normalize = array(
         'from' => '\\',
         'to' => '/'
     );
     
-   /**
-    * @param string $repPath The path to the repository
-    * @param string $repURL The SVN URL to the repository
-    * @throws SVNHelper_Exception
-    */
+    /**
+     * @param string $repPath The path to the repository
+     * @param string $repURL The SVN URL to the repository
+     * @throws SVNHelper_Exception
+     */
     public function __construct(string $repPath, string $repURL)
     {
         $this->isWindows = substr(PHP_OS, 0, 3) == 'WIN';
@@ -168,16 +168,16 @@ 
         return $this->pass;
     }
     
-   /**
-    * Normalizes slashes in the path according to the
-    * operating system, i.e. forward slashes for NIX-systems
-    * and backward slashes for Windows.
-    *
-    * @param string $path An absolute path to normalize
-    * @param bool $relativize Whether to return a path relative to the repository
-    * @throws SVNHelper_Exception
-    * @return string
-    */
+    /**
+     * Normalizes slashes in the path according to the
+     * operating system, i.e. forward slashes for NIX-systems
+     * and backward slashes for Windows.
+     *
+     * @param string $path An absolute path to normalize
+     * @param bool $relativize Whether to return a path relative to the repository
+     * @throws SVNHelper_Exception
+     * @return string
+     */
     public function normalizePath($path, $relativize=false)
     {
         if(empty($path)) {
@@ -212,32 +212,32 @@ 
         );
     }
     
-   /**
-    * Retrieves the path slash style according to the
-    * current operating system.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the path slash style according to the
+     * current operating system.
+     * 
+     * @return string
+     */
     public function getSlash()
     {
         return $this->normalize['to'];
     }
     
-   /**
-    * Keeps instances of files.
-    * @var SVNHelper_Target[]
-    */
+    /**
+     * Keeps instances of files.
+     * @var SVNHelper_Target[]
+     */
     protected $targets = array();
     
-   /**
-    * Retrieves a file instance from the SVN repository:
-    * this allows all possible operations on the file as
-    * well as accessing more information on it.
-    * 
-    * @param string $path A path to the file, relative to the repository path or absolute.
-    * @return SVNHelper_Target_File
-    * @throws SVNHelper_Exception
-    */
+    /**
+     * Retrieves a file instance from the SVN repository:
+     * this allows all possible operations on the file as
+     * well as accessing more information on it.
+     * 
+     * @param string $path A path to the file, relative to the repository path or absolute.
+     * @return SVNHelper_Target_File
+     * @throws SVNHelper_Exception
+     */
     public function getFile($path)
     {
         $path = $this->filterPath($path);
@@ -245,15 +245,15 @@ 
         return $this->getTarget('File', $this->relativizePath($path));
     }
 
-   /**
-    * Retrieves a folder instance from the SVN repository:
-    * This allows all possible operations on the folder as
-    * well as accessing more information on it.
-    * 
-    * @param string $path
-    * @return SVNHelper_Target_Folder
-    * @throws SVNHelper_Exception
-    */
+    /**
+     * Retrieves a folder instance from the SVN repository:
+     * This allows all possible operations on the folder as
+     * well as accessing more information on it.
+     * 
+     * @param string $path
+     * @return SVNHelper_Target_Folder
+     * @throws SVNHelper_Exception
+     */
     public function getFolder($path)
     {
         $path = $this->filterPath($path);
@@ -261,13 +261,13 @@ 
         return $this->getTarget('Folder', $this->relativizePath($path));
     }
     
-   /**
-    * Passes the path through realpath and ensures it exists.
-    *
-    * @param string $path
-    * @throws SVNHelper_Exception
-    * @return string
-    */
+    /**
+     * Passes the path through realpath and ensures it exists.
+     *
+     * @param string $path
+     * @throws SVNHelper_Exception
+     * @return string
+     */
     protected function filterPath($path)
     {
         if(empty($path)) {
@@ -292,13 +292,13 @@ 
         );
     }
     
-   /**
-    * Retrieves a target file or folder within the repository.
-    *
-    * @param string $type The target type, "File" or "Folder".
-    * @param string $relativePath A path relative to the root folder.
-    * @return SVNHelper_Target
-    */
+    /**
+     * Retrieves a target file or folder within the repository.
+     *
+     * @param string $type The target type, "File" or "Folder".
+     * @param string $relativePath A path relative to the root folder.
+     * @return SVNHelper_Target
+     */
     protected function getTarget($type, $relativePath)
     {
         $key = $type.':'.$relativePath;
@@ -346,33 +346,33 @@ 
         return $this->url;
     }
     
-   /**
-    * Updates the whole SVN repository from the root folder.
-    * @return SVNHelper_CommandResult
-    */
+    /**
+     * Updates the whole SVN repository from the root folder.
+     * @return SVNHelper_CommandResult
+     */
     public function runUpdate()
     {
         return $this->createUpdate($this->target)->execute();
     }
     
-   /**
-    * Creates an update command for the target file or folder.
-    * This can be configured further before it is executed.
-    * 
-    * @param SVNHelper_Target $target
-    * @return SVNHelper_Command_Update
-    */
+    /**
+     * Creates an update command for the target file or folder.
+     * This can be configured further before it is executed.
+     * 
+     * @param SVNHelper_Target $target
+     * @return SVNHelper_Command_Update
+     */
     public function createUpdate(SVNHelper_Target $target)
     {
         return $this->createCommand('Update', $target);
     }
     
-   /**
-    * Creates an add command for the targt file or folder.
-    * 
-    * @param SVNHelper_Target $target
-    * @return SVNHelper_Command_Add
-    */
+    /**
+     * Creates an add command for the targt file or folder.
+     * 
+     * @param SVNHelper_Target $target
+     * @return SVNHelper_Command_Add
+     */
     public function createAdd(SVNHelper_Target $target)
     {
         return $this->createCommand('Add', $target);
@@ -389,12 +389,12 @@ 
         return $this->createCommand('Info', $target);
     }
     
-   /**
-    * Creates a status command for the target file or folder.
-    * 
-    * @param SVNHelper_Target $target
-    * @return SVNHelper_Command_Status
-    */
+    /**
+     * Creates a status command for the target file or folder.
+     * 
+     * @param SVNHelper_Target $target
+     * @return SVNHelper_Command_Status
+     */
     public function createStatus(SVNHelper_Target $target)
     {
         return $this->createCommand('Status', $target);
@@ -419,28 +419,28 @@ 
         return $cmd;
     }
     
-   /**
-    * Creates a path relative to the repository for the target
-    * file or folder, from an absolute path.
-    *
-    * @param string $path An absolute path.
-    * @return string
-    */
+    /**
+     * Creates a path relative to the repository for the target
+     * file or folder, from an absolute path.
+     *
+     * @param string $path An absolute path.
+     * @return string
+     */
     public function relativizePath($path)
     {
         return $this->normalizePath($path, true);
     }
     
-   /**
-    * Adds a folder: creates it as necessary (recursive),
-    * and adds it to be committed if it is not versioned yet.
-    * Use this instead of {@link getFolder()} when you are
-    * not sure that it exists yet, and will need it.
-    * 
-    * @param string $path Absolute or relative path to the folder
-    * @throws SVNHelper_Exception
-    * @return SVNHelper_Target_Folder
-    */
+    /**
+     * Adds a folder: creates it as necessary (recursive),
+     * and adds it to be committed if it is not versioned yet.
+     * Use this instead of {@link getFolder()} when you are
+     * not sure that it exists yet, and will need it.
+     * 
+     * @param string $path Absolute or relative path to the folder
+     * @throws SVNHelper_Exception
+     * @return SVNHelper_Target_Folder
+     */
     public function addFolder($path)
     {
         if(is_dir($path)) {
@@ -490,14 +490,14 @@ 
     
     protected static $logCallback;
 
-   /**
-    * Sets the callback function/method to use for
-    * SVH helper log messages. This gets the message
-    * and the SVNHelper instance as parameters.
-    * 
-    * @param callable $callback
-    * @throws SVNHelper_Exception
-    */
+    /**
+     * Sets the callback function/method to use for
+     * SVH helper log messages. This gets the message
+     * and the SVNHelper instance as parameters.
+     * 
+     * @param callable $callback
+     * @throws SVNHelper_Exception
+     */
     public static function setLogCallback($callback)
     {
         if(!is_callable($callback)) {
@@ -518,22 +518,22 @@ 
         }
     }
 
-   /**
-    * Retrieves information about the file, and adds it
-    * to be committed later if it not versioned yet. 
-    * 
-    * @param string $path
-    * @return SVNHelper_Target_File
-    */
+    /**
+     * Retrieves information about the file, and adds it
+     * to be committed later if it not versioned yet. 
+     * 
+     * @param string $path
+     * @return SVNHelper_Target_File
+     */
     public function addFile($path)
     {
         return $this->getFile($path)->runAdd();        
     }
     
-   /**
-    * Commits all changes in the repository.
-    * @param string $message The commit message to log.
-    */
+    /**
+     * Commits all changes in the repository.
+     * @param string $message The commit message to log.
+     */
     public function runCommit($message)
     {
         $this->createCommit($this->getFolder($this->path), $message)->execute();

src/SVNHelper/Exception.php

Spacing +4 added lines, -4 removed lines

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