voku / portable-utf8

src/voku/helper/Bootup.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace voku\helper;
 
@@ -97,7 +97,7 @@ 
 
     $uri = (string)\preg_replace_callback(
         '/[\x80-\xFF]+/',
-        function ($m) {
+        function($m) {
           return \rawurlencode($m[0]);
         },
         $uri
@@ -105,7 +105,7 @@ 
 
     $uri = (string)\preg_replace_callback(
         '/(?:%[89A-F][0-9A-F])+/i',
-        function ($m) {
+        function($m) {
           return \rawurlencode(UTF8::rawurldecode($m[0]));
         },
         $uri
@@ -120,8 +120,8 @@ 
     ) {
       // Use ob_start() to buffer content and avoid problem of headers already sent...
       $severProtocol = ($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1');
-      \header($severProtocol . ' 301 Moved Permanently');
-      \header('Location: ' . $uri);
+      \header($severProtocol.' 301 Moved Permanently');
+      \header('Location: '.$uri);
       exit();
     }
 

src/voku/helper/UTF8.php

Spacing +78 added lines, -80 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace voku\helper;
 
@@ -243,7 +243,7 @@ 
   public static function add_bom_to_string(string $str): string
   {
     if (self::string_has_bom($str) === false) {
-      $str = self::bom() . $str;
+      $str = self::bom().$str;
     }
 
     return $str;
@@ -364,10 +364,10 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::chr() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::chr() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
-    $cacheKey = $code_point . $encoding;
+    $cacheKey = $code_point.$encoding;
     if (isset($CHAR_CACHE[$cacheKey]) === true) {
       return $CHAR_CACHE[$cacheKey];
     }
@@ -404,16 +404,16 @@ 
     if ($code_point <= 0x7F) {
       $chr = self::$CHR[$code_point];
     } elseif ($code_point <= 0x7FF) {
-      $chr = self::$CHR[($code_point >> 6) + 0xC0] .
+      $chr = self::$CHR[($code_point >> 6) + 0xC0].
              self::$CHR[($code_point & 0x3F) + 0x80];
     } elseif ($code_point <= 0xFFFF) {
-      $chr = self::$CHR[($code_point >> 12) + 0xE0] .
-             self::$CHR[(($code_point >> 6) & 0x3F) + 0x80] .
+      $chr = self::$CHR[($code_point >> 12) + 0xE0].
+             self::$CHR[(($code_point >> 6) & 0x3F) + 0x80].
              self::$CHR[($code_point & 0x3F) + 0x80];
     } else {
-      $chr = self::$CHR[($code_point >> 18) + 0xF0] .
-             self::$CHR[(($code_point >> 12) & 0x3F) + 0x80] .
-             self::$CHR[(($code_point >> 6) & 0x3F) + 0x80] .
+      $chr = self::$CHR[($code_point >> 18) + 0xF0].
+             self::$CHR[(($code_point >> 12) & 0x3F) + 0x80].
+             self::$CHR[(($code_point >> 6) & 0x3F) + 0x80].
              self::$CHR[($code_point & 0x3F) + 0x80];
     }
 
@@ -458,7 +458,7 @@ 
     }
 
     return \array_map(
-        function ($data) {
+        function($data) {
           return UTF8::strlen($data, '8BIT');
         },
         self::split($str)
@@ -689,7 +689,7 @@ 
    */
   public static function decimal_to_chr($int): string
   {
-    return self::html_entity_decode('&#' . $int . ';', ENT_QUOTES | ENT_HTML5);
+    return self::html_entity_decode('&#'.$int.';', ENT_QUOTES | ENT_HTML5);
   }
 
   /**
@@ -764,7 +764,7 @@ 
           &&
           self::$SUPPORT['mbstring'] === false
       ) {
-        \trigger_error('UTF8::encode() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+        \trigger_error('UTF8::encode() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
       }
 
       $strEncoded = \mb_convert_encoding(
@@ -922,7 +922,7 @@ 
           ) {
             // Prevent leading combining chars
             // for NFC-safe concatenations.
-            $var = $leading_combining . $var;
+            $var = $leading_combining.$var;
           }
         }
 
@@ -1344,7 +1344,7 @@ 
    */
   private static function getData(string $file)
   {
-    $file = __DIR__ . '/data/' . $file . '.php';
+    $file = __DIR__.'/data/'.$file.'.php';
     if (\file_exists($file)) {
       /** @noinspection PhpIncludeInspection */
       return require $file;
@@ -1484,7 +1484,7 @@ 
     return \implode(
         '',
         \array_map(
-            function ($data) use ($keepAsciiChars, $encoding) {
+            function($data) use ($keepAsciiChars, $encoding) {
               return UTF8::single_chr_html_encode($data, $keepAsciiChars, $encoding);
             },
             self::split($str)
@@ -1598,7 +1598,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::html_entity_decode() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::html_entity_decode() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     do {
@@ -1606,7 +1606,7 @@ 
 
       $str = (string)\preg_replace_callback(
           "/&#\d{2,6};/",
-          function ($matches) use ($encoding) {
+          function($matches) use ($encoding) {
             $returnTmp = \mb_convert_encoding($matches[0], $encoding, 'HTML-ENTITIES');
 
             if ($returnTmp !== '"' && $returnTmp !== "'") {
@@ -1928,9 +1928,9 @@ 
   {
     $hex = \dechex($int);
 
-    $hex = (\strlen($hex) < 4 ? \substr('0000' . $hex, -4) : $hex);
+    $hex = (\strlen($hex) < 4 ? \substr('0000'.$hex, -4) : $hex);
 
-    return $pfix . $hex;
+    return $pfix.$hex;
   }
 
   /**
@@ -2637,7 +2637,7 @@ 
         $cleanUtf8
     );
 
-    return $strPartOne . $strPartTwo;
+    return $strPartOne.$strPartTwo;
   }
 
   /**
@@ -2725,7 +2725,7 @@ 
       return \preg_replace('/^[\pZ\pC]+/u', '', $str);
     }
 
-    return \preg_replace('/^' . self::rxClass($chars) . '+/u', '', $str);
+    return \preg_replace('/^'.self::rxClass($chars).'+/u', '', $str);
   }
 
   /**
@@ -3058,7 +3058,7 @@ 
       }
     }
 
-    $cacheKey = $chr_orig . $encoding;
+    $cacheKey = $chr_orig.$encoding;
     if (isset($CHAR_CACHE[$cacheKey]) === true) {
       return $CHAR_CACHE[$cacheKey];
     }
@@ -3285,7 +3285,7 @@ 
     if (\is_array($what) === true) {
       /** @noinspection ForeachSourceInspection */
       foreach ($what as $item) {
-        $str = (string)\preg_replace('/(' . \preg_quote($item, '/') . ')+/', $item, $str);
+        $str = (string)\preg_replace('/('.\preg_quote($item, '/').')+/', $item, $str);
       }
     }
 
@@ -3395,7 +3395,7 @@ 
       return \preg_replace('/[\pZ\pC]+$/u', '', $str);
     }
 
-    return \preg_replace('/' . self::rxClass($chars) . '+$/u', '', $str);
+    return \preg_replace('/'.self::rxClass($chars).'+$/u', '', $str);
   }
 
   /**
@@ -3410,7 +3410,7 @@ 
   {
     static $RX_CLASSS_CACHE = [];
 
-    $cacheKey = $s . $class;
+    $cacheKey = $s.$class;
 
     if (isset($RX_CLASSS_CACHE[$cacheKey])) {
       return $RX_CLASSS_CACHE[$cacheKey];
@@ -3422,7 +3422,7 @@ 
     /** @noinspection SuspiciousLoopInspection */
     foreach (self::str_split($s) as $s) {
       if ('-' === $s) {
-        $class[0] = '-' . $class[0];
+        $class[0] = '-'.$class[0];
       } elseif (!isset($s[2])) {
         $class[0] .= \preg_quote($s, '/');
       } elseif (1 === self::strlen($s)) {
@@ -3433,13 +3433,13 @@ 
     }
 
     if ($class[0]) {
-      $class[0] = '[' . $class[0] . ']';
+      $class[0] = '['.$class[0].']';
     }
 
     if (1 === \count($class)) {
       $return = $class[0];
     } else {
-      $return = '(?:' . \implode('|', $class) . ')';
+      $return = '(?:'.\implode('|', $class).')';
     }
 
     $RX_CLASSS_CACHE[$cacheKey] = $return;
@@ -3458,7 +3458,7 @@ 
 
     echo '<pre>';
     foreach (self::$SUPPORT as $key => $value) {
-      echo $key . ' - ' . \print_r($value, true) . "\n<br>";
+      echo $key.' - '.\print_r($value, true)."\n<br>";
     }
     echo '</pre>';
   }
@@ -3490,7 +3490,7 @@ 
       $encoding = self::normalize_encoding($encoding, 'UTF-8');
     }
 
-    return '&#' . self::ord($char, $encoding) . ';';
+    return '&#'.self::ord($char, $encoding).';';
   }
 
   /**
@@ -3551,7 +3551,7 @@ 
         ) {
 
           if (($str[$i + 1] & "\xC0") === "\x80") {
-            $ret[] = $str[$i] . $str[$i + 1];
+            $ret[] = $str[$i].$str[$i + 1];
 
             $i++;
           }
@@ -3567,7 +3567,7 @@ 
               &&
               ($str[$i + 2] & "\xC0") === "\x80"
           ) {
-            $ret[] = $str[$i] . $str[$i + 1] . $str[$i + 2];
+            $ret[] = $str[$i].$str[$i + 1].$str[$i + 2];
 
             $i += 2;
           }
@@ -3585,7 +3585,7 @@ 
               &&
               ($str[$i + 3] & "\xC0") === "\x80"
           ) {
-            $ret[] = $str[$i] . $str[$i + 1] . $str[$i + 2] . $str[$i + 3];
+            $ret[] = $str[$i].$str[$i + 1].$str[$i + 2].$str[$i + 3];
 
             $i += 3;
           }
@@ -3598,7 +3598,7 @@ 
       $ret = \array_chunk($ret, $length);
 
       return \array_map(
-          function ($item) {
+          function($item) {
             return \implode('', $item);
           }, $ret
       );
@@ -3708,7 +3708,7 @@ 
     foreach (self::$ENCODINGS as $encodingTmp) {
       # INFO: //IGNORE and //TRANSLIT still throw notice
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
-      if (\md5(@\iconv($encodingTmp, $encodingTmp . '//IGNORE', $str)) === $md5) {
+      if (\md5(@\iconv($encodingTmp, $encodingTmp.'//IGNORE', $str)) === $md5) {
         return $encodingTmp;
       }
     }
@@ -3792,7 +3792,7 @@ 
       if ('' === $s .= '') {
         $s = '/^(?<=.)$/';
       } else {
-        $s = '/' . \preg_quote($s, '/') . '/ui';
+        $s = '/'.\preg_quote($s, '/').'/ui';
       }
     }
 
@@ -3843,7 +3843,7 @@ 
     }
 
     if (self::substr($str, $length - 1, 1) === ' ') {
-      return (string)self::substr($str, 0, $length - 1) . $strAddOn;
+      return (string)self::substr($str, 0, $length - 1).$strAddOn;
     }
 
     $str = (string)self::substr($str, 0, $length);
@@ -3852,9 +3852,9 @@ 
     $new_str = \implode(' ', $array);
 
     if ($new_str === '') {
-      $str = (string)self::substr($str, 0, $length - 1) . $strAddOn;
+      $str = (string)self::substr($str, 0, $length - 1).$strAddOn;
     } else {
-      $str = $new_str . $strAddOn;
+      $str = $new_str.$strAddOn;
     }
 
     return $str;
@@ -3909,7 +3909,7 @@ 
           $pre = '';
       }
 
-      return $pre . $str . $post;
+      return $pre.$str.$post;
     }
 
     return $str;
@@ -3969,7 +3969,7 @@ 
    *
    * @return mixed <p>This function returns a string or an array with the replaced values.</p>
    */
-  public static function str_replace($search, $replace, $subject, int &$count = null)
+  public static function str_replace($search, $replace, $subject, int & $count = null)
   {
     return \str_replace($search, $replace, $subject, $count);
   }
@@ -4063,7 +4063,7 @@ 
     }
 
     /** @noinspection PhpInternalEntityUsedInspection */
-    \preg_match_all('/' . self::GRAPHEME_CLUSTER_RX . '/u', $str, $a);
+    \preg_match_all('/'.self::GRAPHEME_CLUSTER_RX.'/u', $str, $a);
     $a = $a[0];
 
     if ($len === 1) {
@@ -4288,7 +4288,7 @@ 
   public static function strcmp(string $str1, string $str2): int
   {
     /** @noinspection PhpUndefinedClassInspection */
-    return $str1 . '' === $str2 . '' ? 0 : \strcmp(
+    return $str1.'' === $str2.'' ? 0 : \strcmp(
         \Normalizer::normalize($str1, \Normalizer::NFD),
         \Normalizer::normalize($str2, \Normalizer::NFD)
     );
@@ -4322,7 +4322,7 @@ 
       return null;
     }
 
-    if (\preg_match('/^(.*?)' . self::rxClass($charList) . '/us', $str, $length)) {
+    if (\preg_match('/^(.*?)'.self::rxClass($charList).'/us', $str, $length)) {
       return self::strlen($length[1]);
     }
 
@@ -4514,7 +4514,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::stristr() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::stristr() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$SUPPORT['mbstring'] === true) {
@@ -4533,7 +4533,7 @@ 
       return \stristr($haystack, $needle, $before_needle);
     }
 
-    \preg_match('/^(.*?)' . \preg_quote($needle, '/') . '/usi', $haystack, $match);
+    \preg_match('/^(.*?)'.\preg_quote($needle, '/').'/usi', $haystack, $match);
 
     if (!isset($match[1])) {
       return false;
@@ -4600,7 +4600,7 @@ 
         &&
         self::$SUPPORT['iconv'] === false
     ) {
-      \trigger_error('UTF8::strlen() without mbstring / iconv cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::strlen() without mbstring / iconv cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (
@@ -4704,7 +4704,7 @@ 
    */
   public static function strnatcmp(string $str1, string $str2): int
   {
-    return $str1 . '' === $str2 . '' ? 0 : \strnatcmp(self::strtonatfold($str1), self::strtonatfold($str2));
+    return $str1.'' === $str2.'' ? 0 : \strnatcmp(self::strtonatfold($str1), self::strtonatfold($str2));
   }
 
   /**
@@ -4762,7 +4762,7 @@ 
       return false;
     }
 
-    if (\preg_match('/' . self::rxClass($char_list) . '/us', $haystack, $m)) {
+    if (\preg_match('/'.self::rxClass($char_list).'/us', $haystack, $m)) {
       return \substr($haystack, \strpos($haystack, $m[0]));
     }
 
@@ -4826,7 +4826,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::strpos() without mbstring / iconv cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::strpos() without mbstring / iconv cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (
@@ -5047,7 +5047,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::strripos() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::strripos() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$SUPPORT['mbstring'] === true) {
@@ -5118,7 +5118,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::strrpos() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::strrpos() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$SUPPORT['mbstring'] === true) {
@@ -5183,7 +5183,7 @@ 
       return 0;
     }
 
-    return \preg_match('/^' . self::rxClass($mask) . '+/u', $str, $str) ? self::strlen($str[0]) : 0;
+    return \preg_match('/^'.self::rxClass($mask).'+/u', $str, $str) ? self::strlen($str[0]) : 0;
   }
 
   /**
@@ -5226,7 +5226,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::strstr() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::strstr() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$SUPPORT['mbstring'] === true) {
@@ -5241,7 +5241,7 @@ 
       return \grapheme_strstr($haystack, $needle, $before_needle);
     }
 
-    \preg_match('/^(.*?)' . \preg_quote($needle, '/') . '/us', $haystack, $match);
+    \preg_match('/^(.*?)'.\preg_quote($needle, '/').'/us', $haystack, $match);
 
     if (!isset($match[1])) {
       return false;
@@ -5338,9 +5338,9 @@ 
 
       if (self::$SUPPORT['intl'] === true) {
 
-        $langCode = $lang . '-Lower';
+        $langCode = $lang.'-Lower';
         if (!\in_array($langCode, self::$SUPPORT['intl__transliterator_list_ids'], true)) {
-          \trigger_error('UTF8::strtolower() without intl for special language: ' . $lang, E_USER_WARNING);
+          \trigger_error('UTF8::strtolower() without intl for special language: '.$lang, E_USER_WARNING);
 
           $langCode = 'Any-Lower';
         }
@@ -5348,7 +5348,7 @@ 
         return transliterator_transliterate($langCode, $str);
       }
 
-      \trigger_error('UTF8::strtolower() without intl + PHP >= 5.4 cannot handle the "lang"-parameter: ' . $lang, E_USER_WARNING);
+      \trigger_error('UTF8::strtolower() without intl + PHP >= 5.4 cannot handle the "lang"-parameter: '.$lang, E_USER_WARNING);
     }
 
     return \mb_strtolower($str, $encoding);
@@ -5403,9 +5403,9 @@ 
 
       if (self::$SUPPORT['intl'] === true) {
 
-        $langCode = $lang . '-Upper';
+        $langCode = $lang.'-Upper';
         if (!\in_array($langCode, self::$SUPPORT['intl__transliterator_list_ids'], true)) {
-          \trigger_error('UTF8::strtoupper() without intl for special language: ' . $lang, E_USER_WARNING);
+          \trigger_error('UTF8::strtoupper() without intl for special language: '.$lang, E_USER_WARNING);
 
           $langCode = 'Any-Upper';
         }
@@ -5413,7 +5413,7 @@ 
         return transliterator_transliterate($langCode, $str);
       }
 
-      \trigger_error('UTF8::strtolower() without intl + PHP >= 5.4 cannot handle the "lang"-parameter: ' . $lang, E_USER_WARNING);
+      \trigger_error('UTF8::strtolower() without intl + PHP >= 5.4 cannot handle the "lang"-parameter: '.$lang, E_USER_WARNING);
     }
 
     return \mb_strtoupper($str, $encoding);
@@ -5597,7 +5597,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::substr() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::substr() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$SUPPORT['mbstring'] === true) {
@@ -5625,8 +5625,7 @@ 
 
     if (self::is_ascii($str)) {
       return ($length === null) ?
-          \substr($str, $offset) :
-          \substr($str, $offset, $length);
+          \substr($str, $offset) : \substr($str, $offset, $length);
     }
 
     // fallback via vanilla php
@@ -5754,14 +5753,14 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::substr_count() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::substr_count() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$SUPPORT['mbstring'] === true) {
       return \mb_substr_count($haystack, $needle, $encoding);
     }
 
-    \preg_match_all('/' . \preg_quote($needle, '/') . '/us', $haystack, $matches, PREG_SET_ORDER);
+    \preg_match_all('/'.\preg_quote($needle, '/').'/us', $haystack, $matches, PREG_SET_ORDER);
 
     return \count($matches);
   }
@@ -5939,8 +5938,7 @@ 
 
     if (self::is_ascii($str)) {
       return ($length === null) ?
-          \substr_replace($str, $replacement, $offset) :
-          \substr_replace($str, $replacement, $offset, $length);
+          \substr_replace($str, $replacement, $offset) : \substr_replace($str, $replacement, $offset, $length);
     }
 
     \preg_match_all('/./us', $str, $smatches);
@@ -6011,7 +6009,7 @@ 
 
     $strSwappedCase = \preg_replace_callback(
         '/[\S]/u',
-        function ($match) use ($encoding) {
+        function($match) use ($encoding) {
           $marchToUpper = UTF8::strtoupper($match[0], $encoding);
 
           if ($match[0] === $marchToUpper) {
@@ -6337,7 +6335,7 @@ 
           $c2 = $i + 1 >= $max ? "\x00" : $str[$i + 1];
 
           if ($c2 >= "\x80" && $c2 <= "\xBF") { // yeah, almost sure it's UTF8 already
-            $buf .= $c1 . $c2;
+            $buf .= $c1.$c2;
             $i++;
           } else { // not valid UTF8 - convert it
             $buf .= self::to_utf8_convert($c1);
@@ -6349,7 +6347,7 @@ 
           $c3 = $i + 2 >= $max ? "\x00" : $str[$i + 2];
 
           if ($c2 >= "\x80" && $c2 <= "\xBF" && $c3 >= "\x80" && $c3 <= "\xBF") { // yeah, almost sure it's UTF8 already
-            $buf .= $c1 . $c2 . $c3;
+            $buf .= $c1.$c2.$c3;
             $i += 2;
           } else { // not valid UTF8 - convert it
             $buf .= self::to_utf8_convert($c1);
@@ -6362,7 +6360,7 @@ 
           $c4 = $i + 3 >= $max ? "\x00" : $str[$i + 3];
 
           if ($c2 >= "\x80" && $c2 <= "\xBF" && $c3 >= "\x80" && $c3 <= "\xBF" && $c4 >= "\x80" && $c4 <= "\xBF") { // yeah, almost sure it's UTF8 already
-            $buf .= $c1 . $c2 . $c3 . $c4;
+            $buf .= $c1.$c2.$c3.$c4;
             $i += 3;
           } else { // not valid UTF8 - convert it
             $buf .= self::to_utf8_convert($c1);
@@ -6384,7 +6382,7 @@ 
     // decode unicode escape sequences
     $buf = \preg_replace_callback(
         '/\\\\u([0-9a-f]{4})/i',
-        function ($match) {
+        function($match) {
           return \mb_convert_encoding(pack('H*', $match[1]), 'UTF-8', 'UCS-2BE');
         },
         $buf
@@ -6426,7 +6424,7 @@ 
     } else {
       $cc1 = self::$CHR[$ordC1 / 64] | "\xC0";
       $cc2 = ($int & "\x3F") | "\x80";
-      $buf .= $cc1 . $cc2;
+      $buf .= $cc1.$cc2;
     }
 
     return $buf;
@@ -6487,7 +6485,7 @@ 
         $cleanUtf8
     );
 
-    return $strPartOne . $strPartTwo;
+    return $strPartOne.$strPartTwo;
   }
 
   /**
@@ -6532,7 +6530,7 @@ 
       $str = self::clean($str);
     }
 
-    $usePhpDefaultFunctions = !(bool)($charlist . \implode('', $exceptions));
+    $usePhpDefaultFunctions = !(bool)($charlist.\implode('', $exceptions));
 
     if (
         $usePhpDefaultFunctions === true
@@ -7034,7 +7032,7 @@ 
       return '';
     }
 
-    \preg_match('/^\s*+(?:\S++\s*+){1,' . $limit . '}/u', $str, $matches);
+    \preg_match('/^\s*+(?:\S++\s*+){1,'.$limit.'}/u', $str, $matches);
 
     if (
         !isset($matches[0])
@@ -7044,7 +7042,7 @@ 
       return $str;
     }
 
-    return self::rtrim($matches[0]) . $strAddOn;
+    return self::rtrim($matches[0]).$strAddOn;
   }
 
   /**
@@ -7109,7 +7107,7 @@ 
       $strReturn .= $break;
     }
 
-    return $strReturn . \implode('', $chars);
+    return $strReturn.\implode('', $chars);
   }
 
   /**