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

Spacing +61 added lines, -61 removed lines

@@ -154,26 +154,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')
@@ -182,10 +182,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;
@@ -195,17 +195,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);
@@ -250,30 +250,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;
@@ -285,7 +285,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;
         }
@@ -295,7 +295,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;
         }
@@ -309,7 +309,7 @@ 
      */
     public function isSecure()
     {
-        if(isset($this->info['scheme']) && $this->info['scheme']=='https') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'https') {
             return true;
         }
         
@@ -384,7 +384,7 @@ 
     public function getPort() : int
     {
         $port = $this->getInfoKey('port');
-        if(!empty($port)) {
+        if (!empty($port)) {
             return (int)$port;
         }
         
@@ -464,7 +464,7 @@ 
     
     protected function getInfoKey(string $name) : string
     {
-        if(isset($this->info[$name])) {
+        if (isset($this->info[$name])) {
             return (string)$this->info[$name];
         }
         
@@ -473,34 +473,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'];
         }
         
@@ -528,11 +528,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>',
@@ -540,7 +540,7 @@ 
             );
         }
         
-        if($this->isFragment) {
+        if ($this->isFragment) {
             return sprintf(
                 '<span class="link-fragment-sign">#</span>'.
                 '<span class="link-fragment-value">%s</span>',
@@ -550,7 +550,7 @@ 
         
         $result = '';
         
-        if($this->hasScheme())
+        if ($this->hasScheme())
         {
             $result = sprintf(
                 '<span class="link-scheme scheme-%1$s">'.
@@ -562,7 +562,7 @@ 
 
         $result .= '<span class="link-component double-slashes">//</span>';
         
-        if($this->hasUsername())
+        if ($this->hasUsername())
         {
             $result .= sprintf(
                 '<span class="link-credentials">%s</span>'.
@@ -574,7 +574,7 @@ 
             );
         }
         
-        if($this->hasHost()) 
+        if ($this->hasHost()) 
         {
             $result .=
             sprintf(
@@ -583,7 +583,7 @@ 
             );
         }
         
-        if($this->hasPort()) 
+        if ($this->hasPort()) 
         {
             $result .= sprintf(
                 '<span class="link-component port-separator">:</span>'.
@@ -592,7 +592,7 @@ 
             );
         }
         
-        if($this->hasPath()) 
+        if ($this->hasPath()) 
         {
             $path = str_replace(array(';', '='), array(';<wbr>', '=<wbr>'), $this->getPath());
             $tokens = explode('/', $path);
@@ -603,11 +603,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>'.
@@ -625,10 +625,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];
                         
@@ -658,7 +658,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>',
@@ -681,7 +681,7 @@ 
     
     public function getErrorMessage() : string
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['message'];
         }
         
@@ -690,7 +690,7 @@ 
     
     public function getErrorCode() : int
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['code'];
         }
         
@@ -720,13 +720,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;
             }
         }
@@ -756,7 +756,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();
@@ -777,15 +777,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;
         }
         
@@ -794,7 +794,7 @@ 
     
     public function getTypeLabel() : string
     {
-        if(!isset(self::$typeLabels))
+        if (!isset(self::$typeLabels))
         {
             self::$typeLabels = array(
                 self::TYPE_EMAIL => t('Email'),
@@ -806,7 +806,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),
@@ -826,7 +826,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;
@@ -874,7 +874,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;
@@ -900,13 +900,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;
             }
         }
@@ -922,7 +922,7 @@ 
 
     public function offsetSet($offset, $value) 
     {
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             $this->info[$offset] = $value;
         }
     }
@@ -939,11 +939,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);
         }
         
@@ -954,7 +954,7 @@ 
     {
         $cssFolder = realpath(__DIR__.'/../css');
         
-        if($cssFolder === false) {
+        if ($cssFolder === false) {
             throw new BaseException(
                 'Cannot find package CSS folder.',
                 null,

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