Mistralys / application-utils

src/VariableInfo.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         if(is_array($serialized))
         {
             $this->parseSerialized($serialized);
-        }
-        else
+        } else
         {
             $this->parseValue($value);
         }

Indentation +41 added lines, -41 removed lines

@@ -32,25 +32,25 @@ 
         self::TYPE_CALLABLE => 'cf5e20'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $string;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
-   /**
-    * @param mixed $value
-    * @param array|null $serialized
-    */
+    /**
+     * @param mixed $value
+     * @param array|null $serialized
+     */
     public function __construct($value, $serialized=null)
     {
         if(is_array($serialized))
@@ -63,26 +63,26 @@ 
         }
     }
     
-   /**
-    * Creates a new variable info instance from a PHP variable
-    * of any type.
-    * 
-    * @param mixed $variable
-    * @return VariableInfo
-    */
+    /**
+     * Creates a new variable info instance from a PHP variable
+     * of any type.
+     * 
+     * @param mixed $variable
+     * @return VariableInfo
+     */
     public static function fromVariable($variable) : VariableInfo
     {
         return new VariableInfo($variable);
     }
     
-   /**
-    * Restores a variable info instance using a previously serialized
-    * array using the serialize() method.
-    * 
-    * @param array $serialized
-    * @return VariableInfo
-    * @see VariableInfo::serialize()
-    */
+    /**
+     * Restores a variable info instance using a previously serialized
+     * array using the serialize() method.
+     * 
+     * @param array $serialized
+     * @return VariableInfo
+     * @see VariableInfo::serialize()
+     */
     public static function fromSerialized(array $serialized) : VariableInfo
     {
         return new VariableInfo(null, $serialized);
@@ -108,12 +108,12 @@ 
         $this->string = $this->_toString();
     }
     
-   /**
-    * The variable type - this is the same string that
-    * is returned by the PHP function `gettype`.
-    * 
-    * @return string
-    */
+    /**
+     * The variable type - this is the same string that
+     * is returned by the PHP function `gettype`.
+     * 
+     * @return string
+     */
     public function getType() : string
     {
         return $this->type;
@@ -127,13 +127,13 @@ 
         );
     }
     
-   /**
-    * Whether to prepend the variable type before the value, 
-    * like the var_dump function. Example: <code>string "Some text"</code>.
-    * 
-    * @param bool $enable
-    * @return VariableInfo
-    */
+    /**
+     * Whether to prepend the variable type before the value, 
+     * like the var_dump function. Example: <code>string "Some text"</code>.
+     * 
+     * @param bool $enable
+     * @return VariableInfo
+     */
     public function enableType(bool $enable=true) : VariableInfo
     {
         return $this->setOption('prepend-type', $enable);

Spacing +11 added lines, -11 removed lines

@@ -51,9 +51,9 @@ 
     * @param mixed $value
     * @param array|null $serialized
     */
-    public function __construct($value, $serialized=null)
+    public function __construct($value, $serialized = null)
     {
-        if(is_array($serialized))
+        if (is_array($serialized))
         {
             $this->parseSerialized($serialized);
         }
@@ -101,7 +101,7 @@ 
         $this->value = $value;
         $this->type = strtolower(gettype($value));
         
-        if(is_array($value) && is_callable($value)) {
+        if (is_array($value) && is_callable($value)) {
             $this->type = self::TYPE_CALLABLE;
         }
         
@@ -134,7 +134,7 @@ 
     * @param bool $enable
     * @return VariableInfo
     */
-    public function enableType(bool $enable=true) : VariableInfo
+    public function enableType(bool $enable = true) : VariableInfo
     {
         return $this->setOption('prepend-type', $enable);
     }
@@ -143,9 +143,9 @@ 
     {
         $converted = $this->string;
         
-        if($this->getOption('prepend-type') === true && !$this->isNull())
+        if ($this->getOption('prepend-type') === true && !$this->isNull())
         {
-            if($this->isString())
+            if ($this->isString())
             {
                 $converted = '"'.$converted.'"';
             }
@@ -177,16 +177,16 @@ 
         
         $converted = $this->$varMethod();
         
-        if($format === 'HTML')
+        if ($format === 'HTML')
         {
             $converted = '<span style="color:#'.self::$colors[$type].'" class="variable-value-'.$this->type.'">'.$converted.'</span>';
         }
         
-        if($this->getOption('prepend-type') === true && !$this->isNull()) 
+        if ($this->getOption('prepend-type') === true && !$this->isNull()) 
         {
             $typeLabel = $type;
             
-            switch($format)
+            switch ($format)
             {
                 case 'HTML':
                     $typeLabel = '<span style="color:#1c2eb1" class="variable-type">'.$type.'</span> ';
@@ -212,7 +212,7 @@ 
     {
         $string = '';
         
-        if(is_string($this->value[0])) {
+        if (is_string($this->value[0])) {
             $string .= $this->value[0].'::';
         } else {
             $string .= get_class($this->value[0]).'->';
@@ -339,7 +339,7 @@ 
             str_replace(' ', '-', $this->type)
         );
         
-        if($this->getOption('prepend-type') === true && !$this->isNull())
+        if ($this->getOption('prepend-type') === true && !$this->isNull())
         {
             $typeLabel = '<span style="color:#1c2eb1" class="variable-type">'.$this->type.'</span> ';
             $converted = $typeLabel.' '.$converted;

src/BaseException.php

Braces +2 added lines, -4 removed lines

@@ -59,8 +59,7 @@ 
         try
         {
             throw new BaseException('');
-        }
-        catch(BaseException $e) 
+        } catch(BaseException $e) 
         {
             echo self::createInfo($e)->toString();
         }
@@ -74,8 +73,7 @@ 
         try
         {
             throw new BaseException('');
-        }
-        catch(BaseException $e)
+        } catch(BaseException $e)
         {
             echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">';
             echo self::createInfo($e)->toString();

Indentation +36 added lines, -36 removed lines

@@ -20,17 +20,17 @@ 
  */
 class BaseException extends \Exception
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $details;
     
-   /**
-    * @param string $message
-    * @param string $details
-    * @param int $code
-    * @param \Exception $previous
-    */
+    /**
+     * @param string $message
+     * @param string $details
+     * @param int $code
+     * @param \Exception $previous
+     */
     public function __construct(string $message, $details=null, $code=null, $previous=null)
     {
         parent::__construct($message, $code, $previous);
@@ -38,10 +38,10 @@ 
         $this->details = $details;
     }
     
-   /**
-    * Retrieves the detailed error description, if any.
-    * @return string
-    */
+    /**
+     * Retrieves the detailed error description, if any.
+     * @return string
+     */
     public function getDetails() : string
     {
         if($this->details !== null) {
@@ -51,10 +51,10 @@ 
         return '';
     }
     
-   /**
-    * Displays pertinent information on the exception in
-    * the browser, and exits the script.
-    */
+    /**
+     * Displays pertinent information on the exception in
+     * the browser, and exits the script.
+     */
     public function display()
     {
         if(!headers_sent()) {
@@ -65,20 +65,20 @@ 
         exit;
     }
     
-   /**
-    * Retrieves information on the exception that can be
-    * easily accessed.
-    * 
-    * @return ConvertHelper_ThrowableInfo
-    */
+    /**
+     * Retrieves information on the exception that can be
+     * easily accessed.
+     * 
+     * @return ConvertHelper_ThrowableInfo
+     */
     public function getInfo() : ConvertHelper_ThrowableInfo
     {
         return ConvertHelper::throwable2info($this);
     }
     
-   /**
-    * Dumps a current PHP function trace, as a textonly string.
-    */
+    /**
+     * Dumps a current PHP function trace, as a textonly string.
+     */
     public static function dumpTraceAsString()
     {
         try
@@ -91,9 +91,9 @@ 
         }
     }
 
-   /**
-    * Dumps a current PHP function trace, with HTML styling.
-    */
+    /**
+     * Dumps a current PHP function trace, with HTML styling.
+     */
     public static function dumpTraceAsHTML()
     {
         try
@@ -108,13 +108,13 @@ 
         }
     }
     
-   /**
-    * Creates an exception info instance from a throwable instance.
-    * 
-    * @param \Throwable $e
-    * @return ConvertHelper_ThrowableInfo
-    * @see ConvertHelper::throwable2info()
-    */
+    /**
+     * Creates an exception info instance from a throwable instance.
+     * 
+     * @param \Throwable $e
+     * @return ConvertHelper_ThrowableInfo
+     * @see ConvertHelper::throwable2info()
+     */
     public static function createInfo(\Throwable $e) : ConvertHelper_ThrowableInfo
     {
         return ConvertHelper::throwable2info($e);

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
     * @param int $code
     * @param \Exception $previous
     */
-    public function __construct(string $message, $details=null, $code=null, $previous=null)
+    public function __construct(string $message, $details = null, $code = null, $previous = null)
     {
         parent::__construct($message, $code, $previous);
         
@@ -44,7 +44,7 @@ 
     */
     public function getDetails() : string
     {
-        if($this->details !== null) {
+        if ($this->details !== null) {
             return $this->details;
         }
         
@@ -57,7 +57,7 @@ 
     */
     public function display()
     {
-        if(!headers_sent()) {
+        if (!headers_sent()) {
             header('Content-type:text/plain; charset=utf-8');
         }
         
@@ -85,7 +85,7 @@ 
         {
             throw new BaseException('');
         }
-        catch(BaseException $e) 
+        catch (BaseException $e) 
         {
             echo self::createInfo($e)->toString();
         }
@@ -100,7 +100,7 @@ 
         {
             throw new BaseException('');
         }
-        catch(BaseException $e)
+        catch (BaseException $e)
         {
             echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">';
             echo self::createInfo($e)->toString();

src/IniHelper/Line.php

Indentation +18 added lines, -18 removed lines

@@ -38,38 +38,38 @@
      */
     protected $text;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $trimmed;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $lineNumber;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $varName = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $varValue = '';
     
     protected $valueUnquoted = '';
     
     protected $quoteStyle = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $sectionName = '';
     
     public function __construct(string $text, int $lineNumber)

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
         $this->trimmed = trim($text);
         $this->lineNumber = $lineNumber;
         
-        if(empty($this->trimmed)) 
+        if (empty($this->trimmed)) 
         {
             $this->type = self::TYPE_EMPTY;
             return;
@@ -86,11 +86,11 @@ 
         
         $startChar = substr($this->trimmed, 0, 1);
         
-        if($startChar === ';')
+        if ($startChar === ';')
         {
             $this->type = self::TYPE_COMMENT;
         }
-        else if($startChar === '[')
+        else if ($startChar === '[')
         {
             $this->type = self::TYPE_SECTION_DECLARATION;
             $this->sectionName = trim($this->trimmed, '[]');
@@ -99,7 +99,7 @@ 
         else
         {
             $pos = strpos($this->trimmed, '=');
-            if($pos === false) 
+            if ($pos === false) 
             {
                 $this->type = self::TYPE_INVALID;
                 return;
@@ -108,7 +108,7 @@ 
             $this->type = self::TYPE_VALUE;
             $this->varName = trim(substr($this->trimmed, 0, $pos));
             
-            $this->parseValue(substr($this->trimmed, $pos+1));
+            $this->parseValue(substr($this->trimmed, $pos + 1));
         }
     }
     
@@ -118,12 +118,12 @@ 
         
         $value = $this->varValue;
         
-        if(substr($value, 0, 1) == '"' && substr($value, -1, 1) == '"')
+        if (substr($value, 0, 1) == '"' && substr($value, -1, 1) == '"')
         {
             $value = trim($value, '"');
             $this->quoteStyle = '"';
         }
-        else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
+        else if (substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
         {
             $value = trim($value, "'");
             $this->quoteStyle = "'";
@@ -144,7 +144,7 @@ 
     
     public function getQuotedVarValue() : string
     {
-        if($this->quoteStyle === '') {
+        if ($this->quoteStyle === '') {
             return $this->getVarValue();
         }
         
@@ -198,7 +198,7 @@ 
     
     public function setValue($value) : IniHelper_Line
     {
-        if(!is_scalar($value)) 
+        if (!is_scalar($value)) 
         {
             throw new IniHelper_Exception(
                 'Cannot use non-scalar values.',
@@ -218,7 +218,7 @@ 
     
     public function toString() : string
     {
-        switch($this->type) 
+        switch ($this->type) 
         {
             case self::TYPE_EMPTY:
             case self::TYPE_INVALID:

Braces +3 added lines, -6 removed lines

@@ -89,14 +89,12 @@ 
         if($startChar === ';')
         {
             $this->type = self::TYPE_COMMENT;
-        }
-        else if($startChar === '[')
+        } else if($startChar === '[')
         {
             $this->type = self::TYPE_SECTION_DECLARATION;
             $this->sectionName = trim($this->trimmed, '[]');
             $this->sectionName = trim($this->sectionName); // remove any whitespace
-        }
-        else
+        } else
         {
             $pos = strpos($this->trimmed, '=');
             if($pos === false) 
@@ -122,8 +120,7 @@ 
         {
             $value = trim($value, '"');
             $this->quoteStyle = '"';
-        }
-        else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
+        } else if(substr($value, 0, 1) == "'" && substr($value, -1, 1) == "'")
         {
             $value = trim($value, "'");
             $this->quoteStyle = "'";

src/IniHelper/Section.php

Indentation +65 added lines, -65 removed lines

@@ -21,19 +21,19 @@ 
  */
 class IniHelper_Section
 {
-   /**
-    * @var IniHelper
-    */
+    /**
+     * @var IniHelper
+     */
     protected $ini;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $name;
     
-   /**
-    * @var IniHelper_Line[]
-    */
+    /**
+     * @var IniHelper_Line[]
+     */
     protected $lines = array();
     
     public function __construct(IniHelper $ini, string $name)
@@ -42,33 +42,33 @@ 
         $this->name = $name;
     }
     
-   /**
-    * The section's name.
-    * @return string
-    */
+    /**
+     * The section's name.
+     * @return string
+     */
     public function getName() : string
     {
         return $this->name;
     }
     
-   /**
-    * Whether this is the default section: this 
-    * is used internally to store all variables that
-    * are not in any specific section.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether this is the default section: this 
+     * is used internally to store all variables that
+     * are not in any specific section.
+     * 
+     * @return bool
+     */
     public function isDefault() : bool
     {
         return $this->name === IniHelper::SECTION_DEFAULT;
     }
     
-   /**
-    * Adds a line instance to the section.
-    * 
-    * @param IniHelper_Line $line
-    * @return IniHelper_Section
-    */
+    /**
+     * Adds a line instance to the section.
+     * 
+     * @param IniHelper_Line $line
+     * @return IniHelper_Section
+     */
     public function addLine(IniHelper_Line $line) : IniHelper_Section
     {
         $this->lines[] = $line;
@@ -76,12 +76,12 @@ 
         return $this;
     }
     
-   /**
-    * Converts the values contained in the section into 
-    * an associative array.
-    * 
-    * @return array
-    */
+    /**
+     * Converts the values contained in the section into 
+     * an associative array.
+     * 
+     * @return array
+     */
     public function toArray() : array
     {
         $result = array();
@@ -114,11 +114,11 @@ 
         return $result;
     }
     
-   /**
-    * Converts the section's lines into an INI string.
-    * 
-    * @return string
-    */
+    /**
+     * Converts the section's lines into an INI string.
+     * 
+     * @return string
+     */
     public function toString()
     {
         $lines = array();
@@ -140,12 +140,12 @@ 
         return implode($this->ini->getEOLChar(), $lines);
     }
 
-   /**
-    * Deletes a line from the section.
-    * 
-    * @param IniHelper_Line $toDelete
-    * @return IniHelper_Section
-    */
+    /**
+     * Deletes a line from the section.
+     * 
+     * @param IniHelper_Line $toDelete
+     * @return IniHelper_Section
+     */
     public function deleteLine(IniHelper_Line $toDelete) : IniHelper_Section
     {
         $keep = array();
@@ -162,13 +162,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets the value of a variable, overwriting any existing value.
-    * 
-    * @param string $name
-    * @param mixed $value If an array is specified, it is treated as duplicate keys and will add a line for each value.
-    * @return IniHelper_Section
-    */
+    /**
+     * Sets the value of a variable, overwriting any existing value.
+     * 
+     * @param string $name
+     * @param mixed $value If an array is specified, it is treated as duplicate keys and will add a line for each value.
+     * @return IniHelper_Section
+     */
     public function setValue(string $name, $value) : IniHelper_Section
     {
         $lines = $this->getLinesByVariable($name);
@@ -229,15 +229,15 @@ 
         return $this;
     }
     
-   /**
-    * Adds a variable value to the section. Unlike setValue(), this
-    * will not overwrite any existing value. If the name is an existing
-    * variable name, it will be converted to duplicate keys.
-    * 
-    * @param string $name
-    * @param mixed $value If this is an array, it will be treated as duplicate keys, and all values that are not present yet will be added.
-    * @return IniHelper_Section
-    */
+    /**
+     * Adds a variable value to the section. Unlike setValue(), this
+     * will not overwrite any existing value. If the name is an existing
+     * variable name, it will be converted to duplicate keys.
+     * 
+     * @param string $name
+     * @param mixed $value If this is an array, it will be treated as duplicate keys, and all values that are not present yet will be added.
+     * @return IniHelper_Section
+     */
     public function addValue(string $name, $value) : IniHelper_Section
     {
         // array value? Treat it as duplicate keys.
@@ -295,12 +295,12 @@ 
     }
     
     
-   /**
-    * Retrieves all lines for the specified variable name.
-    *  
-    * @param string $name
-    * @return \AppUtils\IniHelper_Line[]
-    */
+    /**
+     * Retrieves all lines for the specified variable name.
+     *  
+     * @param string $name
+     * @return \AppUtils\IniHelper_Line[]
+     */
     public function getLinesByVariable(string $name)
     {
         $result = array();

Spacing +24 added lines, -24 removed lines

@@ -86,15 +86,15 @@ 
     {
         $result = array();
         
-        foreach($this->lines as $line)
+        foreach ($this->lines as $line)
         {
-            if(!$line->isValue()) {
+            if (!$line->isValue()) {
                 continue;
             }
 
             $name = $line->getVarName();
             
-            if(!isset($result[$name])) 
+            if (!isset($result[$name])) 
             {
                 $result[$name] = $line->getVarValue();
                 continue;
@@ -103,7 +103,7 @@ 
             // name exists in collection? Then this is a
             // duplicate key and we need to convert it to
             // an indexed array of values.
-            if(!is_array($result[$name])) 
+            if (!is_array($result[$name])) 
             {
                 $result[$name] = array($result[$name]);
             }
@@ -122,15 +122,15 @@ 
     public function toString()
     {
         $lines = array();
-        if(!$this->isDefault()) 
+        if (!$this->isDefault()) 
         {
             $lines[] = '['.$this->getName().']';
         }
         
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             // we already did this
-            if($line->isSection()) {
+            if ($line->isSection()) {
                 continue;
             }
             
@@ -150,9 +150,9 @@ 
     {
         $keep = array();
         
-        foreach($this->lines as $line)
+        foreach ($this->lines as $line)
         {
-            if($line !== $toDelete) {
+            if ($line !== $toDelete) {
                 $keep[] = $line;
             }
         }
@@ -177,23 +177,23 @@ 
         // Removes any superfluous values that may
         // already exist, if there are more than the
         // new set of values.
-        if(is_array($value))
+        if (is_array($value))
         {
             $values = array_values($value);
             $amountNew = count($values);
             $amountExisting = count($lines);
             
             $max = $amountNew;
-            if($amountExisting > $max) {
+            if ($amountExisting > $max) {
                 $max = $amountExisting;
             }
             
-            for($i=0; $i < $max; $i++) 
+            for ($i = 0; $i < $max; $i++) 
             {
                 // new value exists
-                if(isset($values[$i]))
+                if (isset($values[$i]))
                 {
-                    if(isset($lines[$i])) {
+                    if (isset($lines[$i])) {
                         $lines[$i]->setValue($values[$i]);
                     } else {
                         $this->addValueLine($name, $values[$i]);
@@ -211,12 +211,12 @@ 
         else
         {
             // remove all superfluous lines
-            if(!empty($lines))
+            if (!empty($lines))
             {
                 $line = array_shift($lines); // keep only the first line
                 $line->setValue($value);
                 
-                foreach($lines as $delete) {
+                foreach ($lines as $delete) {
                     $this->deleteLine($delete);
                 }
             }
@@ -241,11 +241,11 @@ 
     public function addValue(string $name, $value) : IniHelper_Section
     {
         // array value? Treat it as duplicate keys.
-        if(is_array($value))
+        if (is_array($value))
         {
             $values = array_values($value);
             
-            foreach($values as $setValue)
+            foreach ($values as $setValue)
             {
                 $this->addValue($name, $setValue);
             }
@@ -255,7 +255,7 @@ 
         
         $lines = $this->getLinesByVariable($name);
         
-        if(empty($lines))
+        if (empty($lines))
         {
             $this->addValueLine($name, $value);
         }
@@ -263,15 +263,15 @@ 
         {
             $found = false;
             
-            foreach($lines as $line)
+            foreach ($lines as $line)
             {
-                if($line->getVarValue() === $value) {
+                if ($line->getVarValue() === $value) {
                     $found = $line;
                     break;
                 }
             }
             
-            if(!$found)
+            if (!$found)
             {
                 $this->addValueLine($name, $value);
             }
@@ -305,9 +305,9 @@ 
     {
         $result = array();
         
-        foreach($this->lines as $line)
+        foreach ($this->lines as $line)
         {
-            if($line->isValue() && $line->getVarName() === $name) {
+            if ($line->isValue() && $line->getVarName() === $name) {
                 $result[] = $line;
             }
         }

Braces +3 added lines, -6 removed lines

@@ -198,8 +198,7 @@ 
                     } else {
                         $this->addValueLine($name, $values[$i]);
                     }
-                }
-                else 
+                } else 
                 {
                     $this->deleteLine($lines[$i]);
                 }
@@ -219,8 +218,7 @@ 
                 foreach($lines as $delete) {
                     $this->deleteLine($delete);
                 }
-            }
-            else 
+            } else 
             {
                 $this->addValueLine($name, $value);
             }
@@ -258,8 +256,7 @@ 
         if(empty($lines))
         {
             $this->addValueLine($name, $value);
-        }
-        else
+        } else
         {
             $found = false;
             

src/ZIPHelper.php

Indentation +50 added lines, -50 removed lines

@@ -38,9 +38,9 @@ 
     
     protected $file;
     
-   /**
-    * @var \ZipArchive
-    */
+    /**
+     * @var \ZipArchive
+     */
     protected $zip;
     
     public function __construct($targetFile)
@@ -48,33 +48,33 @@ 
         $this->file = $targetFile;
     }
     
-   /**
-    * Sets an option, among the available options:
-    * 
-    * <ul>
-    * <li>WriteThreshold: The amount of files to add before the zip is automatically written to disk and re-opened to release the file handles. Set to 0 to disable.</li>
-    * </ul>
-    * 
-    * @param string $name
-    * @param mixed $value
-    * @return ZIPHelper
-    */
+    /**
+     * Sets an option, among the available options:
+     * 
+     * <ul>
+     * <li>WriteThreshold: The amount of files to add before the zip is automatically written to disk and re-opened to release the file handles. Set to 0 to disable.</li>
+     * </ul>
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return ZIPHelper
+     */
     public function setOption($name, $value)
     {
         $this->options[$name] = $value;
         return $this;
     }
     
-   /**
-    * Adds a file to the zip. By default, the file is stored
-    * with the same name in the root of the zip. Use the optional
-    * parameter to change the location in the zip.
-    * 
-    * @param string $filePath
-    * @param string $zipPath
-    * @throws ZIPHelper_Exception
-    * @return bool
-    */
+    /**
+     * Adds a file to the zip. By default, the file is stored
+     * with the same name in the root of the zip. Use the optional
+     * parameter to change the location in the zip.
+     * 
+     * @param string $filePath
+     * @param string $zipPath
+     * @throws ZIPHelper_Exception
+     * @return bool
+     */
     public function addFile($filePath, $zipPath=null)
     {
         $this->open();
@@ -252,13 +252,13 @@ 
     
     protected $exit;
     
-   /**
-    * Like {@link ZIPHelper::download()}, but deletes the
-    * file after sending it to the browser.
-    * 
-    * @param string|NULL $fileName Override the ZIP's file name for the download
-    * @see ZIPHelper::download()
-    */
+    /**
+     * Like {@link ZIPHelper::download()}, but deletes the
+     * file after sending it to the browser.
+     * 
+     * @param string|NULL $fileName Override the ZIP's file name for the download
+     * @see ZIPHelper::download()
+     */
     public function downloadAndDelete($fileName=null)
     {
         $this->exit = false;
@@ -272,14 +272,14 @@ 
         exit;
     }
 
-   /**
-    * Extracts all files and folders from the zip to the 
-    * target folder. If no folder is specified, the files
-    * are extracted into the same folder as the zip itself.
-    * 
-    * @param string $outputFolder
-    * @return boolean
-    */
+    /**
+     * Extracts all files and folders from the zip to the 
+     * target folder. If no folder is specified, the files
+     * are extracted into the same folder as the zip itself.
+     * 
+     * @param string $outputFolder
+     * @return boolean
+     */
     public function extractAll($outputFolder=null)
     {
         if(empty($outputFolder)) {
@@ -292,9 +292,9 @@ 
     }
 
     
-   /**
-    * @return \ZipArchive
-    */
+    /**
+     * @return \ZipArchive
+     */
     public function getArchive()
     {
         $this->open();
@@ -302,14 +302,14 @@ 
         return $this->zip;
     }
     
-   /**
-    * JSON encodes the specified data and adds the json as
-    * a file in the ZIP archive.
-    * 
-    * @param mixed $data
-    * @param string $zipPath
-    * @return boolean
-    */
+    /**
+     * JSON encodes the specified data and adds the json as
+     * a file in the ZIP archive.
+     * 
+     * @param mixed $data
+     * @param string $zipPath
+     * @return boolean
+     */
     public function addJSON($data, $zipPath)
     {
         return $this->addString(

Spacing +17 added lines, -17 removed lines

@@ -30,7 +30,7 @@ 
     
     const ERROR_OPENING_ZIP_FILE = 338003;
     
-    const ERROR_CANNOT_SAVE_FILE_TO_DISK =338004;
+    const ERROR_CANNOT_SAVE_FILE_TO_DISK = 338004;
     
     protected $options = array(
         'WriteThreshold' => 100
@@ -75,7 +75,7 @@ 
     * @throws ZIPHelper_Exception
     * @return bool
     */
-    public function addFile($filePath, $zipPath=null)
+    public function addFile($filePath, $zipPath = null)
     {
         $this->open();
         
@@ -120,16 +120,16 @@ 
     
     protected function open()
     {
-        if($this->open) {
+        if ($this->open) {
             return;
         }
         
-        if(!isset($this->zip)) {
+        if (!isset($this->zip)) {
             $this->zip = new \ZipArchive();
         }
         
         $flag = null;
-        if(!file_exists($this->file)) {
+        if (!file_exists($this->file)) {
             $flag = \ZipArchive::CREATE;
         }
         
@@ -169,7 +169,7 @@ 
     {
         $this->fileTracker++;
 
-        if($this->options['WriteThreshold'] < 1) {
+        if ($this->options['WriteThreshold'] < 1) {
             return;
         }
         
@@ -182,7 +182,7 @@ 
     
     protected function close()
     {
-        if(!$this->open) {
+        if (!$this->open) {
             return;
         }
         
@@ -190,8 +190,8 @@ 
             throw new ZIPHelper_Exception(
                 'Could not save ZIP file to disk',
                 sprintf(
-                    'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, ' .
-                    'including adding files that do not exist on disk, trying to create an empty zip, ' .
+                    'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, '.
+                    'including adding files that do not exist on disk, trying to create an empty zip, '.
                     'or trying to save to a directory that does not exist.',
                     $this->file
                 ),
@@ -228,22 +228,22 @@ 
      * @see ZIPHelper::downloadAndDelete()
      * @throws ZIPHelper_Exception
      */
-    public function download($fileName=null)
+    public function download($fileName = null)
     {
         $this->save();
         
-        if(empty($fileName)) {
+        if (empty($fileName)) {
             $fileName = basename($this->file);
         }
         
         header('Content-type: application/zip');
-        header('Content-Disposition: attachment; filename=' . $fileName);
-        header('Content-length: ' . filesize($this->file));
+        header('Content-Disposition: attachment; filename='.$fileName);
+        header('Content-length: '.filesize($this->file));
         header('Pragma: no-cache');
         header('Expires: 0');
         readfile($this->file);
         
-        if($this->exit === false) {
+        if ($this->exit === false) {
             return;
         }
         
@@ -259,7 +259,7 @@ 
     * @param string|NULL $fileName Override the ZIP's file name for the download
     * @see ZIPHelper::download()
     */
-    public function downloadAndDelete($fileName=null)
+    public function downloadAndDelete($fileName = null)
     {
         $this->exit = false;
         
@@ -280,9 +280,9 @@ 
     * @param string $outputFolder
     * @return boolean
     */
-    public function extractAll($outputFolder=null)
+    public function extractAll($outputFolder = null)
     {
-        if(empty($outputFolder)) {
+        if (empty($outputFolder)) {
             $outputFolder = dirname($this->file);
         }
         

src/Transliteration.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
      * The converted string will be all lowercase.
      * @return Transliteration
      */
-    public function setLowercase(bool $lowercase=true) : Transliteration
+    public function setLowercase(bool $lowercase = true) : Transliteration
     {
         $this->setOption('lowercase', true);
 
@@ -97,8 +97,8 @@ 
 
         $result = implode('', $keep);
 
-        while (strstr($result, $space . $space)) {
-            $result = str_replace($space . $space, $space, $result);
+        while (strstr($result, $space.$space)) {
+            $result = str_replace($space.$space, $space, $result);
         }
 
         $result = trim($result, $space);

src/URLInfo.php

Indentation +140 added lines, -140 removed lines

@@ -19,15 +19,15 @@ 
     const TYPE_PHONE = 'phone';
     const TYPE_URL = 'url';
     
-   /**
-    * The original URL that was passed to the constructor.
-    * @var string
-    */
+    /**
+     * The original URL that was passed to the constructor.
+     * @var string
+     */
     protected $rawURL;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $info;
     
     protected $isEmail = false;
@@ -38,9 +38,9 @@ 
     
     protected $isPhone = false;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $knownSchemes = array(
         'ftp',
         'http',
@@ -51,36 +51,36 @@ 
         'file'
     );
 
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $error;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $params = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $excludedParams = array();
     
-   /**
-    * @var bool
-    * @see URLInfo::setParamExclusion()
-    */
+    /**
+     * @var bool
+     * @see URLInfo::setParamExclusion()
+     */
     protected $paramExclusion = false;
     
-   /**
-    * @var array
-    * @see URLInfo::getTypeLabel()
-    */
+    /**
+     * @var array
+     * @see URLInfo::getTypeLabel()
+     */
     protected static $typeLabels;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $highlightExcluded = false;
     
     protected $infoKeys = array(
@@ -177,13 +177,13 @@ 
         $this->isValid = true;
     }
     
-   /**
-    * Filters an URL: removes control characters and the
-    * like to have a clean URL to work with.
-    * 
-    * @param string $url
-    * @return string
-    */
+    /**
+     * Filters an URL: removes control characters and the
+     * like to have a clean URL to work with.
+     * 
+     * @param string $url
+     * @return string
+     */
     public static function filterURL(string $url)
     {
         // fix ampersands if it comes from HTML
@@ -206,11 +206,11 @@ 
         return $url;
     }
     
-   /**
-    * Goes through all information in the parse_url result
-    * array, and attempts to fix any user errors in formatting
-    * that can be recovered from, mostly regarding stray spaces.
-    */
+    /**
+     * Goes through all information in the parse_url result
+     * array, and attempts to fix any user errors in formatting
+     * that can be recovered from, mostly regarding stray spaces.
+     */
     protected function filterParsed()
     {
         foreach($this->info as $key => $val)
@@ -294,12 +294,12 @@ 
         return $this->isPhone;
     }
     
-   /**
-    * Whether the URL is a regular URL, not one of the 
-    * other types like a phone number or email address.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the URL is a regular URL, not one of the 
+     * other types like a phone number or email address.
+     * 
+     * @return bool
+     */
     public function isURL() : bool
     {
         $host = $this->getHost();
@@ -311,20 +311,20 @@ 
         return $this->isValid;
     }
     
-   /**
-    * Retrieves the host name, or an empty string if none is present.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the host name, or an empty string if none is present.
+     * 
+     * @return string
+     */
     public function getHost() : string
     {
         return $this->getInfoKey('host');
     }
     
-   /**
-    * Retrieves the path, or an empty string if none is present.
-    * @return string
-    */
+    /**
+     * Retrieves the path, or an empty string if none is present.
+     * @return string
+     */
     public function getPath() : string
     {
         return $this->getInfoKey('path');
@@ -340,10 +340,10 @@ 
         return $this->getInfoKey('scheme');
     }
     
-   /**
-    * Retrieves the port specified in the URL, or -1 if none is preseent.
-    * @return int
-    */
+    /**
+     * Retrieves the port specified in the URL, or -1 if none is preseent.
+     * @return int
+     */
     public function getPort() : int
     {
         $port = $this->getInfoKey('port');
@@ -354,13 +354,13 @@ 
         return -1;
     }
     
-   /**
-    * Retrieves the raw query string, or an empty string if none is present.
-    * 
-    * @return string
-    * 
-    * @see URLInfo::getParams()
-    */
+    /**
+     * Retrieves the raw query string, or an empty string if none is present.
+     * 
+     * @return string
+     * 
+     * @see URLInfo::getParams()
+     */
     public function getQuery() : string
     {
         return $this->getInfoKey('query');
@@ -376,20 +376,20 @@ 
         return $this->getInfoKey('pass');
     }
     
-   /**
-    * Whether the URL contains a port number.
-    * @return bool
-    */
+    /**
+     * Whether the URL contains a port number.
+     * @return bool
+     */
     public function hasPort() : bool
     {
         return $this->getPort() !== -1;
     }
     
-   /**
-    * Alias for the hasParams() method.
-    * @return bool
-    * @see URLInfo::hasParams()
-    */
+    /**
+     * Alias for the hasParams() method.
+     * @return bool
+     * @see URLInfo::hasParams()
+     */
     public function hasQuery() : bool
     {
         return $this->hasParams();
@@ -470,25 +470,25 @@ 
         return $normalized;
     }
     
-   /**
-    * Creates a hash of the URL, which can be used for comparisons.
-    * Since any parameters in the URL's query are sorted alphabetically,
-    * the same links with a different parameter order will have the 
-    * same hash.
-    * 
-    * @return string
-    */
+    /**
+     * Creates a hash of the URL, which can be used for comparisons.
+     * Since any parameters in the URL's query are sorted alphabetically,
+     * the same links with a different parameter order will have the 
+     * same hash.
+     * 
+     * @return string
+     */
     public function getHash()
     {
         return \AppUtils\ConvertHelper::string2shortHash($this->getNormalized());
     }
 
-   /**
-    * Highlights the URL using HTML tags with specific highlighting
-    * class names.
-    * 
-    * @return string Will return an empty string if the URL is not valid.
-    */
+    /**
+     * Highlights the URL using HTML tags with specific highlighting
+     * class names.
+     * 
+     * @return string Will return an empty string if the URL is not valid.
+     */
     public function getHighlighted() : string
     {
         if(!$this->isValid) {
@@ -670,15 +670,15 @@ 
         return count($params);
     }
     
-   /**
-    * Retrieves all parameters specified in the url,
-    * if any, as an associative array. 
-    * 
-    * NOTE: Ignores parameters that have been added
-    * to the excluded parameters list.
-    *
-    * @return array
-    */
+    /**
+     * Retrieves all parameters specified in the url,
+     * if any, as an associative array. 
+     * 
+     * NOTE: Ignores parameters that have been added
+     * to the excluded parameters list.
+     *
+     * @return array
+     */
     public function getParams() : array
     {
         if(!$this->paramExclusion || empty($this->excludedParams)) {
@@ -695,26 +695,26 @@ 
         return $keep;
     }
     
-   /**
-    * Retrieves the names of all parameters present in the URL, if any.
-    * @return string[]
-    */
+    /**
+     * Retrieves the names of all parameters present in the URL, if any.
+     * @return string[]
+     */
     public function getParamNames() : array
     {
         $params = $this->getParams();
         return array_keys($params);
     }
     
-   /**
-    * Excludes an URL parameter entirely if present:
-    * the parser will act as if the parameter was not
-    * even present in the source URL, effectively
-    * stripping it.
-    *
-    * @param string $name
-    * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
-    * @return URLInfo
-    */
+    /**
+     * Excludes an URL parameter entirely if present:
+     * the parser will act as if the parameter was not
+     * even present in the source URL, effectively
+     * stripping it.
+     *
+     * @param string $name
+     * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
+     * @return URLInfo
+     */
     public function excludeParam(string $name, string $reason) : URLInfo
     {
         if(!isset($this->excludedParams[$name]))
@@ -779,25 +779,25 @@ 
         return self::$typeLabels[$this->getType()];
     }
 
-   /**
-    * Whether excluded parameters should be highlighted in
-    * a different color in the URL when using the
-    * {@link URLInfo::getHighlighted()} method.
-    *
-    * @param bool $highlight
-    * @return URLInfo
-    */
+    /**
+     * Whether excluded parameters should be highlighted in
+     * a different color in the URL when using the
+     * {@link URLInfo::getHighlighted()} method.
+     *
+     * @param bool $highlight
+     * @return URLInfo
+     */
     public function setHighlightExcluded(bool $highlight=true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
         return $this;
     }
     
-   /**
-    * Returns an array with all relevant URL information.
-    * 
-    * @return array
-    */
+    /**
+     * Returns an array with all relevant URL information.
+     * 
+     * @return array
+     */
     public function toArray() : array
     {
         return array(
@@ -841,24 +841,24 @@ 
         return $this;
     }
     
-   /**
-    * Whether the parameter exclusion mode is enabled:
-    * In this case, if any parameters have been added to the
-    * exclusion list, all relevant methods will exclude these.
-    *
-    * @return bool
-    */
+    /**
+     * Whether the parameter exclusion mode is enabled:
+     * In this case, if any parameters have been added to the
+     * exclusion list, all relevant methods will exclude these.
+     *
+     * @return bool
+     */
     public function isParamExclusionEnabled() : bool
     {
         return $this->paramExclusion;
     }
     
-   /**
-    * Checks whether the link contains any parameters that
-    * are on the list of excluded parameters.
-    *
-    * @return bool
-    */
+    /**
+     * Checks whether the link contains any parameters that
+     * are on the list of excluded parameters.
+     *
+     * @return bool
+     */
     public function containsExcludedParams() : bool
     {
         if(empty($this->excludedParams)) {

Spacing +61 added lines, -61 removed lines

@@ -117,26 +117,26 @@ 
 
         $this->filterParsed();
         
-        if($this->detectEmail()) {
+        if ($this->detectEmail()) {
             return;
         }
         
-        if($this->detectFragmentLink()) {
+        if ($this->detectFragmentLink()) {
             return;
         }
         
-        if($this->detectPhoneLink()) {
+        if ($this->detectPhoneLink()) {
             return;
         }
         
-        if(!$this->isValid) {
+        if (!$this->isValid) {
             return;
         }
         
         // no scheme found: it may be an email address without the mailto:
         // It can't be a variable, since without the scheme it would already
         // have been recognized as a vaiable only link.
-        if(!isset($this->info['scheme'])) {
+        if (!isset($this->info['scheme'])) {
             $this->setError(
                 self::ERROR_MISSING_SCHEME,
                 t('Cannot determine the link\'s scheme, e.g. %1$s.', 'http')
@@ -145,10 +145,10 @@ 
             return;
         }
         
-        if(!in_array($this->info['scheme'], $this->knownSchemes)) {
+        if (!in_array($this->info['scheme'], $this->knownSchemes)) {
             $this->setError(
                 self::ERROR_INVALID_SCHEME,
-                t('The scheme %1$s is not supported for links.', $this->info['scheme']) . ' ' .
+                t('The scheme %1$s is not supported for links.', $this->info['scheme']).' '.
                 t('Valid schemes are: %1$s.', implode(', ', $this->knownSchemes))
             );
             $this->isValid = false;
@@ -158,17 +158,17 @@ 
         // every link needs a host. This case can happen for ex, if
         // the link starts with a typo with only one slash, like:
         // "http:/hostname"
-        if(!isset($this->info['host'])) {
+        if (!isset($this->info['host'])) {
             $this->setError(
                 self::ERROR_MISSING_HOST,
-                t('Cannot determine the link\'s host name.') . ' ' .
+                t('Cannot determine the link\'s host name.').' '.
                 t('This usually happens when there\'s a typo somewhere.')
             );
             $this->isValid = false;
             return;
         }
 
-        if(!empty($this->info['query'])) 
+        if (!empty($this->info['query'])) 
         {
             $this->params = \AppUtils\ConvertHelper::parseQueryString($this->info['query']);
             ksort($this->params);
@@ -213,30 +213,30 @@ 
     */
     protected function filterParsed()
     {
-        foreach($this->info as $key => $val)
+        foreach ($this->info as $key => $val)
         {
-            if(is_string($val)) {
+            if (is_string($val)) {
                 $this->info[$key] = trim($val);
             }
         }
         
-        if(isset($this->info['host'])) {
+        if (isset($this->info['host'])) {
             $this->info['host'] = str_replace(' ', '', $this->info['host']);
         }
         
-        if(isset($this->info['path'])) {
+        if (isset($this->info['path'])) {
             $this->info['path'] = str_replace(' ', '', $this->info['path']);
         }
     }
     
     protected function detectEmail()
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
             $this->isEmail = true;
             return true;
         }
         
-        if(isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path'])) 
+        if (isset($this->info['path']) && preg_match(\AppUtils\RegexHelper::REGEX_EMAIL, $this->info['path'])) 
         {
             $this->info['scheme'] = 'email';
             $this->isEmail = true;
@@ -248,7 +248,7 @@ 
     
     protected function detectFragmentLink()
     {
-        if(isset($this->info['fragment']) && !isset($this->info['scheme'])) {
+        if (isset($this->info['fragment']) && !isset($this->info['scheme'])) {
             $this->isFragment = true;
             return true;
         }
@@ -258,7 +258,7 @@ 
     
     protected function detectPhoneLink()
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
             $this->isPhone = true;
             return true;
         }
@@ -272,7 +272,7 @@ 
      */
     public function isSecure()
     {
-        if(isset($this->info['scheme']) && $this->info['scheme']=='https') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'https') {
             return true;
         }
         
@@ -347,7 +347,7 @@ 
     public function getPort() : int
     {
         $port = $this->getInfoKey('port');
-        if(!empty($port)) {
+        if (!empty($port)) {
             return (int)$port;
         }
         
@@ -427,7 +427,7 @@ 
     
     protected function getInfoKey(string $name) : string
     {
-        if(isset($this->info[$name])) {
+        if (isset($this->info[$name])) {
             return (string)$this->info[$name];
         }
         
@@ -436,34 +436,34 @@ 
     
     public function getNormalized() : string
     {
-        if(!$this->isValid) {
+        if (!$this->isValid) {
             return '';
         }
         
-        if($this->isFragment === true)
+        if ($this->isFragment === true)
         {
             return '#'.$this->getFragment();
         }
-        else if($this->isPhone === true)
+        else if ($this->isPhone === true)
         {
             return 'tel://'.$this->getHost();
         }
-        else if($this->isEmail === true)
+        else if ($this->isEmail === true)
         {
             return 'mailto:'.$this->getPath();
         }
         
         $normalized = $this->info['scheme'].'://'.$this->info['host'];
-        if(isset($this->info['path'])) {
+        if (isset($this->info['path'])) {
             $normalized .= $this->info['path'];
         }
         
         $params = $this->getParams();
-        if(!empty($params)) {
+        if (!empty($params)) {
             $normalized .= '?'.http_build_query($params);
         }
         
-        if(isset($this->info['fragment'])) {
+        if (isset($this->info['fragment'])) {
             $normalized .= '#'.$this->info['fragment'];
         }
         
@@ -491,11 +491,11 @@ 
     */
     public function getHighlighted() : string
     {
-        if(!$this->isValid) {
+        if (!$this->isValid) {
             return '';
         }
         
-        if($this->isEmail) {
+        if ($this->isEmail) {
             return sprintf(
                 '<span class="link-scheme scheme-mailto">mailto:</span>'.
                 '<span class="link-host">%s</span>',
@@ -503,7 +503,7 @@ 
             );
         }
         
-        if($this->isFragment) {
+        if ($this->isFragment) {
             return sprintf(
                 '<span class="link-fragment-sign">#</span>'.
                 '<span class="link-fragment-value">%s</span>',
@@ -511,7 +511,7 @@ 
             );
         }
         
-        if($this->hasScheme())
+        if ($this->hasScheme())
         {
             $result = sprintf(
                 '<span class="link-scheme scheme-%1$s">'.
@@ -523,7 +523,7 @@ 
 
         $result .= '<span class="link-component double-slashes">//</span>';
         
-        if($this->hasUsername())
+        if ($this->hasUsername())
         {
             $result .= sprintf(
                 '<span class="link-credentials">%s</span>'.
@@ -535,7 +535,7 @@ 
             );
         }
         
-        if($this->hasHost()) 
+        if ($this->hasHost()) 
         {
             $result .=
             sprintf(
@@ -544,7 +544,7 @@ 
             );
         }
         
-        if($this->hasPort()) 
+        if ($this->hasPort()) 
         {
             $result .= sprintf(
                 '<span class="link-component port-separator">:</span>'.
@@ -553,7 +553,7 @@ 
             );
         }
         
-        if($this->hasPath()) 
+        if ($this->hasPath()) 
         {
             $path = str_replace(array(';', '='), array(';<wbr>', '=<wbr>'), $this->getPath());
             $tokens = explode('/', $path);
@@ -564,11 +564,11 @@ 
             );
         }
         
-        if(!empty($this->params))
+        if (!empty($this->params))
         {
             $tokens = array();
             
-            foreach($this->params as $param => $value)
+            foreach ($this->params as $param => $value)
             {
                 $parts = sprintf(
                     '<span class="link-param-name">%s</span>'.
@@ -586,10 +586,10 @@ 
                 $tag = '';
                 
                 // is parameter exclusion enabled, and is this an excluded parameter?
-                if($this->paramExclusion && isset($this->excludedParams[$param]))
+                if ($this->paramExclusion && isset($this->excludedParams[$param]))
                 {
                     // display the excluded parameter, but highlight it
-                    if($this->highlightExcluded)
+                    if ($this->highlightExcluded)
                     {
                         $tooltip = $this->excludedParams[$param];
                         
@@ -619,7 +619,7 @@ 
             '<span class="link-component query-sign">?</span>'.implode('<span class="link-component param-separator">&amp;</span>', $tokens);
         }
         
-        if(isset($this->info['fragment'])) {
+        if (isset($this->info['fragment'])) {
             $result .= sprintf(
                 '<span class="link-fragment-sign">#</span>'.
                 '<span class="link-fragment">%s</span>',
@@ -642,7 +642,7 @@ 
     
     public function getErrorMessage() : string
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['message'];
         }
         
@@ -651,7 +651,7 @@ 
     
     public function getErrorCode() : int
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['code'];
         }
         
@@ -681,13 +681,13 @@ 
     */
     public function getParams() : array
     {
-        if(!$this->paramExclusion || empty($this->excludedParams)) {
+        if (!$this->paramExclusion || empty($this->excludedParams)) {
             return $this->params;
         }
         
         $keep = array();
-        foreach($this->params as $name => $value) {
-            if(!isset($this->excludedParams[$name])) {
+        foreach ($this->params as $name => $value) {
+            if (!isset($this->excludedParams[$name])) {
                 $keep[$name] = $value;
             }
         }
@@ -717,7 +717,7 @@ 
     */
     public function excludeParam(string $name, string $reason) : URLInfo
     {
-        if(!isset($this->excludedParams[$name]))
+        if (!isset($this->excludedParams[$name]))
         {
             $this->excludedParams[$name] = $reason;
             $this->setParamExclusion();
@@ -738,15 +738,15 @@ 
      */
     public function getType() : string
     {
-        if($this->isEmail) {
+        if ($this->isEmail) {
             return self::TYPE_EMAIL;
         }
         
-        if($this->isFragment) {
+        if ($this->isFragment) {
             return self::TYPE_FRAGMENT;
         }
         
-        if($this->isPhone) {
+        if ($this->isPhone) {
             return self::TYPE_PHONE;
         }
         
@@ -755,7 +755,7 @@ 
     
     public function getTypeLabel() : string
     {
-        if(!isset(self::$typeLabels))
+        if (!isset(self::$typeLabels))
         {
             self::$typeLabels = array(
                 self::TYPE_EMAIL => t('Email'),
@@ -767,7 +767,7 @@ 
         
         $type = $this->getType();
         
-        if(!isset(self::$typeLabels[$type]))
+        if (!isset(self::$typeLabels[$type]))
         {
             throw new BaseException(
                 sprintf('Unknown URL type label for type [%s].', $type),
@@ -787,7 +787,7 @@ 
     * @param bool $highlight
     * @return URLInfo
     */
-    public function setHighlightExcluded(bool $highlight=true) : URLInfo
+    public function setHighlightExcluded(bool $highlight = true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
         return $this;
@@ -835,7 +835,7 @@ 
      * @see URLInfo::isParamExclusionEnabled()
      * @see URLInfo::setHighlightExcluded()
      */
-    public function setParamExclusion(bool $enabled=true) : URLInfo
+    public function setParamExclusion(bool $enabled = true) : URLInfo
     {
         $this->paramExclusion = $enabled;
         return $this;
@@ -861,13 +861,13 @@ 
     */
     public function containsExcludedParams() : bool
     {
-        if(empty($this->excludedParams)) {
+        if (empty($this->excludedParams)) {
             return false;
         }
         
         $names = array_keys($this->params);
-        foreach($names as $name) {
-            if(isset($this->excludedParams[$name])) {
+        foreach ($names as $name) {
+            if (isset($this->excludedParams[$name])) {
                 return true;
             }
         }
@@ -883,7 +883,7 @@ 
 
     public function offsetSet($offset, $value) 
     {
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             $this->info[$offset] = $value;
         }
     }
@@ -900,11 +900,11 @@ 
     
     public function offsetGet($offset) 
     {
-        if($offset === 'port') {
+        if ($offset === 'port') {
             return $this->getPort();
         }
         
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             return $this->getInfoKey($offset);
         }
         
@@ -915,7 +915,7 @@ 
     {
         $cssFolder = realpath(__DIR__.'/../css');
         
-        if($cssFolder === false) {
+        if ($cssFolder === false) {
             throw new BaseException(
                 'Cannot find package CSS folder.',
                 null,

Braces +4 added lines, -8 removed lines

@@ -443,12 +443,10 @@ 
         if($this->isFragment === true)
         {
             return '#'.$this->getFragment();
-        }
-        else if($this->isPhone === true)
+        } else if($this->isPhone === true)
         {
             return 'tel://'.$this->getHost();
-        }
-        else if($this->isEmail === true)
+        } else if($this->isEmail === true)
         {
             return 'mailto:'.$this->getPath();
         }
@@ -598,13 +596,11 @@ 
                             $tooltip,
                             $parts
                         );
-                    }
-                    else
+                    } else
                     {
                         continue;
                     }
-                }
-                else
+                } else
                 {
                     $tag = sprintf(
                         '<span class="link-param">%s</span>',

src/ConvertHelper.php

Braces +7 added lines, -6 removed lines

@@ -1278,12 +1278,14 @@ 
         }
     
         $total = ($total * 60) + ($interval->i );
-        if ($unit == self::INTERVAL_MINUTES)
-            return $total;
+        if ($unit == self::INTERVAL_MINUTES) {
+                    return $total;
+        }
 
         $total = ($total * 60) + ($interval->s );
-        if ($unit == self::INTERVAL_SECONDS)
-            return $total;
+        if ($unit == self::INTERVAL_SECONDS) {
+                    return $total;
+        }
         
         return 0;
     }
@@ -1461,8 +1463,7 @@ 
                 if (mb_strlen($actual.$word) <= $width) 
                 {
                     $actual .= $word.' ';
-                } 
-                else 
+                } else 
                 {
                     if ($actual != '') {
                         $line .= rtrim($actual).$break;

Indentation +327 added lines, -327 removed lines

@@ -435,16 +435,16 @@ 
         return $bytes . ' ' . t('B');
     }
 
-   /**
-    * Cuts a text to the specified length if it is longer than the
-    * target length. Appends a text to signify it has been cut at 
-    * the end of the string.
-    * 
-    * @param string $text
-    * @param int $targetLength
-    * @param string $append
-    * @return string
-    */
+    /**
+     * Cuts a text to the specified length if it is longer than the
+     * target length. Appends a text to signify it has been cut at 
+     * the end of the string.
+     * 
+     * @param string $text
+     * @param int $targetLength
+     * @param string $append
+     * @return string
+     */
     public static function text_cut(string $text, int $targetLength, string $append = '...') : string
     {
         $length = mb_strlen($text);
@@ -514,27 +514,27 @@ 
         return self::$booleanStrings[$string];
     }
     
-   /**
-    * Whether the specified string is a boolean string or boolean value.
-    * Alias for {@link ConvertHelper::isBoolean()}.
-    * 
-    * @param mixed $string
-    * @return bool
-    * @deprecated
-    * @see ConvertHelper::isBoolean()
-    */
+    /**
+     * Whether the specified string is a boolean string or boolean value.
+     * Alias for {@link ConvertHelper::isBoolean()}.
+     * 
+     * @param mixed $string
+     * @return bool
+     * @deprecated
+     * @see ConvertHelper::isBoolean()
+     */
     public static function isBooleanString($string) : bool
     {
         return self::isBoolean($string);
     }
 
-   /**
-    * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
-    * 
-    * @param string $text
-    * @return string
-    * @deprecated
-    */
+    /**
+     * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
+     * 
+     * @param string $text
+     * @return string
+     * @deprecated
+     */
     public static function text_makeXMLCompliant($text)
     {
         return XMLHelper::string2xml($text);
@@ -636,13 +636,13 @@ 
         return $translit->convert($string);
     }
     
-   /**
-    * Retrieves the HEX character codes for all control
-    * characters that the {@link stripControlCharacters()} 
-    * method will remove.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves the HEX character codes for all control
+     * characters that the {@link stripControlCharacters()} 
+     * method will remove.
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsHex()
     {
         $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
@@ -678,13 +678,13 @@ 
         return $stack;
     }
     
-   /**
-    * Retrieves an array of all control characters that
-    * the {@link stripControlCharacters()} method will 
-    * remove, as the actual UTF-8 characters.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves an array of all control characters that
+     * the {@link stripControlCharacters()} method will 
+     * remove, as the actual UTF-8 characters.
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsUTF8()
     {
         $chars = self::getControlCharactersAsHex();
@@ -697,12 +697,12 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves all control characters as JSON encoded
-    * characters, e.g. "\u200b".
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves all control characters as JSON encoded
+     * characters, e.g. "\u200b".
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsJSON()
     {
         $chars = self::getControlCharactersAsHex();
@@ -759,20 +759,20 @@ 
         return preg_replace(self::$controlCharsRegex, '', $string);
     }
 
-   /**
-    * Converts a unicode character to the PHPO notation.
-    * 
-    * Example:
-    * 
-    * <pre>unicodeChar2php('"\u0000"')</pre>
-    * 
-    * Returns
-    * 
-    * <pre>\x0</pre>
-    * 
-    * @param string $unicodeChar
-    * @return string
-    */
+    /**
+     * Converts a unicode character to the PHPO notation.
+     * 
+     * Example:
+     * 
+     * <pre>unicodeChar2php('"\u0000"')</pre>
+     * 
+     * Returns
+     * 
+     * <pre>\x0</pre>
+     * 
+     * @param string $unicodeChar
+     * @return string
+     */
     public static function unicodeChar2php($unicodeChar) 
     {
         $unicodeChar = json_decode($unicodeChar);
@@ -895,25 +895,25 @@ 
         return 'false';
     }
     
-   /**
-    * Converts an associative array with attribute name > value pairs
-    * to an attribute string that can be used in an HTML tag. Empty 
-    * attribute values are ignored.
-    * 
-    * Example:
-    * 
-    * array2attributeString(array(
-    *     'id' => 45,
-    *     'href' => 'http://www.mistralys.com'
-    * ));
-    * 
-    * Result:
-    * 
-    * id="45" href="http://www.mistralys.com"
-    * 
-    * @param array $array
-    * @return string
-    */
+    /**
+     * Converts an associative array with attribute name > value pairs
+     * to an attribute string that can be used in an HTML tag. Empty 
+     * attribute values are ignored.
+     * 
+     * Example:
+     * 
+     * array2attributeString(array(
+     *     'id' => 45,
+     *     'href' => 'http://www.mistralys.com'
+     * ));
+     * 
+     * Result:
+     * 
+     * id="45" href="http://www.mistralys.com"
+     * 
+     * @param array $array
+     * @return string
+     */
     public static function array2attributeString($array)
     {
         $tokens = array();
@@ -932,14 +932,14 @@ 
         return ' '.implode(' ', $tokens);
     }
     
-   /**
-    * Converts a string so it can safely be used in a javascript
-    * statement in an HTML tag: uses single quotes around the string
-    * and encodes all special characters as needed.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Converts a string so it can safely be used in a javascript
+     * statement in an HTML tag: uses single quotes around the string
+     * and encodes all special characters as needed.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2attributeJS($string, $quoted=true)
     {
         $converted = addslashes(htmlspecialchars(strip_tags($string), ENT_QUOTES, 'UTF-8'));
@@ -950,15 +950,15 @@ 
         return $converted;
     }
     
-   /**
-    * Checks if the specified string is a boolean value, which
-    * includes string representations of boolean values, like 
-    * <code>yes</code> or <code>no</code>, and <code>true</code>
-    * or <code>false</code>.
-    * 
-    * @param mixed $value
-    * @return boolean
-    */
+    /**
+     * Checks if the specified string is a boolean value, which
+     * includes string representations of boolean values, like 
+     * <code>yes</code> or <code>no</code>, and <code>true</code>
+     * or <code>false</code>.
+     * 
+     * @param mixed $value
+     * @return boolean
+     */
     public static function isBoolean($value) : bool
     {
         if(is_bool($value)) {
@@ -972,12 +972,12 @@ 
         return array_key_exists($value, self::$booleanStrings);
     }
     
-   /**
-    * Converts an associative array to an HTML style attribute value string.
-    * 
-    * @param array $subject
-    * @return string
-    */
+    /**
+     * Converts an associative array to an HTML style attribute value string.
+     * 
+     * @param array $subject
+     * @return string
+     */
     public static function array2styleString(array $subject) : string
     {
         $tokens = array();
@@ -988,23 +988,23 @@ 
         return implode(';', $tokens);
     }
     
-   /**
-    * Converts a DateTime object to a timestamp, which
-    * is PHP 5.2 compatible.
-    * 
-    * @param \DateTime $date
-    * @return integer
-    */
+    /**
+     * Converts a DateTime object to a timestamp, which
+     * is PHP 5.2 compatible.
+     * 
+     * @param \DateTime $date
+     * @return integer
+     */
     public static function date2timestamp(\DateTime $date) : int
     {
         return (int)$date->format('U');
     }
     
-   /**
-    * Converts a timestamp into a DateTime instance.
-    * @param int $timestamp
-    * @return \DateTime
-    */
+    /**
+     * Converts a timestamp into a DateTime instance.
+     * @param int $timestamp
+     * @return \DateTime
+     */
     public static function timestamp2date(int $timestamp) : \DateTime
     {
         $date = new \DateTime();
@@ -1012,13 +1012,13 @@ 
         return $date;
     }
     
-   /**
-    * Strips an absolute path to a file within the application
-    * to make the path relative to the application root path.
-    * 
-    * @param string $path
-    * @return string
-    */
+    /**
+     * Strips an absolute path to a file within the application
+     * to make the path relative to the application root path.
+     * 
+     * @param string $path
+     * @return string
+     */
     public static function fileRelativize($path)
     {
         $path = str_replace('\\', '/', $path);
@@ -1030,22 +1030,22 @@ 
     
     const JS_REGEX_JSON = 'json';
     
-   /**
-    * Takes a regular expression and attempts to convert it to
-    * its javascript equivalent. Returns an array containing the
-    * format string itself (without start and end characters),
-    * and the modifiers.
-    *  
-    * This is intended to be used with the RegExp object, for ex:
-    * 
-    * <script>
-    * var expression = <?php echo json_encode(ConvertHelper::regex2js('/ab+c/i')) ?>;
-    * var reg = new RegExp(expression.format, expression.modifiers);
-    * </script>
-    *  
-    * @param string $regex
-    * @return array
-    */
+    /**
+     * Takes a regular expression and attempts to convert it to
+     * its javascript equivalent. Returns an array containing the
+     * format string itself (without start and end characters),
+     * and the modifiers.
+     *  
+     * This is intended to be used with the RegExp object, for ex:
+     * 
+     * <script>
+     * var expression = <?php echo json_encode(ConvertHelper::regex2js('/ab+c/i')) ?>;
+     * var reg = new RegExp(expression.format, expression.modifiers);
+     * </script>
+     *  
+     * @param string $regex
+     * @return array
+     */
     public static function regex2js($regex, $return=self::JS_REGEX_OBJECT)
     {
         $regex = trim($regex);
@@ -1091,12 +1091,12 @@ 
         );
     }
     
-   /**
-    * Strips all known UTF byte order marks from the specified string.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Strips all known UTF byte order marks from the specified string.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function stripUTFBom($string)
     {
         $boms = FileHelper::getUTFBOMs();
@@ -1111,13 +1111,13 @@ 
         return $string;
     }
 
-   /**
-    * Converts a string to valid utf8, regardless
-    * of the string's encoding(s).
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Converts a string to valid utf8, regardless
+     * of the string's encoding(s).
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2utf8($string)
     {
         if(!self::isStringASCII($string)) {
@@ -1127,15 +1127,15 @@ 
         return $string;
     }
     
-   /**
-    * Checks whether the specified string is an ASCII
-    * string, without any special or UTF8 characters.
-    * Note: empty strings and NULL are considered ASCII.
-    * Any variable types other than strings are not.
-    * 
-    * @param string $string
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified string is an ASCII
+     * string, without any special or UTF8 characters.
+     * Note: empty strings and NULL are considered ASCII.
+     * Any variable types other than strings are not.
+     * 
+     * @param string $string
+     * @return boolean
+     */
     public static function isStringASCII($string)
     {
         if($string === '' || $string === NULL) {
@@ -1160,22 +1160,22 @@ 
         return $url;
     }
 
-   /**
-    * Calculates a percentage match of the source string with the target string.
-    * 
-    * Options are:
-    * 
-    * - maxLevenshtein, default: 10
-    *   Any levenshtein results above this value are ignored.
-    *   
-    * - precision, default: 1
-    *   The precision of the percentage float value
-    * 
-    * @param string $source
-    * @param string $target
-    * @param array $options
-    * @return float
-    */
+    /**
+     * Calculates a percentage match of the source string with the target string.
+     * 
+     * Options are:
+     * 
+     * - maxLevenshtein, default: 10
+     *   Any levenshtein results above this value are ignored.
+     *   
+     * - precision, default: 1
+     *   The precision of the percentage float value
+     * 
+     * @param string $source
+     * @param string $target
+     * @param array $options
+     * @return float
+     */
     public static function matchString($source, $target, $options=array())
     {
         $defaults = array(
@@ -1259,14 +1259,14 @@ 
     
     const INTERVAL_SECONDS = 'seconds';
     
-   /**
-    * Calculates the total amount of days / hours / minutes or seconds
-    * of a date interval object and returns the value.
-    * 
-    * @param \DateInterval $interval
-    * @param string $unit
-    * @return integer
-    */
+    /**
+     * Calculates the total amount of days / hours / minutes or seconds
+     * of a date interval object and returns the value.
+     * 
+     * @param \DateInterval $interval
+     * @param string $unit
+     * @return integer
+     */
     public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS)
     {
         $total = $interval->format('%a');
@@ -1304,13 +1304,13 @@ 
         'Sunday'
     );
     
-   /**
-    * Converts a date to the corresponding day name.
-    * 
-    * @param \DateTime $date
-    * @param string $short
-    * @return string|NULL
-    */
+    /**
+     * Converts a date to the corresponding day name.
+     * 
+     * @param \DateTime $date
+     * @param string $short
+     * @return string|NULL
+     */
     public static function date2dayName(\DateTime $date, $short=false)
     {
         $day = $date->format('l');
@@ -1325,21 +1325,21 @@ 
         return null;
     }
     
-   /**
-    * Retrieves a list of english day names.
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of english day names.
+     * @return string[]
+     */
     public static function getDayNamesInvariant()
     {
         return self::$daysInvariant;
     }
     
-   /**
-    * Retrieves the day names list for the current locale.
-    * 
-    * @param string $short
-    * @return string[]
-    */
+    /**
+     * Retrieves the day names list for the current locale.
+     * 
+     * @param string $short
+     * @return string[]
+     */
     public static function getDayNames($short=false)
     {
         if($short) {
@@ -1399,16 +1399,16 @@ 
         return $last;
     }
     
-   /**
-    * Splits a string into an array of all characters it is composed of.
-    * Unicode character safe.
-    * 
-    * NOTE: Spaces and newlines (both \r and \n) are also considered single
-    * characters.
-    * 
-    * @param string $string
-    * @return array
-    */
+    /**
+     * Splits a string into an array of all characters it is composed of.
+     * Unicode character safe.
+     * 
+     * NOTE: Spaces and newlines (both \r and \n) are also considered single
+     * characters.
+     * 
+     * @param string $string
+     * @return array
+     */
     public static function string2array(string $string) : array
     {
         $result = preg_split('//u', $string, null, PREG_SPLIT_NO_EMPTY);
@@ -1419,12 +1419,12 @@ 
         return array();
     }
     
-   /**
-    * Checks whether the specified string contains HTML code.
-    * 
-    * @param string $string
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified string contains HTML code.
+     * 
+     * @param string $string
+     * @return boolean
+     */
     public static function isStringHTML(string $string) : bool
     {
         if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
@@ -1439,18 +1439,18 @@ 
         return false;
     }
     
-   /**
-    * UTF8-safe wordwrap method: works like the regular wordwrap
-    * PHP function but compatible with UTF8. Otherwise the lengths
-    * are no calculated correctly.
-    * 
-    * @param string $str
-    * @param int $width
-    * @param string $break
-    * @param bool $cut
-    * @return string
-    * @see https://stackoverflow.com/a/4988494/2298192
-    */
+    /**
+     * UTF8-safe wordwrap method: works like the regular wordwrap
+     * PHP function but compatible with UTF8. Otherwise the lengths
+     * are no calculated correctly.
+     * 
+     * @param string $str
+     * @param int $width
+     * @param string $break
+     * @param bool $cut
+     * @return string
+     * @see https://stackoverflow.com/a/4988494/2298192
+     */
     public static function wordwrap($str, $width = 75, $break = "\n", $cut = false) 
     {
         $lines = explode($break, $str);
@@ -1496,27 +1496,27 @@ 
         return implode($break, $lines);
     }
     
-   /**
-    * Calculates the byte length of a string, taking into 
-    * account any unicode characters.
-    * 
-    * @param string $string
-    * @return int
-    * @see https://stackoverflow.com/a/9718273/2298192
-    */
+    /**
+     * Calculates the byte length of a string, taking into 
+     * account any unicode characters.
+     * 
+     * @param string $string
+     * @return int
+     * @see https://stackoverflow.com/a/9718273/2298192
+     */
     public static function string2bytes($string)
     {
         return mb_strlen($string, '8bit');
     }
     
-   /**
-    * Creates a short, 8-character long hash for the specified string.
-    * 
-    * WARNING: Not cryptographically safe.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Creates a short, 8-character long hash for the specified string.
+     * 
+     * WARNING: Not cryptographically safe.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2shortHash($string)
     {
         return hash('crc32', $string, false);
@@ -1542,23 +1542,23 @@ 
         return ConvertHelper_ThrowableInfo::fromThrowable($e);
     }
     
-   /**
-    * Parses the specified query string like the native 
-    * function <code>parse_str</code>, without the key
-    * naming limitations.
-    * 
-    * Using parse_str, dots or spaces in key names are 
-    * replaced by underscores. This method keeps all names
-    * intact.
-    * 
-    * It still uses the parse_str implementation as it 
-    * is tested and tried, but fixes the parameter names
-    * after parsing, as needed.
-    * 
-    * @param string $queryString
-    * @return array
-    * @see https://www.php.net/manual/en/function.parse-str.php
-    */
+    /**
+     * Parses the specified query string like the native 
+     * function <code>parse_str</code>, without the key
+     * naming limitations.
+     * 
+     * Using parse_str, dots or spaces in key names are 
+     * replaced by underscores. This method keeps all names
+     * intact.
+     * 
+     * It still uses the parse_str implementation as it 
+     * is tested and tried, but fixes the parameter names
+     * after parsing, as needed.
+     * 
+     * @param string $queryString
+     * @return array
+     * @see https://www.php.net/manual/en/function.parse-str.php
+     */
     public static function parseQueryString(string $queryString) : array
     {
         // allow HTML entities notation
@@ -1598,16 +1598,16 @@ 
             $placeholders = array();
             foreach($paramNames as $paramName)
             {
-                 // create a unique placeholder name
-                 $placeholder = '__PLACEHOLDER'.$counter.'__';
+                    // create a unique placeholder name
+                    $placeholder = '__PLACEHOLDER'.$counter.'__';
                  
-                 // store the placeholder name to replace later
-                 $table[$placeholder] = $paramName;
+                    // store the placeholder name to replace later
+                    $table[$placeholder] = $paramName;
                  
-                 // add the placeholder to replace in the query string before parsing
-                 $placeholders[$paramName.'='] = $placeholder.'=';
+                    // add the placeholder to replace in the query string before parsing
+                    $placeholders[$paramName.'='] = $placeholder.'=';
                  
-                 $counter++;
+                    $counter++;
             }
             
             // next challenge: replacing the parameter names by placeholders
@@ -1634,23 +1634,23 @@ 
         
         foreach($parsed as $name => $value)
         {
-             $keep[$table[$name]] = $value;
+                $keep[$table[$name]] = $value;
         }
         
         return $keep;
     }
 
-   /**
-    * Searches for needle in the specified string, and returns a list
-    * of all occurrences, including the matched string. The matched 
-    * string is useful when doing a case insensitive search, as it 
-    * shows the exact matched case of needle.
-    *   
-    * @param string $needle
-    * @param string $haystack
-    * @param bool $caseInsensitive
-    * @return ConvertHelper_StringMatch[]
-    */
+    /**
+     * Searches for needle in the specified string, and returns a list
+     * of all occurrences, including the matched string. The matched 
+     * string is useful when doing a case insensitive search, as it 
+     * shows the exact matched case of needle.
+     *   
+     * @param string $needle
+     * @param string $haystack
+     * @param bool $caseInsensitive
+     * @return ConvertHelper_StringMatch[]
+     */
     public static function findString(string $needle, string $haystack, bool $caseInsensitive=false)
     {
         if($needle === '') {
@@ -1676,14 +1676,14 @@ 
         return $positions;
     }
     
-   /**
-    * Like explode, but trims all entries, and removes 
-    * empty entries from the resulting array.
-    * 
-    * @param string $delimiter
-    * @param string $string
-    * @return string[]
-    */
+    /**
+     * Like explode, but trims all entries, and removes 
+     * empty entries from the resulting array.
+     * 
+     * @param string $delimiter
+     * @param string $string
+     * @return string[]
+     */
     public static function explodeTrim(string $delimiter, string $string) : array
     {
         if(empty($string) || empty($delimiter)) {
@@ -1705,12 +1705,12 @@ 
     
     protected static $eolChars;
 
-   /**
-    * Detects the most used end-of-line character in the subject string.
-    * 
-    * @param string $str The string to check.
-    * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
-    */
+    /**
+     * Detects the most used end-of-line character in the subject string.
+     * 
+     * @param string $str The string to check.
+     * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
+     */
     public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL
     {
         if(empty($subjectString)) {
@@ -1722,27 +1722,27 @@ 
             $cr = chr((int)hexdec('0d'));
             $lf = chr((int)hexdec('0a'));
             
-           self::$eolChars = array(
-               array(
-                   'char' => $cr.$lf,
-                   'type' => ConvertHelper_EOL::TYPE_CRLF,
-                   'description' => t('Carriage return followed by a line feed'),
-               ),
-               array(
-                   'char' => $lf.$cr,
-                   'type' => ConvertHelper_EOL::TYPE_LFCR,
-                   'description' => t('Line feed followed by a carriage return'),
-               ),
-               array(
-                  'char' => $lf,
-                  'type' => ConvertHelper_EOL::TYPE_LF,
-                  'description' => t('Line feed'),
-               ),
-               array(
-                  'char' => $cr,
-                  'type' => ConvertHelper_EOL::TYPE_CR,
-                  'description' => t('Carriage Return'),
-               ),
+            self::$eolChars = array(
+                array(
+                    'char' => $cr.$lf,
+                    'type' => ConvertHelper_EOL::TYPE_CRLF,
+                    'description' => t('Carriage return followed by a line feed'),
+                ),
+                array(
+                    'char' => $lf.$cr,
+                    'type' => ConvertHelper_EOL::TYPE_LFCR,
+                    'description' => t('Line feed followed by a carriage return'),
+                ),
+                array(
+                    'char' => $lf,
+                    'type' => ConvertHelper_EOL::TYPE_LF,
+                    'description' => t('Line feed'),
+                ),
+                array(
+                    'char' => $cr,
+                    'type' => ConvertHelper_EOL::TYPE_CR,
+                    'description' => t('Carriage Return'),
+                ),
             );
         }
         
@@ -1770,13 +1770,13 @@ 
         );
     }
 
-   /**
-    * Removes the specified keys from the target array,
-    * if they exist.
-    * 
-    * @param array $array
-    * @param array $keys
-    */
+    /**
+     * Removes the specified keys from the target array,
+     * if they exist.
+     * 
+     * @param array $array
+     * @param array $keys
+     */
     public static function arrayRemoveKeys(array &$array, array $keys) : void
     {
         foreach($keys as $key) 
@@ -1787,11 +1787,11 @@ 
         }
     }
     
-   /**
-    * Checks if the specified variable is an integer or a string containing an integer.
-    * @param mixed $value
-    * @return bool
-    */
+    /**
+     * Checks if the specified variable is an integer or a string containing an integer.
+     * @param mixed $value
+     * @return bool
+     */
     public static function isInteger($value) : bool
     {
         if(is_int($value)) {

Spacing +115 added lines, -115 removed lines

@@ -68,7 +68,7 @@ 
             $amount = substr_count($line, "\t") - $min;
             $line = trim($line);
             if ($amount >= 1) {
-                $line = str_repeat("\t", $amount) . $line;
+                $line = str_repeat("\t", $amount).$line;
             }
 
             $converted[] = $line;
@@ -140,10 +140,10 @@ 
 
         // specifically handle zero
         if ($seconds <= 0) {
-            return '0 ' . t('seconds');
+            return '0 '.t('seconds');
         }
         
-        if($seconds < 1) {
+        if ($seconds < 1) {
             return t('less than a second');
         }
 
@@ -151,7 +151,7 @@ 
         foreach ($units as $def) {
             $quot = intval($seconds / $def['value']);
             if ($quot) {
-                $item = $quot . ' ';
+                $item = $quot.' ';
                 if (abs($quot) > 1) {
                     $item .= $def['plural'];
                 } else {
@@ -168,7 +168,7 @@ 
             return $last;
         }
 
-        return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last;
+        return implode(', ', $tokens).' '.t('and').' '.$last;
     }
 
     /**
@@ -185,11 +185,11 @@ 
      */
     public static function duration2string($datefrom, $dateto = -1)
     {
-        if($datefrom instanceof \DateTime) {
+        if ($datefrom instanceof \DateTime) {
             $datefrom = ConvertHelper::date2timestamp($datefrom);
         }
         
-        if($dateto instanceof \DateTime) {
+        if ($dateto instanceof \DateTime) {
             $dateto = ConvertHelper::date2timestamp($dateto);
         }
         
@@ -210,7 +210,7 @@ 
         $interval = "";
         
         $future = false;
-        if($difference < 0) {
+        if ($difference < 0) {
             $difference = $difference * -1;
             $future = true;
         }
@@ -285,7 +285,7 @@ 
                 $day = (int)date("j", $dateto);
                 $year = (int)date("Y", $datefrom);
                 
-                while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $dateto) 
+                while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $dateto) 
                 {
                     $months_difference++;
                 }
@@ -300,7 +300,7 @@ 
                     $datediff--;
                 }
 
-                if($future) {
+                if ($future) {
                     $result = ($datediff == 1) ? t('In one month', $datediff) : t('In %1s months', $datediff);
                 } else {
                     $result = ($datediff == 1) ? t('One month ago', $datediff) : t('%1s months ago', $datediff);
@@ -309,7 +309,7 @@ 
 
             case "y":
                 $datediff = floor($difference / 60 / 60 / 24 / 365);
-                if($future) {
+                if ($future) {
                     $result = ($datediff == 1) ? t('In one year', $datediff) : t('In %1s years', $datediff);
                 } else {
                     $result = ($datediff == 1) ? t('One year ago', $datediff) : t('%1s years ago', $datediff);
@@ -318,7 +318,7 @@ 
 
             case "d":
                 $datediff = floor($difference / 60 / 60 / 24);
-                if($future) {
+                if ($future) {
                     $result = ($datediff == 1) ? t('In one day', $datediff) : t('In %1s days', $datediff);
                 } else {
                     $result = ($datediff == 1) ? t('One day ago', $datediff) : t('%1s days ago', $datediff);
@@ -327,7 +327,7 @@ 
 
             case "ww":
                 $datediff = floor($difference / 60 / 60 / 24 / 7);
-                if($future) {
+                if ($future) {
                     $result = ($datediff == 1) ? t('In one week', $datediff) : t('In %1s weeks', $datediff);
                 } else {
                     $result = ($datediff == 1) ? t('One week ago', $datediff) : t('%1s weeks ago', $datediff);
@@ -336,7 +336,7 @@ 
 
             case "h":
                 $datediff = floor($difference / 60 / 60);
-                if($future) {
+                if ($future) {
                     $result = ($datediff == 1) ? t('In one hour', $datediff) : t('In %1s hours', $datediff);
                 } else {
                     $result = ($datediff == 1) ? t('One hour ago', $datediff) : t('%1s hours ago', $datediff);
@@ -345,7 +345,7 @@ 
 
             case "n":
                 $datediff = floor($difference / 60);
-                if($future) {
+                if ($future) {
                     $result = ($datediff == 1) ? t('In one minute', $datediff) : t('In %1s minutes', $datediff);
                 } else {
                     $result = ($datediff == 1) ? t('One minute ago', $datediff) : t('%1s minutes ago', $datediff);
@@ -354,7 +354,7 @@ 
 
             case "s":
                 $datediff = $difference;
-                if($future) {
+                if ($future) {
                     $result = ($datediff == 1) ? t('In one second', $datediff) : t('In %1s seconds', $datediff);
                 } else {
                     $result = ($datediff == 1) ? t('One second ago', $datediff) : t('%1s seconds ago', $datediff);
@@ -377,9 +377,9 @@ 
         return $geshi->parse_code();
     }
     
-    public static function highlight_xml($xml, $formatSource=false)
+    public static function highlight_xml($xml, $formatSource = false)
     {
-        if($formatSource) 
+        if ($formatSource) 
         {
             $dom = new \DOMDocument();
             $dom->loadXML($xml);
@@ -417,22 +417,22 @@ 
         $terabyte = $gigabyte * 1024;
 
         if (($bytes >= 0) && ($bytes < $kilobyte)) {
-            return $bytes . ' ' . t('B');
+            return $bytes.' '.t('B');
 
         } elseif (($bytes >= $kilobyte) && ($bytes < $megabyte)) {
-            return round($bytes / $kilobyte, $precision) . ' ' . t('Kb');
+            return round($bytes / $kilobyte, $precision).' '.t('Kb');
 
         } elseif (($bytes >= $megabyte) && ($bytes < $gigabyte)) {
-            return round($bytes / $megabyte, $precision) . ' ' . t('Mb');
+            return round($bytes / $megabyte, $precision).' '.t('Mb');
 
         } elseif (($bytes >= $gigabyte) && ($bytes < $terabyte)) {
-            return round($bytes / $gigabyte, $precision) . ' ' . t('Gb');
+            return round($bytes / $gigabyte, $precision).' '.t('Gb');
 
         } elseif ($bytes >= $terabyte) {
-            return round($bytes / $gigabyte, $precision) . ' ' . t('Tb');
+            return round($bytes / $gigabyte, $precision).' '.t('Tb');
         }
 
-        return $bytes . ' ' . t('B');
+        return $bytes.' '.t('B');
     }
 
    /**
@@ -452,34 +452,34 @@ 
             return $text;
         }
 
-        $text = trim(mb_substr($text, 0, $targetLength)) . $append;
+        $text = trim(mb_substr($text, 0, $targetLength)).$append;
 
         return $text;
     }
 
-    public static function var_dump($var, $html=true)
+    public static function var_dump($var, $html = true)
     {
         $info = parseVariable($var);
         
-        if($html) {
+        if ($html) {
             return $info->toHTML();
         }
         
         return $info->toString();
     }
     
-    public static function print_r($var, $return=false, $html=true)
+    public static function print_r($var, $return = false, $html = true)
     {
         $result = self::var_dump($var, $html);
         
-        if($html) {
+        if ($html) {
             $result = 
             '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'.
                 $result.
             '</pre>';
         }
         
-        if($return) {
+        if ($return) {
             return $result;
         }
         
@@ -499,7 +499,7 @@ 
 
     public static function string2bool($string)
     {
-        if($string === '' || $string === null) {
+        if ($string === '' || $string === null) {
             return false;
         }
         
@@ -554,10 +554,10 @@ 
     public static function date2listLabel(\DateTime $date, $includeTime = false, $shortMonth = false)
     {
         $today = new \DateTime();
-        if($date->format('d.m.Y') == $today->format('d.m.Y')) {
+        if ($date->format('d.m.Y') == $today->format('d.m.Y')) {
             $label = t('Today');
         } else {
-            $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' ';
+            $label = $date->format('d').'. '.self::month2string((int)$date->format('m'), $shortMonth).' ';
             if ($date->format('Y') != date('Y')) {
                 $label .= $date->format('Y');
             }
@@ -648,28 +648,28 @@ 
         $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
         
         $stack = array();
-        foreach(self::$controlChars as $char)
+        foreach (self::$controlChars as $char)
         {
             $tokens = explode('-', $char);
             $start = $tokens[0];
             $end = $tokens[1];
             $prefix = substr($start, 0, 3);
             $range = array();
-            foreach($hexAlphabet as $number) {
+            foreach ($hexAlphabet as $number) {
                 $range[] = $prefix.$number;
             }
             
             $use = false;
-            foreach($range as $number) {
-                if($number == $start) {
+            foreach ($range as $number) {
+                if ($number == $start) {
                     $use = true;
                 }
                 
-                if($use) {
+                if ($use) {
                     $stack[] = $number;
                 }
                 
-                if($number == $end) {
+                if ($number == $end) {
                     break;
                 }
             }
@@ -690,7 +690,7 @@ 
         $chars = self::getControlCharactersAsHex();
         
         $result = array();
-        foreach($chars as $char) {
+        foreach ($chars as $char) {
             $result[] = hex2bin($char);
         }
         
@@ -708,14 +708,14 @@ 
         $chars = self::getControlCharactersAsHex();
         
         $result = array();
-        foreach($chars as $char) {
+        foreach ($chars as $char) {
             $result[] = '\u'.strtolower($char);
         }
         
         return $result;
     }
     
-    protected static $controlChars =  array(
+    protected static $controlChars = array(
         '0000-0008', // control chars
         '000E-000F', // control chars
         '0010-001F', // control chars
@@ -737,19 +737,19 @@ 
      */
     public static function stripControlCharacters(string $string) : string
     {
-        if(empty($string)) {
+        if (empty($string)) {
             return $string;
         }
         
         // create the regex from the unicode characters list
-        if(!isset(self::$controlCharsRegex)) 
+        if (!isset(self::$controlCharsRegex)) 
         {
             $chars = self::getControlCharactersAsHex();
 
             // we use the notation \x{0000} to specify the unicode character key
             // in the regular expression.
             $stack = array();
-            foreach($chars as $char) {
+            foreach ($chars as $char) {
                 $stack[] = '\x{'.$char.'}';
             }
             
@@ -783,7 +783,7 @@ 
             $ordInt = ord($octet);
             // Convert from int (base 10) to hex (base 16), for PHP \x syntax
             $ordHex = base_convert($ordInt, 10, 16);
-            $output .= '\x' . $ordHex;
+            $output .= '\x'.$ordHex;
         }
         return $output;
     }
@@ -815,19 +815,19 @@ 
     
     protected static function convertScalarForComparison($scalar)
     {
-        if($scalar === '' || is_null($scalar)) {
+        if ($scalar === '' || is_null($scalar)) {
             return null;
         }
         
-        if(is_bool($scalar)) {
+        if (is_bool($scalar)) {
             return self::bool2string($scalar);
         }
         
-        if(is_array($scalar)) {
+        if (is_array($scalar)) {
             $scalar = md5(serialize($scalar));
         }
         
-        if($scalar !== null && !is_scalar($scalar)) {
+        if ($scalar !== null && !is_scalar($scalar)) {
             throw new ConvertHelper_Exception(
                 'Not a scalar value in comparison',
                 null,
@@ -876,7 +876,7 @@ 
     public static function bool2string($boolean, bool $yesno = false) : string
     {
         // allow 'yes', 'true', 'no', 'false' string notations as well
-        if(!is_bool($boolean)) {
+        if (!is_bool($boolean)) {
             $boolean = self::string2bool($boolean);
         }
         
@@ -917,15 +917,15 @@ 
     public static function array2attributeString($array)
     {
         $tokens = array();
-        foreach($array as $attr => $value) {
-            if($value == '' || $value == null) {
+        foreach ($array as $attr => $value) {
+            if ($value == '' || $value == null) {
                 continue;
             }
             
             $tokens[] = $attr.'="'.$value.'"';
         }
         
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             return '';
         }
         
@@ -940,10 +940,10 @@ 
     * @param string $string
     * @return string
     */
-    public static function string2attributeJS($string, $quoted=true)
+    public static function string2attributeJS($string, $quoted = true)
     {
         $converted = addslashes(htmlspecialchars(strip_tags($string), ENT_QUOTES, 'UTF-8'));
-        if($quoted) {
+        if ($quoted) {
             $converted = "'".$converted."'";
         } 
         
@@ -961,11 +961,11 @@ 
     */
     public static function isBoolean($value) : bool
     {
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return true;
         }
         
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return false;
         }
         
@@ -981,7 +981,7 @@ 
     public static function array2styleString(array $subject) : string
     {
         $tokens = array();
-        foreach($subject as $name => $value) {
+        foreach ($subject as $name => $value) {
             $tokens[] = $name.':'.$value;
         }
         
@@ -1046,7 +1046,7 @@ 
     * @param string $regex
     * @return array
     */
-    public static function regex2js($regex, $return=self::JS_REGEX_OBJECT)
+    public static function regex2js($regex, $return = self::JS_REGEX_OBJECT)
     {
         $regex = trim($regex);
         $separator = substr($regex, 0, 1);
@@ -1054,7 +1054,7 @@ 
         array_shift($parts);
         
         $modifiers = array_pop($parts);
-        if($modifiers == $separator) {
+        if ($modifiers == $separator) {
             $modifiers = '';
         }
         
@@ -1070,14 +1070,14 @@ 
         // convert the anchors that are not supported in js regexes
         $format = str_replace(array('\\A', '\\Z', '\\z'), array('^', '$', ''), $format);
         
-        if($return==self::JS_REGEX_JSON) {
+        if ($return == self::JS_REGEX_JSON) {
             return json_encode(array(
                 'format' => $format,
                 'modifiers' => $modifiers
             ));
         }
         
-        if(!empty($modifiers)) {
+        if (!empty($modifiers)) {
             return sprintf(
                 'new RegExp(%s, %s)',
                 json_encode($format),
@@ -1100,10 +1100,10 @@ 
     public static function stripUTFBom($string)
     {
         $boms = FileHelper::getUTFBOMs();
-        foreach($boms as $bomChars) {
+        foreach ($boms as $bomChars) {
             $length = mb_strlen($bomChars);
             $text = mb_substr($string, 0, $length);
-            if($text==$bomChars) {
+            if ($text == $bomChars) {
                 return mb_substr($string, $length);
             }
         }
@@ -1120,7 +1120,7 @@ 
     */
     public static function string2utf8($string)
     {
-        if(!self::isStringASCII($string)) {
+        if (!self::isStringASCII($string)) {
             return \ForceUTF8\Encoding::toUTF8($string);
         }
         
@@ -1138,11 +1138,11 @@ 
     */
     public static function isStringASCII($string)
     {
-        if($string === '' || $string === NULL) {
+        if ($string === '' || $string === NULL) {
             return true;
         }
         
-        if(!is_string($string)) {
+        if (!is_string($string)) {
             return false;
         }
         
@@ -1176,7 +1176,7 @@ 
     * @param array $options
     * @return float
     */
-    public static function matchString($source, $target, $options=array())
+    public static function matchString($source, $target, $options = array())
     {
         $defaults = array(
             'maxLevenshtein' => 10,
@@ -1186,12 +1186,12 @@ 
         $options = array_merge($defaults, $options);
         
         // avoid doing this via levenshtein
-        if($source == $target) {
+        if ($source == $target) {
             return 100;
         }
         
         $diff = levenshtein($source, $target);
-        if($diff > $options['maxLevenshtein']) {
+        if ($diff > $options['maxLevenshtein']) {
             return 0;
         }
         
@@ -1205,8 +1205,8 @@ 
         
         $offset = 0;
         $keep = array();
-        foreach($tokens as $token) {
-            if($interval->$token > 0) {
+        foreach ($tokens as $token) {
+            if ($interval->$token > 0) {
                 $keep = array_slice($tokens, $offset);
                 break;
             }
@@ -1215,16 +1215,16 @@ 
         }
         
         $parts = array();
-        foreach($keep as $token) 
+        foreach ($keep as $token) 
         {
             $value = $interval->$token;
             $label = '';
             
             $suffix = 'p';
-            if($value == 1) { $suffix = 's'; }
+            if ($value == 1) { $suffix = 's'; }
             $token .= $suffix;
             
-            switch($token) {
+            switch ($token) {
                 case 'ys': $label = t('1 year'); break;
                 case 'yp': $label = t('%1$s years', $value); break;
                 case 'ms': $label = t('1 month'); break;
@@ -1242,7 +1242,7 @@ 
             $parts[] = $label;
         }
         
-        if(count($parts) == 1) {
+        if (count($parts) == 1) {
             return $parts[0];
         } 
         
@@ -1267,23 +1267,23 @@ 
     * @param string $unit
     * @return integer
     */
-    public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS)
+    public static function interval2total(\DateInterval $interval, $unit = self::INTERVAL_SECONDS)
     {
         $total = $interval->format('%a');
         if ($unit == self::INTERVAL_DAYS) {
             return $total;
         }
 
-        $total = ($total * 24) + ($interval->h );
+        $total = ($total * 24) + ($interval->h);
         if ($unit == self::INTERVAL_HOURS) {
             return $total;
         }
     
-        $total = ($total * 60) + ($interval->i );
+        $total = ($total * 60) + ($interval->i);
         if ($unit == self::INTERVAL_MINUTES)
             return $total;
 
-        $total = ($total * 60) + ($interval->s );
+        $total = ($total * 60) + ($interval->s);
         if ($unit == self::INTERVAL_SECONDS)
             return $total;
         
@@ -1311,13 +1311,13 @@ 
     * @param string $short
     * @return string|NULL
     */
-    public static function date2dayName(\DateTime $date, $short=false)
+    public static function date2dayName(\DateTime $date, $short = false)
     {
         $day = $date->format('l');
         $invariant = self::getDayNamesInvariant();
         
         $idx = array_search($day, $invariant);
-        if($idx !== false) {
+        if ($idx !== false) {
             $localized = self::getDayNames($short);
             return $localized[$idx];
         }
@@ -1340,10 +1340,10 @@ 
     * @param string $short
     * @return string[]
     */
-    public static function getDayNames($short=false)
+    public static function getDayNames($short = false)
     {
-        if($short) {
-            if(!isset(self::$daysShort)) {
+        if ($short) {
+            if (!isset(self::$daysShort)) {
                 self::$daysShort = array(
                     t('Mon'),
                     t('Tue'),
@@ -1358,7 +1358,7 @@ 
             return self::$daysShort;
         }
         
-        if(!isset(self::$days)) {
+        if (!isset(self::$days)) {
             self::$days = array(
                 t('Monday'),
                 t('Tuesday'),
@@ -1383,17 +1383,17 @@ 
      */
     public static function implodeWithAnd(array $list, $sep = ', ', $conjunction = null)
     {
-        if(empty($list)) {
+        if (empty($list)) {
             return '';
         }
         
-        if(empty($conjunction)) {
+        if (empty($conjunction)) {
             $conjunction = t('and');
         }
         
         $last = array_pop($list);
-        if($list) {
-            return implode($sep, $list) . $conjunction . ' ' . $last;
+        if ($list) {
+            return implode($sep, $list).$conjunction.' '.$last;
         }
         
         return $last;
@@ -1412,7 +1412,7 @@ 
     public static function string2array(string $string) : array
     {
         $result = preg_split('//u', $string, null, PREG_SPLIT_NO_EMPTY);
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
         
@@ -1427,12 +1427,12 @@ 
     */
     public static function isStringHTML(string $string) : bool
     {
-        if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
+        if (preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
             return true;
         }
         
         $decoded = html_entity_decode($string);
-        if($decoded !== $string) {
+        if ($decoded !== $string) {
             return true;
         }
         
@@ -1569,7 +1569,7 @@ 
         // extract parameter names from the query string
         $result = array();
         preg_match_all('/&?([^&]+)=.*/sixU', $queryString, $result, PREG_PATTERN_ORDER);
-        if(isset($result[1])) {
+        if (isset($result[1])) {
             $paramNames = $result[1];
         }
         
@@ -1592,11 +1592,11 @@ 
         // possible naming conflicts like having both parameters "foo.bar" 
         // and "foo_bar" in the query string: since "foo.bar" would be converted
         // to "foo_bar", one of the two would be replaced.
-        if($fixRequired) 
+        if ($fixRequired) 
         {
             $counter = 1;
             $placeholders = array();
-            foreach($paramNames as $paramName)
+            foreach ($paramNames as $paramName)
             {
                  // create a unique placeholder name
                  $placeholder = '__PLACEHOLDER'.$counter.'__';
@@ -1626,13 +1626,13 @@ 
         parse_str($queryString, $parsed);
         
         // do any of the parameter names need to be fixed?
-        if(!$fixRequired) {
+        if (!$fixRequired) {
             return $parsed;
         }
         
         $keep = array();
         
-        foreach($parsed as $name => $value)
+        foreach ($parsed as $name => $value)
         {
              $keep[$table[$name]] = $value;
         }
@@ -1651,14 +1651,14 @@ 
     * @param bool $caseInsensitive
     * @return ConvertHelper_StringMatch[]
     */
-    public static function findString(string $needle, string $haystack, bool $caseInsensitive=false)
+    public static function findString(string $needle, string $haystack, bool $caseInsensitive = false)
     {
-        if($needle === '') {
+        if ($needle === '') {
             return array();
         }
         
         $function = 'mb_strpos';
-        if($caseInsensitive) {
+        if ($caseInsensitive) {
             $function = 'mb_stripos';
         }
         
@@ -1666,7 +1666,7 @@ 
         $positions = array();
         $length = mb_strlen($needle);
         
-        while( ($pos = $function($haystack, $needle, $pos)) !== false) 
+        while (($pos = $function($haystack, $needle, $pos)) !== false) 
         {
             $match = mb_substr($haystack, $pos, $length);
             $positions[] = new ConvertHelper_StringMatch($pos, $match);
@@ -1686,7 +1686,7 @@ 
     */
     public static function explodeTrim(string $delimiter, string $string) : array
     {
-        if(empty($string) || empty($delimiter)) {
+        if (empty($string) || empty($delimiter)) {
             return array();
         }
         
@@ -1694,8 +1694,8 @@ 
         $tokens = array_map('trim', $tokens);
         
         $keep = array();
-        foreach($tokens as $token) {
-            if($token !== '') {
+        foreach ($tokens as $token) {
+            if ($token !== '') {
                 $keep[] = $token;
             }
         }
@@ -1713,11 +1713,11 @@ 
     */
     public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL
     {
-        if(empty($subjectString)) {
+        if (empty($subjectString)) {
             return null;
         }
         
-        if(!isset(self::$eolChars))
+        if (!isset(self::$eolChars))
         {
             $cr = chr((int)hexdec('0d'));
             $lf = chr((int)hexdec('0a'));
@@ -1748,18 +1748,18 @@ 
         
         $max = 0;
         $results = array();
-        foreach(self::$eolChars as $def) 
+        foreach (self::$eolChars as $def) 
         {
             $amount = substr_count($subjectString, $def['char']);
             
-            if($amount > $max)
+            if ($amount > $max)
             {
                 $max = $amount;
                 $results[] = $def;
             }
         }
         
-        if(empty($results)) {
+        if (empty($results)) {
             return null;
         }
         
@@ -1779,9 +1779,9 @@ 
     */
     public static function arrayRemoveKeys(array &$array, array $keys) : void
     {
-        foreach($keys as $key) 
+        foreach ($keys as $key) 
         {
-            if(array_key_exists($key, $array)) {
+            if (array_key_exists($key, $array)) {
                 unset($array[$key]); 
             }
         }
@@ -1794,11 +1794,11 @@ 
     */
     public static function isInteger($value) : bool
     {
-        if(is_int($value)) {
+        if (is_int($value)) {
             return true;
         }
         
-        if(is_string($value)) {
+        if (is_string($value)) {
             return preg_match('/\A\d+\z/', $value);
         }
         

src/CSVHelper/Builder.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
         return $this->setOption('separatorChar', $char);
     }
     
-    public function setTrailingNewline($useNewline=true)
+    public function setTrailingNewline($useNewline = true)
     {
         return $this->setOption('trailingNewline', $useNewline);
     }
@@ -38,7 +38,7 @@ 
             $args = $args[0];
         }
 
-        $this->lines[] = '"' . implode('"'.$this->getOption('separatorChar').'"', $args) . '"';
+        $this->lines[] = '"'.implode('"'.$this->getOption('separatorChar').'"', $args).'"';
         
         return $this;
     }
@@ -54,7 +54,7 @@ 
     {
         $csv = implode(PHP_EOL, $this->lines);
 
-        if($this->getOption('trailingNewline')) {
+        if ($this->getOption('trailingNewline')) {
             $csv .= PHP_EOL;
         }
 
@@ -65,7 +65,7 @@ 
     
     public function setOption($name, $value)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -75,20 +75,20 @@ 
     
     public function setOptions($options)
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
         
         return $this;
     }
     
-    public function getOption($name, $default=null)
+    public function getOption($name, $default = null)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
-        if(isset($this->options[$name])) {
+        if (isset($this->options[$name])) {
             return $this->options[$name];
         }
         
@@ -97,7 +97,7 @@ 
     
     public function hasOption($name)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -106,7 +106,7 @@ 
     
     public function getOptions()
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -115,7 +115,7 @@ 
     
     public function isOption($name, $value)
     {
-        if($this->getOption($name) === $value) {
+        if ($this->getOption($name) === $value) {
             return true;
         }