Mistralys / application-utils

src/RequestHelper/Boundaries.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
     */
     public function render() : string
     {
-        if(empty($this->boundaries)) 
+        if (empty($this->boundaries)) 
         {
             throw new RequestHelper_Exception(
                 'No mime boundaries added',
@@ -150,13 +150,13 @@ 
         
         $result = '';
         
-        foreach($this->boundaries as $boundary)
+        foreach ($this->boundaries as $boundary)
         {
             $result .= $boundary->render();
         }
         
-        $result .= "--" . $this->getMimeBoundary() . "--" . 
-        $this->getEOL() . $this->getEOL(); // always finish with two eol's!!
+        $result .= "--".$this->getMimeBoundary()."--". 
+        $this->getEOL().$this->getEOL(); // always finish with two eol's!!
         
         return $result;
     }

src/URLInfo/Normalizer.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
     * @param bool $enable Whether to turn it on or off.
     * @return URLInfo_Normalizer
     */
-    public function enableAuth(bool $enable=true) : URLInfo_Normalizer
+    public function enableAuth(bool $enable = true) : URLInfo_Normalizer
     {
         $this->auth = $enable;
         return $this;
@@ -86,48 +86,48 @@ 
     
     protected function renderAuth(string $normalized) : string
     {
-        if(!$this->info->hasUsername() || !$this->auth) {
+        if (!$this->info->hasUsername() || !$this->auth) {
             return $normalized;
         }
          
-        return $normalized . urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@';
+        return $normalized.urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@';
     }
     
     protected function renderPort(string $normalized) : string
     {
-        if(!$this->info->hasPort()) {
+        if (!$this->info->hasPort()) {
             return $normalized;
         }
         
-        return $normalized . ':'.$this->info->getPort();
+        return $normalized.':'.$this->info->getPort();
     }
     
     protected function renderPath(string $normalized) : string
     {
-        if(!$this->info->hasPath()) {
+        if (!$this->info->hasPath()) {
             return $normalized; 
         }
         
-        return $normalized . $this->info->getPath();
+        return $normalized.$this->info->getPath();
     }
     
     protected function renderParams(string $normalized) : string
     {
         $params = $this->info->getParams();
         
-        if(empty($params)) {
+        if (empty($params)) {
             return $normalized;
         }
         
-        return $normalized . '?'.http_build_query($params);
+        return $normalized.'?'.http_build_query($params);
     }
     
     protected function renderFragment(string $normalized) : string
     {
-        if(!$this->info->hasFragment()) {
+        if (!$this->info->hasFragment()) {
             return $normalized;
         }
         
-        return $normalized . '#'.$this->info->getFragment();
+        return $normalized.'#'.$this->info->getFragment();
     }
 }

src/URLInfo.php

Spacing +25 added lines, -25 removed lines

@@ -200,7 +200,7 @@ 
     {
         $port = $this->getInfoKey('port');
         
-        if(!empty($port)) {
+        if (!empty($port)) {
             return (int)$port;
         }
         
@@ -280,7 +280,7 @@ 
     
     protected function getInfoKey(string $name) : string
     {
-        if(isset($this->info[$name])) {
+        if (isset($this->info[$name])) {
             return (string)$this->info[$name];
         }
         
@@ -309,13 +309,13 @@ 
         return $this->normalize(false);
     }
     
-    protected function normalize(bool $auth=true) : string
+    protected function normalize(bool $auth = true) : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
-        if(!isset($this->normalizer)) {
+        if (!isset($this->normalizer)) {
             $this->normalizer = new URLInfo_Normalizer($this);
         }
         
@@ -345,7 +345,7 @@ 
     */
     public function getHighlighted() : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
@@ -387,14 +387,14 @@ 
     */
     public function getParams() : array
     {
-        if(!$this->paramExclusion || empty($this->excludedParams)) {
+        if (!$this->paramExclusion || empty($this->excludedParams)) {
             return $this->info['params'];
         }
         
         $keep = array();
-        foreach($this->info['params'] as $name => $value) 
+        foreach ($this->info['params'] as $name => $value) 
         {
-            if(!isset($this->excludedParams[$name])) {
+            if (!isset($this->excludedParams[$name])) {
                 $keep[$name] = $value;
             }
         }
@@ -420,7 +420,7 @@ 
     */
     public function getParam(string $name) : string
     {
-        if(isset($this->info['params'][$name])) {
+        if (isset($this->info['params'][$name])) {
             return $this->info['params'][$name];
         }
         
@@ -439,7 +439,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();
@@ -465,7 +465,7 @@ 
     
     public function getTypeLabel() : string
     {
-        if(!isset(self::$typeLabels))
+        if (!isset(self::$typeLabels))
         {
             self::$typeLabels = array(
                 self::TYPE_EMAIL => t('Email'),
@@ -477,7 +477,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),
@@ -497,7 +497,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;
@@ -545,7 +545,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;
@@ -571,13 +571,13 @@ 
     */
     public function containsExcludedParams() : bool
     {
-        if(empty($this->excludedParams)) {
+        if (empty($this->excludedParams)) {
             return false;
         }
         
         $names = array_keys($this->info['params']);
-        foreach($names as $name) {
-            if(isset($this->excludedParams[$name])) {
+        foreach ($names as $name) {
+            if (isset($this->excludedParams[$name])) {
                 return true;
             }
         }
@@ -593,7 +593,7 @@ 
 
     public function offsetSet($offset, $value) 
     {
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             $this->info[$offset] = $value;
         }
     }
@@ -610,11 +610,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);
         }
         
@@ -646,12 +646,12 @@ 
     * @return bool
     * @throws BaseException
     */
-    public function tryConnect(bool $verifySSL=true) : bool
+    public function tryConnect(bool $verifySSL = true) : bool
     {
         requireCURL();
         
         $ch = curl_init();
-        if(!is_resource($ch))
+        if (!is_resource($ch))
         {
             throw new BaseException(
                 'Could not initialize a new cURL instance.',
@@ -667,13 +667,13 @@ 
         curl_setopt($ch, CURLOPT_TIMEOUT, 10);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
         
-        if(!$verifySSL) 
+        if (!$verifySSL) 
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         }
         
-        if($this->hasUsername()) 
+        if ($this->hasUsername()) 
         {
             curl_setopt($ch, CURLOPT_USERNAME, $this->getUsername());
             curl_setopt($ch, CURLOPT_PASSWORD, $this->getPassword());

src/RequestHelper.php

Spacing +7 added lines, -7 removed lines

@@ -210,7 +210,7 @@ 
         // CURL will complain about an empty response when the 
         // server sends a 100-continue code. That should not be
         // regarded as an error.
-        if($output === false && $this->response->getCode() !== 100)
+        if ($output === false && $this->response->getCode() !== 100)
         {
             $this->response->setError(
                 curl_errno($ch),
@@ -243,7 +243,7 @@ 
     protected function createCURL(URLInfo $url)
     {
         $ch = curl_init();
-        if(!is_resource($ch))
+        if (!is_resource($ch))
         {
             throw new RequestHelper_Exception(
                 'Could not initialize a new cURL instance.',
@@ -253,7 +253,7 @@ 
         }
 
         $this->setHeader('Content-Length', (string)$this->boundaries->getContentLength());
-        $this->setHeader('Content-Type', 'multipart/form-data; charset=UTF-8; boundary=' . $this->mimeBoundary);
+        $this->setHeader('Content-Type', 'multipart/form-data; charset=UTF-8; boundary='.$this->mimeBoundary);
         
         //curl_setopt($ch, CURLOPT_VERBOSE, true);
         curl_setopt($ch, CURLOPT_POST, true);
@@ -264,13 +264,13 @@ 
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($ch, CURLOPT_HTTPHEADER, $this->renderHeaders());
         
-        if($this->verifySSL)
+        if ($this->verifySSL)
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         }
         
-        if($url->hasUsername())
+        if ($url->hasUsername())
         {
             curl_setopt($ch, CURLOPT_USERNAME, $url->getUsername());
             curl_setopt($ch, CURLOPT_PASSWORD, $url->getPassword());
@@ -290,7 +290,7 @@ 
     {
         $result = array();
         
-        foreach($this->headers as $name => $value) {
+        foreach ($this->headers as $name => $value) {
             $result[] = $name.': '.$value;
         }
         
@@ -303,7 +303,7 @@ 
     */
     public function getResponseHeader() : array
     {
-        if(isset($this->response)) {
+        if (isset($this->response)) {
             return $this->response->getHeaders();
         }
 

src/ConvertHelper.php

Spacing +93 added lines, -93 removed lines

@@ -59,7 +59,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;
@@ -131,10 +131,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');
         }
 
@@ -142,7 +142,7 @@ 
         foreach ($units as $def) {
             $quot = intval($seconds / $def['value']);
             if ($quot) {
-                $item = $quot . ' ';
+                $item = $quot.' ';
                 if (abs($quot) > 1) {
                     $item .= $def['plural'];
                 } else {
@@ -159,7 +159,7 @@ 
             return $last;
         }
 
-        return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last;
+        return implode(', ', $tokens).' '.t('and').' '.$last;
     }
 
    /**
@@ -178,7 +178,7 @@ 
     {
          $converter = new ConvertHelper_DurationConverter();
          
-         if($datefrom instanceof \DateTime)
+         if ($datefrom instanceof \DateTime)
          {
              $converter->setDateFrom($datefrom);
          }
@@ -187,11 +187,11 @@ 
              $converter->setDateFrom(self::timestamp2date($datefrom)); 
          }
 
-         if($dateto instanceof \DateTime)
+         if ($dateto instanceof \DateTime)
          {
              $converter->setDateTo($dateto);
          }
-         else if($dateto > 0)
+         else if ($dateto > 0)
          {
              $converter->setDateTo(self::timestamp2date($dateto));
          }
@@ -211,9 +211,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);
@@ -280,16 +280,16 @@ 
             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) : string
+    public static function var_dump($var, $html = true) : string
     {
         $info = parseVariable($var);
         
-        if($html) {
+        if ($html) {
             return $info->toHTML();
         }
         
@@ -304,11 +304,11 @@ 
     * @param bool $html Whether to style the dump as HTML.
     * @return string
     */
-    public static function print_r($var, bool $return=false, bool $html=true) : string
+    public static function print_r($var, bool $return = false, bool $html = true) : string
     {
         $result = parseVariable($var)->enableType()->toString();
         
-        if($html) 
+        if ($html) 
         {
             $result = 
             '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'.
@@ -316,7 +316,7 @@ 
             '</pre>';
         }
         
-        if(!$return) 
+        if (!$return) 
         {
             echo $result;
         }
@@ -344,17 +344,17 @@ 
     */
     public static function string2bool($string) : bool
     {
-        if($string === '' || $string === null || !is_scalar($string)) 
+        if ($string === '' || $string === null || !is_scalar($string)) 
         {
             return false;
         }
         
-        if(is_bool($string)) 
+        if (is_bool($string)) 
         {
             return $string;
         }
 
-        if(array_key_exists($string, self::$booleanStrings)) 
+        if (array_key_exists($string, self::$booleanStrings)) 
         {
             return self::$booleanStrings[$string];
         }
@@ -409,10 +409,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');
             }
@@ -503,28 +503,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;
                 }
             }
@@ -545,7 +545,7 @@ 
         $chars = self::getControlCharactersAsHex();
         
         $result = array();
-        foreach($chars as $char) {
+        foreach ($chars as $char) {
             $result[] = hex2bin($char);
         }
         
@@ -563,14 +563,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
@@ -592,19 +592,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.'}';
             }
             
@@ -635,12 +635,12 @@ 
         $output = '';
         $split = str_split($unicodeChar);
         
-        foreach($split as $octet) 
+        foreach ($split as $octet) 
         {
             $ordInt = ord($octet);
             // Convert from int (base 10) to hex (base 16), for PHP \x syntax
             $ordHex = base_convert((string)$ordInt, 10, 16);
-            $output .= '\x' . $ordHex;
+            $output .= '\x'.$ordHex;
         }
         
         return $output;
@@ -673,19 +673,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,
@@ -734,7 +734,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);
         }
         
@@ -775,15 +775,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 '';
         }
         
@@ -798,10 +798,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."'";
         } 
         
@@ -819,11 +819,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;
         }
         
@@ -839,7 +839,7 @@ 
     public static function array2styleString(array $subject) : string
     {
         $tokens = array();
-        foreach($subject as $name => $value) {
+        foreach ($subject as $name => $value) {
             $tokens[] = $name.':'.$value;
         }
         
@@ -897,7 +897,7 @@ 
     * 
     * @see JSHelper::buildRegexStatement()
     */
-    public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT)
+    public static function regex2js(string $regex, string $statementType = JSHelper::JS_REGEX_OBJECT)
     {
         return JSHelper::buildRegexStatement($regex, $statementType);
     }
@@ -914,11 +914,11 @@ 
     * @throws ConvertHelper_Exception
     * @return string
     */
-    public static function var2json($variable, int $options=0, int $depth=512) : string
+    public static function var2json($variable, int $options = 0, int $depth = 512) : string
     {
         $result = json_encode($variable, $options, $depth);
         
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
         
@@ -943,10 +943,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);
             }
         }
@@ -963,7 +963,7 @@ 
     */
     public static function string2utf8($string)
     {
-        if(!self::isStringASCII($string)) {
+        if (!self::isStringASCII($string)) {
             return \ForceUTF8\Encoding::toUTF8($string);
         }
         
@@ -981,11 +981,11 @@ 
     */
     public static function isStringASCII($string) : bool
     {
-        if($string === '' || $string === NULL) {
+        if ($string === '' || $string === NULL) {
             return true;
         }
         
-        if(!is_string($string)) {
+        if (!is_string($string)) {
             return false;
         }
         
@@ -1019,7 +1019,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,
@@ -1029,12 +1029,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;
         }
         
@@ -1118,24 +1118,24 @@ 
     * @see ConvertHelper::INTERVAL_HOURS
     * @see ConvertHelper::INTERVAL_DAYS
     */
-    public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS) : int
+    public static function interval2total(\DateInterval $interval, $unit = self::INTERVAL_SECONDS) : int
     {
         $total = (int)$interval->format('%a');
         if ($unit == self::INTERVAL_DAYS) {
             return $total;
         }
         
-        $total = ($total * 24) + ((int)$interval->h );
+        $total = ($total * 24) + ((int)$interval->h);
         if ($unit == self::INTERVAL_HOURS) {
             return $total;
         }
     
-        $total = ($total * 60) + ((int)$interval->i );
+        $total = ($total * 60) + ((int)$interval->i);
         if ($unit == self::INTERVAL_MINUTES) {
             return $total;
         }
 
-        $total = ($total * 60) + ((int)$interval->s );
+        $total = ($total * 60) + ((int)$interval->s);
         if ($unit == self::INTERVAL_SECONDS) {
             return $total;
         }
@@ -1164,13 +1164,13 @@ 
     * @param bool $short
     * @return string|NULL
     */
-    public static function date2dayName(\DateTime $date, bool $short=false)
+    public static function date2dayName(\DateTime $date, bool $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];
         }
@@ -1193,10 +1193,10 @@ 
     * @param bool $short
     * @return array
     */
-    public static function getDayNames(bool $short=false) : array
+    public static function getDayNames(bool $short = false) : array
     {
-        if($short) {
-            if(!isset(self::$daysShort)) {
+        if ($short) {
+            if (!isset(self::$daysShort)) {
                 self::$daysShort = array(
                     t('Mon'),
                     t('Tue'),
@@ -1211,7 +1211,7 @@ 
             return self::$daysShort;
         }
         
-        if(!isset(self::$days)) {
+        if (!isset(self::$days)) {
             self::$days = array(
                 t('Monday'),
                 t('Tuesday'),
@@ -1236,17 +1236,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;
@@ -1265,7 +1265,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;
         }
         
@@ -1280,12 +1280,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;
         }
         
@@ -1394,14 +1394,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';
         }
         
@@ -1409,7 +1409,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);
@@ -1429,7 +1429,7 @@ 
     */
     public static function explodeTrim(string $delimiter, string $string) : array
     {
-        if(empty($string) || empty($delimiter)) {
+        if (empty($string) || empty($delimiter)) {
             return array();
         }
         
@@ -1437,8 +1437,8 @@ 
         $tokens = array_map('trim', $tokens);
         
         $keep = array();
-        foreach($tokens as $token) {
-            if($token !== '') {
+        foreach ($tokens as $token) {
+            if ($token !== '') {
                 $keep[] = $token;
             }
         }
@@ -1456,11 +1456,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'));
@@ -1491,18 +1491,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;
         }
         
@@ -1522,9 +1522,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]); 
             }
         }
@@ -1539,17 +1539,17 @@ 
     */
     public static function isInteger($value) : bool
     {
-        if(is_int($value)) {
+        if (is_int($value)) {
             return true;
         }
         
         // booleans get converted to numbers, so they would
         // actually match the regex.
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return false;
         }
         
-        if(is_string($value) && $value !== '') {
+        if (is_string($value) && $value !== '') {
             return preg_match('/\A-?\d+\z/', $value) === 1;
         }