Mistralys / application-utils

src/FileHelper/FileFinder.php

Spacing +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
  * @see FileHelper_FileFinder
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppUtils;
 
@@ -125,7 +125,7 @@ 
     
     public function getAll() : array
     {
-        if(!isset($this->found)) {
+        if (!isset($this->found)) {
             $this->find($this->path, true);
         }
         
@@ -150,25 +150,25 @@ 
     
     protected $found;
     
-    protected function find($path, $isRoot=false)
+    protected function find($path, $isRoot = false)
     {
-        if($isRoot) {
+        if ($isRoot) {
             $this->found = array();
         }
         
         $d = new \DirectoryIterator($path);
-        foreach($d as $item)
+        foreach ($d as $item)
         {
-            if($item->isDir())
+            if ($item->isDir())
             {
-                if($this->getOption('recursive') === true && !$item->isDot()) {
+                if ($this->getOption('recursive') === true && !$item->isDot()) {
                     $this->find($item->getPathname());
                 }
             }
             else
             {
                 $file = $this->filterFile($item->getPathname());
-                if($file) {
+                if ($file) {
                     $this->found[] = $file;
                 }
             }
@@ -184,20 +184,20 @@ 
         $include = $this->getOption('include-extensions');
         $exclude = $this->getOption('exclude-extensions');
         
-        if(!empty($include))
+        if (!empty($include))
         {
-            if(!in_array($info['extension'], $include)) {
+            if (!in_array($info['extension'], $include)) {
                 return false;
             }
         }
-        else if(!empty($exclude))
+        else if (!empty($exclude))
         {
-            if(in_array($info['extension'], $exclude)) {
+            if (in_array($info['extension'], $exclude)) {
                 return false;
             }
         }
         
-        switch($this->getOption('pathmode'))
+        switch ($this->getOption('pathmode'))
         {
             case self::PATH_MODE_STRIP:
                 $path = basename($path);
@@ -213,13 +213,13 @@ 
                 break;
         }
         
-        if($this->getOption('strip-extensions') === true)
+        if ($this->getOption('strip-extensions') === true)
         {
             $path = str_replace('.'.$info['extension'], '', $path);
         }
         
         $replace = $this->getOption('slash-replacement');
-        if(!empty($replace)) {
+        if (!empty($replace)) {
             $path = str_replace('/', $replace, $path);
         }
         

src/BaseException.php

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

Spacing +14 added lines, -14 removed lines

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

src/VariableInfo.php

Spacing +12 added lines, -12 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> ';
@@ -215,7 +215,7 @@ 
         
         // the array may not be encodable - for example if it contains
         // broken unicode characters. 
-        if(is_string($result) && $result !== '') {
+        if (is_string($result) && $result !== '') {
             return $result;
         }
         
@@ -226,7 +226,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]).'->';
@@ -353,7 +353,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/JSHelper.php

Spacing +22 added lines, -22 removed lines

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

src/Request.php

Spacing +36 added lines, -36 removed lines

@@ -90,11 +90,11 @@ 
     public function getParam($name, $default = null)
     {
         $value = $default;
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             $value = $_REQUEST[$name];
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             $value = $this->knownParams[$name]->validate($value);
         }
         
@@ -137,8 +137,8 @@ 
     
     public function getRefreshParams($params = array(), $exclude = array())
     {
-        if(empty($params)) { $params = array(); }
-        if(empty($exclude)) { $exclude = array(); }
+        if (empty($params)) { $params = array(); }
+        if (empty($exclude)) { $exclude = array(); }
         
         $vars = $_REQUEST;
 
@@ -158,8 +158,8 @@ 
         // remove the quickform form variable if present, to 
         // avoid redirect loops when using the refresh URL in
         // a page in which a form has been submitted.
-        foreach($names as $name) {
-            if(strstr($name, '_qf__')) {
+        foreach ($names as $name) {
+            if (strstr($name, '_qf__')) {
                 unset($vars[$name]);
                 break;
             }
@@ -186,13 +186,13 @@ 
      * @param string $dispatcher Relative path to script to use for the URL. Append trailing slash if needed.
      * @return string
      */
-    public function buildURL($params = array(), string $dispatcher='')
+    public function buildURL($params = array(), string $dispatcher = '')
     {
-        $url = rtrim($this->getBaseURL(), '/') . '/' . $dispatcher;
+        $url = rtrim($this->getBaseURL(), '/').'/'.$dispatcher;
         
         // append any leftover parameters to the end of the URL
         if (!empty($params)) {
-            $url .= '?' . http_build_query($params, null, '&');
+            $url .= '?'.http_build_query($params, null, '&');
         }
         
         return $url;
@@ -223,7 +223,7 @@ 
      */
     public function registerParam($name)
     {
-        if(!isset($this->knownParams[$name])) {
+        if (!isset($this->knownParams[$name])) {
             $param = new Request_Param($this, $name);
             $this->knownParams[$name] = $param;
         }
@@ -240,7 +240,7 @@ 
     */
     public function getRegisteredParam(string $name) : Request_Param
     {
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             return $this->knownParams[$name];
         }
         
@@ -307,12 +307,12 @@ 
             {
                 $entry['type'] = $matches[1];
                 
-                if(isset($matches[2]) && !empty($matches[2])) 
+                if (isset($matches[2]) && !empty($matches[2])) 
                 {
                     $params = ConvertHelper::parseQueryString($matches[2]);
                     $entry['params'] = $params;
                      
-                    if(isset($params['q'])) {
+                    if (isset($params['q'])) {
                         $entry['quality'] = (double)$params['q'];
                     }
                 }
@@ -365,7 +365,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -399,11 +399,11 @@ 
     */
     public function removeParam(string $name) : Request
     {
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             unset($_REQUEST[$name]);
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -418,7 +418,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -434,10 +434,10 @@ 
      * @param string $name
      * @return bool
      */
-    public function getBool($name, $default=false)
+    public function getBool($name, $default = false)
     {
         $value = $this->getParam($name, $default);
-        if(ConvertHelper::isBoolean($value)) {
+        if (ConvertHelper::isBoolean($value)) {
             return ConvertHelper::string2bool($value);
         }
         
@@ -446,9 +446,9 @@ 
     
     public function validate()
     {
-        foreach($this->knownParams as $param) {
+        foreach ($this->knownParams as $param) {
             $name = $param->getName();
-            if($param->isRequired() && !$this->hasParam($name)) {
+            if ($param->isRequired() && !$this->hasParam($name)) {
                 throw new Request_Exception(
                     'Missing request parameter '.$name,
                     sprintf(
@@ -470,10 +470,10 @@ 
      * @param mixed $default
      * @return string
      */
-    public function getFilteredParam($name, $default=null)
+    public function getFilteredParam($name, $default = null)
     {
         $val = $this->getParam($name, $default);
-        if(is_string($val)) {
+        if (is_string($val)) {
             $val = htmlspecialchars(trim(strip_tags($val)), ENT_QUOTES, 'UTF-8');
         }
         
@@ -492,24 +492,24 @@ 
     * @see Request::getJSONAssoc()
     * @see Request::getJSONObject()
     */
-    public function getJSON(string $name, bool $assoc=true)
+    public function getJSON(string $name, bool $assoc = true)
     {
         $value = $this->getParam($name);
         
-        if(!empty($value) && is_string($value)) 
+        if (!empty($value) && is_string($value)) 
         {
             $data = json_decode($value, $assoc);
             
-            if($assoc && is_array($data)) {
+            if ($assoc && is_array($data)) {
                 return $data;
             }
             
-            if(is_object($data)) {
+            if (is_object($data)) {
                 return $data;
             }
         }
         
-        if($assoc) {
+        if ($assoc) {
             return array();
         }
         
@@ -526,7 +526,7 @@ 
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -543,7 +543,7 @@ 
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
-        if(is_object($result)) {
+        if (is_object($result)) {
             return $result;
         }
         
@@ -556,10 +556,10 @@ 
     * @param array|string $data
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendJSON($data, bool $exit=true)
+    public static function sendJSON($data, bool $exit = true)
     {
         $payload = $data;
-        if(!is_string($payload)) {
+        if (!is_string($payload)) {
             $payload = json_encode($payload);
         }
         
@@ -569,7 +569,7 @@ 
         
         echo $payload;
         
-        if($exit) 
+        if ($exit) 
         {
             exit;
         }
@@ -581,7 +581,7 @@ 
     * @param string $html
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendHTML(string $html, bool $exit=true)
+    public static function sendHTML(string $html, bool $exit = true)
     {
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -589,7 +589,7 @@ 
         
         echo $html;
         
-        if($exit)
+        if ($exit)
         {
             exit;
         }
@@ -605,7 +605,7 @@ 
     * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present)
     * @return Request_URLComparer
     */
-    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams=array()) : Request_URLComparer
+    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams = array()) : Request_URLComparer
     {
         $comparer = new Request_URLComparer($this, $sourceURL, $targetURL);
         $comparer->addLimitParams($limitParams);

src/Request/Param.php

Spacing +38 added lines, -38 removed lines

@@ -123,9 +123,9 @@ 
     * @param array $args
     * @return Request_Param
     */
-    public function setCallback($callback, $args=array())
+    public function setCallback($callback, $args = array())
     {
-        if(!is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new Request_Exception(
                 'Not a valid callback',
                 'The specified callback is not a valid callable entity.',
@@ -148,7 +148,7 @@ 
         array_unshift($args, $value);
         
         $result = call_user_func_array($this->validationParams['callback'], $args);
-        if($result !== false) {
+        if ($result !== false) {
             return $value;
         }
         
@@ -175,13 +175,13 @@ 
         
         // go through all enqueued validations in turn, each time
         // replacing the value with the adjusted, validated value.
-        foreach($this->validations as $validateDef) 
+        foreach ($this->validations as $validateDef) 
         {
             $this->validationType = $validateDef['type'];
             $this->validationParams = $validateDef['params'];
             
             // and now, see if we have to validate the value as well
-            $method = 'validate_' . $this->validationType;
+            $method = 'validate_'.$this->validationType;
             if (!method_exists($this, $method)) {
                 throw new Request_Exception(
                     'Unknown validation type.',
@@ -195,19 +195,19 @@ 
                 );
             }
          
-            if($this->valueType === self::VALUE_TYPE_ID_LIST) 
+            if ($this->valueType === self::VALUE_TYPE_ID_LIST) 
             {
-                if(!is_array($value)) {
+                if (!is_array($value)) {
                     $value = explode(',', $value);
                 }
                 
                 $keep = array();
-                foreach($value as $subval) 
+                foreach ($value as $subval) 
                 {
                     $subval = trim($subval);
                     $subval = $this->$method($subval);
                     
-                    if($subval !== null) {
+                    if ($subval !== null) {
                         $keep[] = intval($subval);
                     }
                 }
@@ -423,7 +423,7 @@ 
     
     protected function applyFilter_boolean($value)
     {
-        if($value == 'yes' || $value == 'true') {
+        if ($value == 'yes' || $value == 'true') {
             return true;
         }
         
@@ -437,7 +437,7 @@ 
     
     protected function applyFilter_string($value)
     {
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return '';
         }
         
@@ -446,29 +446,29 @@ 
     
     protected function applyFilter_commaSeparated($value, bool $trimEntries, bool $stripEmptyEntries)
     {
-        if(is_array($value)) {
+        if (is_array($value)) {
             return $value;
         }
         
-        if($value === '' || $value === null || !is_string($value)) {
+        if ($value === '' || $value === null || !is_string($value)) {
             return array();
         }
         
         $result = explode(',', $value);
         
-        if(!$trimEntries && !$stripEmptyEntries) {
+        if (!$trimEntries && !$stripEmptyEntries) {
             return $result;
         }
         
         $keep = array();
         
-        foreach($result as $entry) 
+        foreach ($result as $entry) 
         {
-            if($trimEntries === true) {
+            if ($trimEntries === true) {
                 $entry = trim($entry);
             }
             
-            if($stripEmptyEntries === true && $entry === '') {
+            if ($stripEmptyEntries === true && $entry === '') {
                 continue;
             }
             
@@ -536,10 +536,10 @@ 
     * @param mixed $default
     * @return mixed
     */
-    public function get($default=null)
+    public function get($default = null)
     {
         $value = $this->request->getParam($this->paramName);
-        if($value !== null && $value !== '') {
+        if ($value !== null && $value !== '') {
             return $value;
         }
 
@@ -558,7 +558,7 @@ 
      */
     protected function validate_integer($value) : ?int
     {
-        if(ConvertHelper::isInteger($value)) {
+        if (ConvertHelper::isInteger($value)) {
             return intval($value);
         }
         
@@ -573,12 +573,12 @@ 
     */
     protected function validate_url($value) : string
     {
-        if(!is_string($value)) {
+        if (!is_string($value)) {
             return '';
         }
         
         $info = parse_url($value);
-        if(isset($info['host'])) {
+        if (isset($info['host'])) {
             return $value;
         }
         
@@ -594,7 +594,7 @@ 
      */
     protected function validate_numeric($value) : ?float
     {
-        if(is_numeric($value)) {
+        if (is_numeric($value)) {
             return $value * 1;
         }
 
@@ -610,7 +610,7 @@ 
      */
     protected function validate_regex($value) : ?string
     {
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return null;
         }
         
@@ -618,13 +618,13 @@ 
         // is a boolan, which is converted to an integer when
         // converted to string, which in turn can be validated
         // with a regex.
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return null;
         }
         
         $value = (string)$value;
         
-        if(preg_match($this->validationParams['regex'], $value)) {
+        if (preg_match($this->validationParams['regex'], $value)) {
             return $value;
         }
 
@@ -640,11 +640,11 @@ 
      */
     protected function validate_alpha($value)
     {
-        if(!is_scalar($value)) {
+        if (!is_scalar($value)) {
             return null;
         }
         
-        if(preg_match('/\A[a-zA-Z]+\z/', $value)) {
+        if (preg_match('/\A[a-zA-Z]+\z/', $value)) {
             return $value;
         }
 
@@ -653,13 +653,13 @@ 
     
     protected function validate_valueslist($value)
     {
-        if(!is_array($value)) {
+        if (!is_array($value)) {
             return array();
         }
         
         $keep = array();
-        foreach($value as $item) {
-            if(in_array($item, $this->validationParams)) {
+        foreach ($value as $item) {
+            if (in_array($item, $this->validationParams)) {
                 $keep[] = $item;
             }
         }
@@ -716,26 +716,26 @@ 
     */
     protected function validate_json($value) : string
     {
-        if(!is_string($value)) {
+        if (!is_string($value)) {
             return '';
         }
         
         $value = trim($value);
         
-        if(empty($value)) {
+        if (empty($value)) {
             return '';
         }
         
         // strictly validate for objects?
-        if($this->validationParams['arrays'] === false) 
+        if ($this->validationParams['arrays'] === false) 
         {
-            if(is_object(json_decode($value))) {
+            if (is_object(json_decode($value))) {
                return $value; 
             }
         } 
         else 
         {
-            if(is_array(json_decode($value, true))) {
+            if (is_array(json_decode($value, true))) {
                 return $value;
             }
         }
@@ -755,7 +755,7 @@ 
     {
         $total = count($this->filters);
         for ($i = 0; $i < $total; $i++) {
-            $method = 'applyFilter_' . $this->filters[$i]['type'];
+            $method = 'applyFilter_'.$this->filters[$i]['type'];
             $value = $this->$method($value, $this->filters[$i]['params']);
         }
 
@@ -902,7 +902,7 @@ 
     * @param bool $stripEmptyEntries Remove empty entries from the array?
     * @return \AppUtils\Request_Param
     */
-    public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param
+    public function addCommaSeparatedFilter(bool $trimEntries = true, bool $stripEmptyEntries = true) : Request_Param
     {
         $this->setArray();
         

src/Traits/Optionable.php

Spacing +15 added lines, -15 removed lines

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

src/FileHelper.php

Spacing +112 added lines, -112 removed lines

@@ -112,7 +112,7 @@ 
         
         $contents = file_get_contents($file);
         
-        if($contents === false) 
+        if ($contents === false) 
         {
             throw new FileHelper_Exception(
                 'Cannot load serialized content from file.',
@@ -126,7 +126,7 @@ 
         
         $result = @unserialize($contents);
         
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
         
@@ -142,7 +142,7 @@ 
     
     public static function deleteTree($rootFolder)
     {
-        if(!file_exists($rootFolder)) {
+        if (!file_exists($rootFolder)) {
             return true;
         }
         
@@ -183,7 +183,7 @@ 
     */
     public static function createFolder($path)
     {
-        if(is_dir($path) || mkdir($path, 0777, true)) {
+        if (is_dir($path) || mkdir($path, 0777, true)) {
             return;
         }
         
@@ -218,11 +218,11 @@ 
 
             if ($item->isDir()) 
             {
-                FileHelper::copyTree(str_replace('\\', '/', $itemPath), $target . '/' . $baseName);
+                FileHelper::copyTree(str_replace('\\', '/', $itemPath), $target.'/'.$baseName);
             } 
-            else if($item->isFile()) 
+            else if ($item->isFile()) 
             {
-                self::copyFile($itemPath, $target . '/' . $baseName);
+                self::copyFile($itemPath, $target.'/'.$baseName);
             }
         }
     }
@@ -247,7 +247,7 @@ 
     {
         self::requireFileExists($sourcePath, self::ERROR_SOURCE_FILE_NOT_FOUND);
         
-        if(!is_readable($sourcePath))
+        if (!is_readable($sourcePath))
         {
             throw new FileHelper_Exception(
                 sprintf('Source file [%s] to copy is not readable.', basename($sourcePath)),
@@ -261,11 +261,11 @@ 
         
         $targetFolder = dirname($targetPath);
         
-        if(!file_exists($targetFolder))
+        if (!file_exists($targetFolder))
         {
             self::createFolder($targetFolder);
         }
-        else if(!is_writable($targetFolder)) 
+        else if (!is_writable($targetFolder)) 
         {
             throw new FileHelper_Exception(
                 sprintf('Target folder [%s] is not writable.', basename($targetFolder)),
@@ -277,7 +277,7 @@ 
             );
         }
         
-        if(copy($sourcePath, $targetPath)) {
+        if (copy($sourcePath, $targetPath)) {
             return;
         }
         
@@ -304,11 +304,11 @@ 
     */
     public static function deleteFile(string $filePath) : void
     {
-        if(!file_exists($filePath)) {
+        if (!file_exists($filePath)) {
             return;
         }
         
-        if(unlink($filePath)) {
+        if (unlink($filePath)) {
             return;
         }
         
@@ -332,10 +332,10 @@ 
     * @return \parseCSV
     * @todo Move this to the CSV helper.
     */
-    public static function createCSVParser(string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : \parseCSV
+    public static function createCSVParser(string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading = false) : \parseCSV
     {
-        if($delimiter==='') { $delimiter = ';'; }
-        if($enclosure==='') { $enclosure = '"'; }
+        if ($delimiter === '') { $delimiter = ';'; }
+        if ($enclosure === '') { $enclosure = '"'; }
         
         $parser = new \parseCSV(null, null, null, array());
 
@@ -363,11 +363,11 @@ 
     * @see parseCSVFile()
     * @see FileHelper::ERROR_PARSING_CSV
     */
-    public static function parseCSVString(string $csv, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : array
+    public static function parseCSVString(string $csv, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading = false) : array
     {
         $parser = self::createCSVParser($delimiter, $enclosure, $escape, $heading);
         $result = $parser->parse_string(/** @scrutinizer ignore-type */ $csv);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -395,7 +395,7 @@ 
      * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
      * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
      */
-    public static function parseCSVFile(string $filePath, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : array
+    public static function parseCSVFile(string $filePath, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading = false) : array
     {
         $content = self::readContents($filePath);
 
@@ -412,7 +412,7 @@ 
     public static function detectMimeType(string $fileName) : ?string
     {
         $ext = self::getExtension($fileName);
-        if(empty($ext)) {
+        if (empty($ext)) {
             return null;
         }
 
@@ -433,11 +433,11 @@ 
      * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
      * @see FileHelper::ERROR_UNKNOWN_FILE_MIME_TYPE
      */
-    public static function sendFile(string $filePath, $fileName = null, bool $asAttachment=true)
+    public static function sendFile(string $filePath, $fileName = null, bool $asAttachment = true)
     {
         self::requireFileExists($filePath);
         
-        if(empty($fileName)) {
+        if (empty($fileName)) {
             $fileName = basename($filePath);
         }
 
@@ -455,10 +455,10 @@ 
         
         header("Cache-Control: public", true);
         header("Content-Description: File Transfer", true);
-        header("Content-Type: " . $mime, true);
+        header("Content-Type: ".$mime, true);
 
         $disposition = 'inline';
-        if($asAttachment) {
+        if ($asAttachment) {
             $disposition = 'attachment';
         }
         
@@ -484,7 +484,7 @@ 
      */
     public static function downloadFile($url)
     {
-        if(!function_exists('curl_init')) 
+        if (!function_exists('curl_init')) 
         {
             throw new FileHelper_Exception(
                 'The cURL extension is not installed.',
@@ -494,7 +494,7 @@ 
         }
 
         $ch = curl_init();
-        if($ch === false) 
+        if ($ch === false) 
         {
             throw new FileHelper_Exception(
                 'Could not initialize a new cURL instance.',
@@ -515,7 +515,7 @@ 
         
         $output = curl_exec($ch);
 
-        if($output === false) {
+        if ($output === false) {
             throw new FileHelper_Exception(
                 'Unable to open URL',
                 sprintf(
@@ -529,7 +529,7 @@ 
 
         curl_close($ch);
 
-        if(is_string($output)) 
+        if (is_string($output)) 
         {
             return $output;
         }
@@ -551,7 +551,7 @@ 
     */
     public static function isPHPFile($pathOrDirIterator)
     {
-    	if(self::getExtension($pathOrDirIterator) == 'php') {
+    	if (self::getExtension($pathOrDirIterator) == 'php') {
     		return true;
     	}
     	
@@ -568,14 +568,14 @@ 
     */
     public static function getExtension($pathOrDirIterator, bool $lowercase = true) : string
     {
-        if($pathOrDirIterator instanceof \DirectoryIterator) {
+        if ($pathOrDirIterator instanceof \DirectoryIterator) {
             $filename = $pathOrDirIterator->getFilename();
         } else {
             $filename = basename($pathOrDirIterator);
         }
          
         $ext = pathinfo($filename, PATHINFO_EXTENSION);
-        if($lowercase) {
+        if ($lowercase) {
         	$ext = mb_strtolower($ext);
         }
         
@@ -597,13 +597,13 @@ 
     public static function getFilename($pathOrDirIterator, $extension = true)
     {
         $path = $pathOrDirIterator;
-    	if($pathOrDirIterator instanceof \DirectoryIterator) {
+    	if ($pathOrDirIterator instanceof \DirectoryIterator) {
     		$path = $pathOrDirIterator->getFilename();
     	}
     	
     	$path = self::normalizePath($path);
     	
-    	if(!$extension) {
+    	if (!$extension) {
     	    return pathinfo($path, PATHINFO_FILENAME);
     	}
     	
@@ -621,12 +621,12 @@ 
     * @see FileHelper::ERROR_CANNOT_FIND_JSON_FILE
     * @see FileHelper::ERROR_CANNOT_DECODE_JSON_FILE
     */ 
-    public static function parseJSONFile(string $file, $targetEncoding=null, $sourceEncoding=null)
+    public static function parseJSONFile(string $file, $targetEncoding = null, $sourceEncoding = null)
     {
         self::requireFileExists($file, self::ERROR_CANNOT_FIND_JSON_FILE);
         
         $content = file_get_contents($file);
-        if(!$content) {
+        if (!$content) {
             throw new FileHelper_Exception(
                 'Cannot get file contents',
                 sprintf(
@@ -637,12 +637,12 @@ 
             );
         }
         
-        if(isset($targetEncoding)) {
+        if (isset($targetEncoding)) {
             $content = mb_convert_encoding($content, $targetEncoding, $sourceEncoding);
         }
         
         $json = json_decode($content, true);
-        if($json === false || $json === NULL) {
+        if ($json === false || $json === NULL) {
             throw new FileHelper_Exception(
                 'Cannot decode json data',
                 sprintf(
@@ -682,13 +682,13 @@ 
         
         $name = str_replace(array_keys($replaces), array_values($replaces), $name);
         
-        while(strstr($name, '  ')) {
+        while (strstr($name, '  ')) {
             $name = str_replace('  ', ' ', $name);
         }
 
         $name = str_replace(array_keys($replaces), array_values($replaces), $name);
         
-        while(strstr($name, '..')) {
+        while (strstr($name, '..')) {
             $name = str_replace('..', '.', $name);
         }
         
@@ -718,7 +718,7 @@ 
     * 
     * @todo Convert this to use the file finder.
     */
-    public static function findHTMLFiles(string $targetFolder, array $options=array()) : array
+    public static function findHTMLFiles(string $targetFolder, array $options = array()) : array
     {
         return self::findFiles($targetFolder, array('html'), $options);
     }
@@ -733,7 +733,7 @@ 
     * 
     * @todo Convert this to use the file finder.
     */
-    public static function findPHPFiles(string $targetFolder, array $options=array()) : array
+    public static function findPHPFiles(string $targetFolder, array $options = array()) : array
     {
         return self::findFiles($targetFolder, array('php'), $options);
     }
@@ -749,39 +749,39 @@ 
     * @see FileHelper::createFileFinder()
     * @todo Convert this to use the file finder. 
     */
-    public static function findFiles(string $targetFolder, array $extensions=array(), array $options=array(), array $files=array()) : array
+    public static function findFiles(string $targetFolder, array $extensions = array(), array $options = array(), array $files = array()) : array
     {
-        if(!isset($options['strip-extension'])) {
+        if (!isset($options['strip-extension'])) {
             $options['strip-extension'] = false;
         }
         
-        if(!isset($options['absolute-path'])) {
+        if (!isset($options['absolute-path'])) {
             $options['absolute-path'] = false;
         } 
         
-        if(!isset($options['relative-path'])) {
+        if (!isset($options['relative-path'])) {
             $options['relative-path'] = false;
         }
         
-        if(!isset($options['recursive'])) {
+        if (!isset($options['recursive'])) {
             $options['recursive'] = false;
         }
         
-        if($options['relative-path']) {
+        if ($options['relative-path']) {
             $options['absolute-path'] = true;
         }
         
-        if(!isset($options['__root'])) {
+        if (!isset($options['__root'])) {
             $options['__root'] = self::normalizePath($targetFolder);
         }
         
         $checkExtensions = false;
-        if(!empty($extensions)) {
+        if (!empty($extensions)) {
             $checkExtensions = true;
             $extensions = array_map('strtolower', $extensions);
         }
         
-        if(!is_dir($targetFolder)) 
+        if (!is_dir($targetFolder)) 
         {
             throw new FileHelper_Exception(
                 'Target folder does not exist',
@@ -794,32 +794,32 @@ 
         }
         
         $d = new \DirectoryIterator($targetFolder);
-        foreach($d as $item) {
-            if($item->isDot()) {
+        foreach ($d as $item) {
+            if ($item->isDot()) {
                 continue;
             }
             
-            if($item->isDir()) {
-                if($options['recursive']) {
+            if ($item->isDir()) {
+                if ($options['recursive']) {
                     $files = self::findFiles($item->getPathname(), $extensions, $options, $files);
                 }
                 continue;
             }
             
-            if($checkExtensions && !in_array(self::getExtension($item, true), $extensions)) {
+            if ($checkExtensions && !in_array(self::getExtension($item, true), $extensions)) {
                 continue;
             }
             
             $filename = $item->getFilename();
-            if($options['strip-extension']) {
+            if ($options['strip-extension']) {
                 $filename = self::removeExtension($filename);
             }
             
-            if($options['absolute-path']) {
+            if ($options['absolute-path']) {
                 $filename = self::normalizePath($targetFolder.'/'.$filename);
             }
             
-            if($options['relative-path']) {
+            if ($options['relative-path']) {
                 $filename = ltrim(str_replace($options['__root'], '', $filename), '/');
             }
             
@@ -863,7 +863,7 @@ 
     public static function detectUTFBom(string $filename) : ?string
     {
         $fp = fopen($filename, 'r');
-        if($fp === false) 
+        if ($fp === false) 
         {
             throw new FileHelper_Exception(
                 'Cannot open file for reading',
@@ -878,10 +878,10 @@ 
 
         $boms = self::getUTFBOMs();
         
-        foreach($boms as $bom => $value) 
+        foreach ($boms as $bom => $value) 
         {
             $length = mb_strlen($value);
-            if(mb_substr($text, 0, $length) == $value) {
+            if (mb_substr($text, 0, $length) == $value) {
                 return $bom;
             }
         }
@@ -900,13 +900,13 @@ 
     */
     public static function getUTFBOMs()
     {
-        if(!isset(self::$utfBoms)) {
+        if (!isset(self::$utfBoms)) {
             self::$utfBoms = array(
-                'UTF32-BE' => chr(0x00) . chr(0x00) . chr(0xFE) . chr(0xFF),
-                'UTF32-LE' => chr(0xFF) . chr(0xFE) . chr(0x00) . chr(0x00),
-                'UTF16-BE' => chr(0xFE) . chr(0xFF),
-                'UTF16-LE' => chr(0xFF) . chr(0xFE),
-                'UTF8' => chr(0xEF) . chr(0xBB) . chr(0xBF)
+                'UTF32-BE' => chr(0x00).chr(0x00).chr(0xFE).chr(0xFF),
+                'UTF32-LE' => chr(0xFF).chr(0xFE).chr(0x00).chr(0x00),
+                'UTF16-BE' => chr(0xFE).chr(0xFF),
+                'UTF16-LE' => chr(0xFF).chr(0xFE),
+                'UTF8' => chr(0xEF).chr(0xBB).chr(0xBF)
             );
         }
         
@@ -927,7 +927,7 @@ 
         $encodings = self::getKnownUnicodeEncodings();
 
         $keep = array();
-        foreach($encodings as $string) 
+        foreach ($encodings as $string) 
         {
             $withHyphen = str_replace('UTF', 'UTF-', $string);
             
@@ -961,15 +961,15 @@ 
         return str_replace(array('\\', '//'), array('/', '/'), $path);
     }
     
-    public static function saveAsJSON($data, $file, $pretty=false)
+    public static function saveAsJSON($data, $file, $pretty = false)
     {
         $options = null;
-        if($pretty) {
+        if ($pretty) {
             $options = JSON_PRETTY_PRINT;
         }
         
         $json = json_encode($data, $options);
-        if($json===false) 
+        if ($json === false) 
         {
             $errorCode = json_last_error();
             throw new FileHelper_Exception(
@@ -979,7 +979,7 @@ 
             ); 
         }
         
-        if(!file_put_contents($file, $json)) {
+        if (!file_put_contents($file, $json)) {
             throw new FileHelper_Exception(
                 sprintf('Could not write the JSON file [%s] to disk.', basename($file)),
                 sprintf('Full path: [%s].', $file),
@@ -1000,12 +1000,12 @@ 
     * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
     * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
     */
-    public static function saveFile(string $filePath, string $content='') : void
+    public static function saveFile(string $filePath, string $content = '') : void
     {
         // target file already exists
-        if(file_exists($filePath))
+        if (file_exists($filePath))
         {
-            if(!is_writable($filePath))
+            if (!is_writable($filePath))
             {
                 throw new FileHelper_Exception(
                     sprintf('Cannot save file: target file [%s] exists, but is not writable.', basename($filePath)),
@@ -1025,7 +1025,7 @@ 
             // create the folder as needed
             self::createFolder($targetFolder);
             
-            if(!is_writable($targetFolder)) 
+            if (!is_writable($targetFolder)) 
             {
                 throw new FileHelper_Exception(
                     sprintf('Cannot save file: target folder [%s] is not writable.', basename($targetFolder)),
@@ -1038,7 +1038,7 @@ 
             }
         }
         
-        if(file_put_contents($filePath, $content) !== false) {
+        if (file_put_contents($filePath, $content) !== false) {
             return;
         }
         
@@ -1074,7 +1074,7 @@ 
     {
         static $checked = array();
         
-        if(isset($checked[$command])) {
+        if (isset($checked[$command])) {
             return $checked[$command];
         }
         
@@ -1087,7 +1087,7 @@ 
         
         $os = strtolower(PHP_OS_FAMILY);
         
-        if(!isset($osCommands[$os])) 
+        if (!isset($osCommands[$os])) 
         {
             throw new FileHelper_Exception(
                 'Unsupported OS for CLI commands',
@@ -1113,7 +1113,7 @@ 
             $pipes
         );
         
-        if($process === false) {
+        if ($process === false) {
             $checked[$command] = false;
             return false;
         }
@@ -1144,7 +1144,7 @@ 
     */
     public static function checkPHPFileSyntax($path)
     {
-        if(!self::canMakePHPCalls()) {
+        if (!self::canMakePHPCalls()) {
             return true;
         }
         
@@ -1155,7 +1155,7 @@ 
         // when the validation is successful, the first entry
         // in the array contains the success message. When it
         // is invalid, the first entry is always empty.
-        if(!empty($output[0])) {
+        if (!empty($output[0])) {
             return true;
         }
         
@@ -1176,7 +1176,7 @@ 
     public static function getModifiedDate($path)
     {
         $time = filemtime($path);
-        if($time !== false) {
+        if ($time !== false) {
             $date = new \DateTime();
             $date->setTimestamp($time);
             return $date;
@@ -1203,7 +1203,7 @@ 
     */
     public static function getSubfolders($targetFolder, $options = array())
     {
-        if(!is_dir($targetFolder)) 
+        if (!is_dir($targetFolder)) 
         {
             throw new FileHelper_Exception(
                 'Target folder does not exist',
@@ -1227,29 +1227,29 @@ 
         
         $d = new \DirectoryIterator($targetFolder);
         
-        foreach($d as $item) 
+        foreach ($d as $item) 
         {
-            if($item->isDir() && !$item->isDot()) 
+            if ($item->isDir() && !$item->isDot()) 
             {
                 $name = $item->getFilename();
                 
-                if(!$options['absolute-path']) {
+                if (!$options['absolute-path']) {
                     $result[] = $name;
                 } else {
                     $result[] = $targetFolder.'/'.$name;
                 }
                 
-                if(!$options['recursive']) 
+                if (!$options['recursive']) 
                 {
                     continue;
                 }
                 
                 $subs = self::getSubfolders($targetFolder.'/'.$name, $options);
-                foreach($subs as $sub) 
+                foreach ($subs as $sub) 
                 {
                     $relative = $name.'/'.$sub;
                     
-                    if(!$options['absolute-path']) {
+                    if (!$options['absolute-path']) {
                         $result[] = $relative;
                     } else {
                         $result[] = $targetFolder.'/'.$relative;
@@ -1317,7 +1317,7 @@ 
     * @param int $depth The folder depth to reduce the path to
     * @return string
     */
-    public static function relativizePathByDepth(string $path, int $depth=2) : string
+    public static function relativizePathByDepth(string $path, int $depth = 2) : string
     {
         $path = self::normalizePath($path);
         
@@ -1325,17 +1325,17 @@ 
         $tokens = array_filter($tokens); // remove empty entries (trailing slash for example)
         $tokens = array_values($tokens); // re-index keys
         
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             return '';
         }
         
         // remove the drive if present
-        if(strstr($tokens[0], ':')) {
+        if (strstr($tokens[0], ':')) {
             array_shift($tokens);
         }
         
         // path was only the drive
-        if(count($tokens) == 0) {
+        if (count($tokens) == 0) {
             return '';
         }
 
@@ -1344,8 +1344,8 @@ 
         
         // reduce the path to the specified depth
         $length = count($tokens);
-        if($length > $depth) {
-            $tokens = array_slice($tokens, $length-$depth);
+        if ($length > $depth) {
+            $tokens = array_slice($tokens, $length - $depth);
         }
 
         // append the last element again
@@ -1393,14 +1393,14 @@ 
     * 
     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
     */
-    public static function requireFileExists(string $path, $errorCode=null) : string
+    public static function requireFileExists(string $path, $errorCode = null) : string
     {
         $result = realpath($path);
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
         
-        if($errorCode === null) {
+        if ($errorCode === null) {
             $errorCode = self::ERROR_FILE_DOES_NOT_EXIST;
         }
         
@@ -1429,15 +1429,15 @@ 
         
         $file = new \SplFileObject($path);
         
-        if($file->eof()) {
+        if ($file->eof()) {
             return '';
         }
         
-        $targetLine = $lineNumber-1;
+        $targetLine = $lineNumber - 1;
         
         $file->seek($targetLine);
         
-        if($file->key() !== $targetLine) {
+        if ($file->key() !== $targetLine) {
              return null;
         }
         
@@ -1463,7 +1463,7 @@ 
         $number = $spl->key();
         
         // if seeking to the end the cursor is still at 0, there are no lines. 
-        if($number === 0) 
+        if ($number === 0) 
         {
             // since it's a very small file, to get reliable results,
             // we read its contents and use that to determine what
@@ -1471,13 +1471,13 @@ 
             // that this is not pactical to solve with the SplFileObject.
             $content = file_get_contents($path);
             
-            if(empty($content)) {
+            if (empty($content)) {
                 return 0;
             }
         }
         
         // return the line number we were able to reach + 1 (key is zero-based)
-        return $number+1;
+        return $number + 1;
     }
     
    /**
@@ -1524,13 +1524,13 @@ 
     * @see FileHelper::ERROR_CANNOT_OPEN_FILE_TO_READ_LINES
     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
     */
-    public static function readLines(string $filePath, int $amount=0) : array
+    public static function readLines(string $filePath, int $amount = 0) : array
     {
         self::requireFileExists($filePath);
         
         $fn = fopen($filePath, "r");
         
-        if($fn === false) 
+        if ($fn === false) 
         {
             throw new FileHelper_Exception(
                 'Could not open file for reading.',
@@ -1546,25 +1546,25 @@ 
         $counter = 0;
         $first = true;
         
-        while(!feof($fn)) 
+        while (!feof($fn)) 
         {
             $counter++;
             
             $line = fgets($fn);
             
             // can happen with zero length files
-            if($line === false) {
+            if ($line === false) {
                 continue;
             }
             
             // the first line may contain a unicode BOM marker.
-            if($first) {
+            if ($first) {
                 $line = ConvertHelper::stripUTFBom($line);
             }
             
             $result[] = $line;
             
-            if($amount > 0 && $counter == $amount) {
+            if ($amount > 0 && $counter == $amount) {
                 break;
             }
         }
@@ -1590,7 +1590,7 @@ 
         
         $result = file_get_contents($filePath);
         
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }