Mistralys / application-utils

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)
     {
-        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;
             }
         }
@@ -756,7 +756,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']);
         }
 
@@ -903,7 +903,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/CSVHelper.php

Spacing +14 added lines, -14 removed lines

@@ -166,7 +166,7 @@ 
     
     public function isHeadersPosition($position)
     {
-        if($this->headersPosition === $position) {
+        if ($this->headersPosition === $position) {
             return true;
         }
         
@@ -193,7 +193,7 @@ 
             self::HEADERS_TOP
         );
         
-        if(!in_array($position, $validPositions)) {
+        if (!in_array($position, $validPositions)) {
             throw new CSVHelper_Exception(
                 'Invalid headers position',
                 sprintf(
@@ -249,7 +249,7 @@ 
     */
     public function getRow($index)
     {
-        if(isset($this->data[$index])) {
+        if (isset($this->data[$index])) {
             return $this->data[$index];
         }
         
@@ -316,9 +316,9 @@ 
     public function getColumn($index)
     {
         $data = array();
-        for($i=0; $i < $this->rowCount; $i++) {
+        for ($i = 0; $i < $this->rowCount; $i++) {
             $value = '';
-            if(isset($this->data[$i][$index])) {
+            if (isset($this->data[$i][$index])) {
                 $value = $this->data[$i][$index];
             }
             
@@ -335,7 +335,7 @@ 
     */
     public function columnExists($index)
     {
-        if($index < $this->columnCount) {
+        if ($index < $this->columnCount) {
             return true;
         }
         
@@ -346,7 +346,7 @@ 
     {
         $this->reset();
         
-        if(empty(trim($this->csv))) {
+        if (empty(trim($this->csv))) {
             $this->addError('Tried to parse an empty CSV string.');
             return;
         }
@@ -361,12 +361,12 @@ 
         $parser->delimiter = $this->detectSeparator();
         
         $result = $parser->parse_string(/** @scrutinizer ignore-type */ $this->csv);
-        if(!$result) {
+        if (!$result) {
             $this->addError('The CSV string could not be parsed.');
             return;
         }
         
-        switch($this->headersPosition)
+        switch ($this->headersPosition)
         {
             case self::HEADERS_TOP:
                 $this->headers = array_shift($result);
@@ -375,7 +375,7 @@ 
             case self::HEADERS_LEFT:
                 $keep = array();
                 $total = count($result);
-                for($i=0; $i < $total; $i++) {
+                for ($i = 0; $i < $total; $i++) {
                     $row = $result[$i];
                     $this->headers[] = array_shift($row);
                     $keep[] = $row;
@@ -388,9 +388,9 @@ 
         $this->data = $result;
         $this->rowCount = count($this->data);
         
-        for($i=0; $i < $this->rowCount; $i++) {
+        for ($i = 0; $i < $this->rowCount; $i++) {
             $amount = count($this->data[$i]);
-            if($amount > $this->columnCount) {
+            if ($amount > $this->columnCount) {
                 $this->columnCount = $amount;
             }
         }
@@ -434,8 +434,8 @@ 
             ',,' => ','
         );
         
-        foreach($search as $char => $separator) {
-            if(strstr($this->csv, $char)) {
+        foreach ($search as $char => $separator) {
+            if (strstr($this->csv, $char)) {
                 return $separator;
             }
         }

src/ConvertHelper.php

Spacing +115 added lines, -115 removed lines

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

src/PaginationHelper.php

Spacing +14 added lines, -14 removed lines

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

src/Request.php

Spacing +36 added lines, -36 removed lines

@@ -74,11 +74,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);
         }
         
@@ -121,8 +121,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;
 
@@ -142,8 +142,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;
             }
@@ -170,13 +170,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(APP_URL, '/') . '/' . $dispatcher;
+        $url = rtrim(APP_URL, '/').'/'.$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;
@@ -192,7 +192,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;
         }
@@ -209,7 +209,7 @@ 
     */
     public function getRegisteredParam(string $name) : Request_Param
     {
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             return $this->knownParams[$name];
         }
         
@@ -276,12 +276,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'];
                     }
                 }
@@ -334,7 +334,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -368,11 +368,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]);
         }
         
@@ -387,7 +387,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -403,10 +403,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);
         }
         
@@ -415,9 +415,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(
@@ -439,10 +439,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');
         }
         
@@ -461,24 +461,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();
         }
         
@@ -495,7 +495,7 @@ 
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -512,7 +512,7 @@ 
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
-        if(is_object($result)) {
+        if (is_object($result)) {
             return $result;
         }
         
@@ -525,10 +525,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);
         }
         
@@ -538,7 +538,7 @@ 
         
         echo $payload;
         
-        if($exit) 
+        if ($exit) 
         {
             exit;
         }
@@ -550,7 +550,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');
@@ -558,7 +558,7 @@ 
         
         echo $html;
         
-        if($exit)
+        if ($exit)
         {
             exit;
         }
@@ -574,7 +574,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/ConvertHelper/ThrowableInfo.php

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
     
     protected function __construct($subject)
     {
-        if(is_array($subject))
+        if (is_array($subject))
         {
             $this->parseSerialized($subject);
         }
@@ -115,7 +115,7 @@ 
     */
     public function getPrevious() : ConvertHelper_ThrowableInfo
     {
-        if(isset($this->previous)) {
+        if (isset($this->previous)) {
             return $this->previous;
         }
         
@@ -140,18 +140,18 @@ 
         
         $string = 'Exception';
         
-        if($this->hasCode()) {
+        if ($this->hasCode()) {
             $string .= ' #'.$this->code;
         }
         
         $string .= ': '.$this->getMessage().PHP_EOL;
         
-        foreach($calls as $call) 
+        foreach ($calls as $call) 
         {
             $string .= $call->toString().PHP_EOL;
         }
         
-        if($this->hasPrevious())
+        if ($this->hasPrevious())
         {
             $string .= PHP_EOL.PHP_EOL.
             'Previous error:'.PHP_EOL.PHP_EOL.
@@ -242,11 +242,11 @@ 
             'previous' => null,
         );
         
-        if($this->hasPrevious()) {
-            $result['previous'] =  $this->previous->serialize();
+        if ($this->hasPrevious()) {
+            $result['previous'] = $this->previous->serialize();
         }
         
-        foreach($this->calls as $call)
+        foreach ($this->calls as $call)
         {
             $result['calls'][] = $call->serialize(); 
         }
@@ -275,7 +275,7 @@ 
     public function getFolderDepth() : int
     {
         $depth = $this->getOption('folder-depth');
-        if(!empty($depth)) {
+        if (!empty($depth)) {
             return $depth;
         }
         
@@ -311,12 +311,12 @@ 
         
         $this->setOptions($serialized['options']);
         
-        if(!empty($serialized['previous']))
+        if (!empty($serialized['previous']))
         {
             $this->previous = ConvertHelper_ThrowableInfo::fromSerialized($serialized['previous']);
         }
         
-        foreach($serialized['calls'] as $def)
+        foreach ($serialized['calls'] as $def)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromSerialized($this, $def);
         }
@@ -328,16 +328,16 @@ 
         $this->message = $e->getMessage();
         $this->code = intval($e->getCode());
         
-        if(!isset($_REQUEST) || !isset($_REQUEST['REQUEST_URI'])) {
+        if (!isset($_REQUEST) || !isset($_REQUEST['REQUEST_URI'])) {
             $this->context = self::CONTEXT_COMMAND_LINE;
         }
         
         $previous = $e->getPrevious();
-        if(!empty($previous)) {
+        if (!empty($previous)) {
             $this->previous = ConvertHelper::throwable2info($previous);
         }
         
-        if(isset($_SERVER) && isset($_SERVER['REQUEST_URI'])) {
+        if (isset($_SERVER) && isset($_SERVER['REQUEST_URI'])) {
             $this->referer = $_SERVER['REQUEST_URI'];
         }
         
@@ -351,7 +351,7 @@ 
         
         $idx = 1;
         
-        foreach($trace as $entry)
+        foreach ($trace as $entry)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromTrace($this, $idx, $entry);
             

src/VariableInfo.php

Spacing +11 added lines, -11 removed lines

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

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