voku / portable-utf8

src/voku/helper/UTF8.php

Spacing +128 added lines, -129 removed lines

@@ -264,7 +264,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;
@@ -531,10 +531,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];
     }
@@ -579,16 +579,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];
     }
 
@@ -640,7 +640,7 @@ 
 
     if (self::$SUPPORT['mbstring_func_overload'] === true) {
       return \array_map(
-          function ($data) {
+          function($data) {
             return UTF8::strlen_in_byte($data);
           },
           $strSplit
@@ -955,7 +955,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);
   }
 
   /**
@@ -1111,7 +1111,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::encode() without mbstring cannot handle "' . $toEncoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::encode() without mbstring cannot handle "'.$toEncoding.'" encoding', E_USER_WARNING);
     }
 
     if (!isset(self::$SUPPORT['already_checked_via_portable_utf8'])) {
@@ -1227,7 +1227,7 @@ 
           return '';
         }
 
-        return \rtrim($strSub, $trimChars) . $replacerForSkippedText;
+        return \rtrim($strSub, $trimChars).$replacerForSkippedText;
       }
 
       return $str;
@@ -1263,14 +1263,14 @@ 
       if (!$pos_end || $pos_end <= 0) {
         $strSub = self::substr($str, $pos_start, self::strlen($str), $encoding);
         if ($strSub !== false) {
-          $extract = $replacerForSkippedText . \ltrim($strSub, $trimChars);
+          $extract = $replacerForSkippedText.\ltrim($strSub, $trimChars);
         } else {
           $extract = '';
         }
       } else {
         $strSub = self::substr($str, $pos_start, $pos_end, $encoding);
         if ($strSub !== false) {
-          $extract = $replacerForSkippedText . \trim($strSub, $trimChars) . $replacerForSkippedText;
+          $extract = $replacerForSkippedText.\trim($strSub, $trimChars).$replacerForSkippedText;
         } else {
           $extract = '';
         }
@@ -1293,7 +1293,7 @@ 
       if ($pos_end) {
         $strSub = self::substr($str, 0, $pos_end, $encoding);
         if ($strSub !== false) {
-          $extract = \rtrim($strSub, $trimChars) . $replacerForSkippedText;
+          $extract = \rtrim($strSub, $trimChars).$replacerForSkippedText;
         } else {
           $extract = '';
         }
@@ -1418,7 +1418,7 @@ 
   {
     $file_content = \file_get_contents($file_path);
     if ($file_content === false) {
-      throw new \RuntimeException('file_get_contents() returned false for:' . $file_path);
+      throw new \RuntimeException('file_get_contents() returned false for:'.$file_path);
     }
 
     return self::string_has_bom($file_content);
@@ -1478,7 +1478,7 @@ 
           ) {
             // Prevent leading combining chars
             // for NFC-safe concatenations.
-            $var = $leading_combining . $var;
+            $var = $leading_combining.$var;
           }
         }
 
@@ -1973,7 +1973,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;
@@ -2038,7 +2038,7 @@ 
     }
 
     $str_info = \unpack('C2chars', $str_info);
-    $type_code = (int)($str_info['chars1'] . $str_info['chars2']);
+    $type_code = (int)($str_info['chars1'].$str_info['chars2']);
 
     // DEBUG
     //var_dump($type_code);
@@ -2151,16 +2151,16 @@ 
    */
   public static function get_unique_string($entropyExtra = '', bool $md5 = true): string
   {
-    $uniqueHelper = \mt_rand() .
-                    \session_id() .
-                    ($_SERVER['REMOTE_ADDR'] ?? '') .
-                    ($_SERVER['SERVER_ADDR'] ?? '') .
+    $uniqueHelper = \mt_rand().
+                    \session_id().
+                    ($_SERVER['REMOTE_ADDR'] ?? '').
+                    ($_SERVER['SERVER_ADDR'] ?? '').
                     $entropyExtra;
 
     $uniqueString = \uniqid($uniqueHelper, true);
 
     if ($md5) {
-      $uniqueString = \md5($uniqueString . $uniqueHelper);
+      $uniqueString = \md5($uniqueString.$uniqueHelper);
     }
 
     return $uniqueString;
@@ -2305,7 +2305,7 @@ 
     return \implode(
         '',
         \array_map(
-            function ($chr) use ($keepAsciiChars, $encoding) {
+            function($chr) use ($keepAsciiChars, $encoding) {
               return UTF8::single_chr_html_encode($chr, $keepAsciiChars, $encoding);
             },
             self::split($str)
@@ -2421,7 +2421,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);
     }
 
     if (!isset(self::$SUPPORT['already_checked_via_portable_utf8'])) {
@@ -2444,7 +2444,7 @@ 
 
         $str = (string)\preg_replace_callback(
             "/&#\d{2,6};/",
-            function ($matches) use ($encoding) {
+            function($matches) use ($encoding) {
               // always fallback via symfony polyfill
               $returnTmp = \mb_convert_encoding($matches[0], $encoding, 'HTML-ENTITIES');
 
@@ -2787,9 +2787,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.'';
   }
 
   /**
@@ -3738,7 +3738,7 @@ 
         $tryToKeepStringLength
     );
 
-    return $strPartOne . $strPartTwo;
+    return $strPartOne.$strPartTwo;
   }
 
   /**
@@ -4243,7 +4243,7 @@ 
       $encoding = self::normalize_encoding($encoding, 'UTF-8');
     }
 
-    $cacheKey = $chr_orig . $encoding;
+    $cacheKey = $chr_orig.$encoding;
     if (isset($CHAR_CACHE[$cacheKey]) === true) {
       return $CHAR_CACHE[$cacheKey];
     }
@@ -4509,7 +4509,7 @@ 
     }
 
     $str = (string)\preg_replace(
-        $delimiter . $pattern . $delimiter . 'u' . $options,
+        $delimiter.$pattern.$delimiter.'u'.$options,
         $replacement,
         $str
     );
@@ -4580,7 +4580,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);
       }
     }
 
@@ -4828,7 +4828,7 @@ 
   {
     static $RX_CLASSS_CACHE = [];
 
-    $cacheKey = $s . $class;
+    $cacheKey = $s.$class;
 
     if (isset($RX_CLASSS_CACHE[$cacheKey])) {
       return $RX_CLASSS_CACHE[$cacheKey];
@@ -4840,7 +4840,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)) {
@@ -4851,13 +4851,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;
@@ -4876,7 +4876,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>';
   }
@@ -4908,7 +4908,7 @@ 
       $encoding = self::normalize_encoding($encoding, 'UTF-8');
     }
 
-    return '&#' . self::ord($char, $encoding) . ';';
+    return '&#'.self::ord($char, $encoding).';';
   }
 
   /**
@@ -4995,7 +4995,7 @@ 
         ) {
 
           if (($str[$i + 1] & "\xC0") === "\x80") {
-            $ret[] = $str[$i] . $str[$i + 1];
+            $ret[] = $str[$i].$str[$i + 1];
 
             $i++;
           }
@@ -5011,7 +5011,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;
           }
@@ -5029,7 +5029,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;
           }
@@ -5042,7 +5042,7 @@ 
       $ret = \array_chunk($ret, $length);
 
       return \array_map(
-          function ($item) {
+          function($item) {
             return \implode('', $item);
           }, $ret
       );
@@ -5075,7 +5075,7 @@ 
 
     $str = (string)\preg_replace_callback(
         '/[-_\s]+(.)?/u',
-        function ($match) use ($encoding, $cleanUtf8, $lang, $tryToKeepStringLength) {
+        function($match) use ($encoding, $cleanUtf8, $lang, $tryToKeepStringLength) {
           if (isset($match[1])) {
             return UTF8::strtoupper($match[1], $encoding, $cleanUtf8, $lang, $tryToKeepStringLength);
           }
@@ -5087,7 +5087,7 @@ 
 
     $str = (string)\preg_replace_callback(
         '/[\d]+(.)?/u',
-        function ($match) use ($encoding, $cleanUtf8, $lang, $tryToKeepStringLength) {
+        function($match) use ($encoding, $cleanUtf8, $lang, $tryToKeepStringLength) {
           return UTF8::strtoupper($match[0], $encoding, $cleanUtf8, $lang, $tryToKeepStringLength);
         },
         $str
@@ -5466,7 +5466,7 @@ 
     foreach (self::$ENCODINGS as $encodingTmp) {
       # INFO: //IGNORE but still throw notice
       /** @noinspection PhpUsageOfSilenceOperatorInspection */
-      if ((string)@\iconv($encodingTmp, $encodingTmp . '//IGNORE', $str) === $str) {
+      if ((string)@\iconv($encodingTmp, $encodingTmp.'//IGNORE', $str) === $str) {
         return $encodingTmp;
       }
     }
@@ -5528,7 +5528,7 @@ 
   public static function str_ensure_left(string $str, string $substring): string
   {
     if (!self::str_starts_with($str, $substring)) {
-      $str = $substring . $str;
+      $str = $substring.$str;
     }
 
     return $str;
@@ -5737,7 +5737,7 @@ 
     $start = self::substr($str, 0, $index, $encoding);
     $end = self::substr($str, $index, $len, $encoding);
 
-    return $start . $substring . $end;
+    return $start.$substring.$end;
   }
 
   /**
@@ -5775,7 +5775,7 @@ 
       if ('' === $s) {
         $s = '/^(?<=.)$/';
       } else {
-        $s = '/' . \preg_quote($s, '/') . '/ui';
+        $s = '/'.\preg_quote($s, '/').'/ui';
       }
     }
 
@@ -6058,7 +6058,7 @@ 
       return $str;
     }
 
-    return self::substr($str, 0, $length - self::strlen($strAddOn), $encoding) . $strAddOn;
+    return self::substr($str, 0, $length - self::strlen($strAddOn), $encoding).$strAddOn;
   }
 
   /**
@@ -6086,7 +6086,7 @@ 
     }
 
     if (self::substr($str, $length - 1, 1, $encoding) === ' ') {
-      return self::substr($str, 0, $length - 1, $encoding) . $strAddOn;
+      return self::substr($str, 0, $length - 1, $encoding).$strAddOn;
     }
 
     $str = (string)self::substr($str, 0, $length, $encoding);
@@ -6095,9 +6095,9 @@ 
     $new_str = \implode(' ', $array);
 
     if ($new_str === '') {
-      $str = self::substr($str, 0, $length - 1, $encoding) . $strAddOn;
+      $str = self::substr($str, 0, $length - 1, $encoding).$strAddOn;
     } else {
-      $str = $new_str . $strAddOn;
+      $str = $new_str.$strAddOn;
     }
 
     return $str;
@@ -6200,7 +6200,7 @@ 
       $char = self::substr($str, -$i, 1, $encoding);
 
       if ($char == self::substr($otherStr, -$i, 1, $encoding)) {
-        $longestCommonSuffix = $char . $longestCommonSuffix;
+        $longestCommonSuffix = $char.$longestCommonSuffix;
       } else {
         break;
       }
@@ -6219,7 +6219,7 @@ 
    */
   public static function str_matches_pattern(string $str, string $pattern): bool
   {
-    if (\preg_match('/' . $pattern . '/u', $str)) {
+    if (\preg_match('/'.$pattern.'/u', $str)) {
       return true;
     }
 
@@ -6309,7 +6309,7 @@ 
         $pad_type = STR_PAD_BOTH;
       } else {
         throw new \InvalidArgumentException(
-            'Pad expects $padType to be "STR_PAD_*" or ' . "to be one of 'left', 'right' or 'both'"
+            'Pad expects $padType to be "STR_PAD_*" or '."to be one of 'left', 'right' or 'both'"
         );
       }
     }
@@ -6346,7 +6346,7 @@ 
           $pre = '';
       }
 
-      return $pre . $str . $post;
+      return $pre.$str.$post;
     }
 
     return $str;
@@ -6483,11 +6483,11 @@ 
     }
 
     if ('' === $search) {
-      return $str . $replacement;
+      return $str.$replacement;
     }
 
     if (\strpos($str, $search) === 0) {
-      return $replacement . \substr($str, \strlen($search));
+      return $replacement.\substr($str, \strlen($search));
     }
 
     return $str;
@@ -6515,11 +6515,11 @@ 
     }
 
     if ('' === $search) {
-      return $str . $replacement;
+      return $str.$replacement;
     }
 
     if (\stripos($str, $search) === 0) {
-      return $replacement . \substr($str, \strlen($search));
+      return $replacement.\substr($str, \strlen($search));
     }
 
     return $str;
@@ -6547,11 +6547,11 @@ 
     }
 
     if ('' === $search) {
-      return $str . $replacement;
+      return $str.$replacement;
     }
 
     if (\strpos($str, $search, \strlen($str) - \strlen($search)) !== false) {
-      $str = substr($str, 0, -\strlen($search)) . $replacement;
+      $str = substr($str, 0, -\strlen($search)).$replacement;
     }
 
     return $str;
@@ -6579,11 +6579,11 @@ 
     }
 
     if ('' === $search) {
-      return $str . $replacement;
+      return $str.$replacement;
     }
 
     if (\stripos($str, $search, \strlen($str) - \strlen($search)) !== false) {
-      $str = substr($str, 0, -\strlen($search)) . $replacement;
+      $str = substr($str, 0, -\strlen($search)).$replacement;
     }
 
     return $str;
@@ -6695,24 +6695,24 @@ 
 
     $str = (string)\preg_replace_callback(
         '/([\d|A-Z])/u',
-        function ($matches) use ($encoding) {
+        function($matches) use ($encoding) {
           $match = $matches[1];
           $matchInt = (int)$match;
 
           if ((string)$matchInt == $match) {
-            return '_' . $match . '_';
+            return '_'.$match.'_';
           }
 
-          return '_' . UTF8::strtolower($match, $encoding);
+          return '_'.UTF8::strtolower($match, $encoding);
         },
         $str
     );
 
     $str = (string)\preg_replace(
         [
-            '/\s+/',        // convert spaces to "_"
-            '/^\s+|\s+$/',  // trim leading & trailing spaces
-            '/_+/',         // remove double "_"
+            '/\s+/', // convert spaces to "_"
+            '/^\s+|\s+$/', // trim leading & trailing spaces
+            '/_+/', // remove double "_"
         ],
         [
             '_',
@@ -6800,7 +6800,7 @@ 
       $limit = -1;
     }
 
-    $array = \preg_split('/' . \preg_quote($pattern, '/') . '/u', $str, $limit);
+    $array = \preg_split('/'.\preg_quote($pattern, '/').'/u', $str, $limit);
 
     if ($array === false) {
       return [];
@@ -7179,16 +7179,16 @@ 
     $str = (string)\preg_replace_callback(
         '~\b (_*) (?:                                                              # 1. Leading underscore and
                         ( (?<=[ ][/\\\\]) [[:alpha:]]+ [-_[:alpha:]/\\\\]+ |              # 2. file path or 
-                          [-_[:alpha:]]+ [@.:] [-_[:alpha:]@.:/]+ ' . $apostropheRx . ' ) #    URL, domain, or email
+                          [-_[:alpha:]]+ [@.:] [-_[:alpha:]@.:/]+ ' . $apostropheRx.' ) #    URL, domain, or email
                         |
-                        ( (?i: ' . $smallWordsRx . ' ) ' . $apostropheRx . ' )            # 3. or small word (case-insensitive)
+                        ( (?i: ' . $smallWordsRx.' ) '.$apostropheRx.' )            # 3. or small word (case-insensitive)
                         |
-                        ( [[:alpha:]] [[:lower:]\'’()\[\]{}]* ' . $apostropheRx . ' )     # 4. or word w/o internal caps
+                        ( [[:alpha:]] [[:lower:]\'’()\[\]{}]* ' . $apostropheRx.' )     # 4. or word w/o internal caps
                         |
-                        ( [[:alpha:]] [[:alpha:]\'’()\[\]{}]* ' . $apostropheRx . ' )     # 5. or some other word
+                        ( [[:alpha:]] [[:alpha:]\'’()\[\]{}]* ' . $apostropheRx.' )     # 5. or some other word
                       ) (_*) \b                                                           # 6. With trailing underscore
                     ~ux',
-        function ($matches) use ($encoding) {
+        function($matches) use ($encoding) {
           // Preserve leading underscore
           $str = $matches[1];
           if ($matches[2]) {
@@ -7217,21 +7217,21 @@ 
         '~(  \A [[:punct:]]*                # start of title...
                       |  [:.;?!][ ]+               # or of subsentence...
                       |  [ ][\'"“‘(\[][ ]* )       # or of inserted subphrase...
-                      ( ' . $smallWordsRx . ' ) \b # ...followed by small word
+                      ( ' . $smallWordsRx.' ) \b # ...followed by small word
                      ~uxi',
-        function ($matches) use ($encoding) {
-          return $matches[1] . static::str_upper_first($matches[2], $encoding);
+        function($matches) use ($encoding) {
+          return $matches[1].static::str_upper_first($matches[2], $encoding);
         },
         $str
     );
 
     // ...and end of title
     $str = (string)\preg_replace_callback(
-        '~\b ( ' . $smallWordsRx . ' ) # small word...
+        '~\b ( '.$smallWordsRx.' ) # small word...
                       (?= [[:punct:]]* \Z     # ...at the end of the title...
                       |   [\'"’”)\]] [ ] )    # ...or of an inserted subphrase?
                      ~uxi',
-        function ($matches) use ($encoding) {
+        function($matches) use ($encoding) {
           return static::str_upper_first($matches[1], $encoding);
         },
         $str
@@ -7242,10 +7242,10 @@ 
     $str = (string)\preg_replace_callback(
         '~\b
                         (?<! -)                   # Negative lookbehind for a hyphen; we do not want to match man-in-the-middle but do want (in-flight)
-                        ( ' . $smallWordsRx . ' )
+                        ( ' . $smallWordsRx.' )
                         (?= -[[:alpha:]]+)        # lookahead for "-someword"
                        ~uxi',
-        function ($matches) use ($encoding) {
+        function($matches) use ($encoding) {
           return static::str_upper_first($matches[1], $encoding);
         },
         $str
@@ -7256,11 +7256,11 @@ 
         '~\b
                       (?<!…)                    # Negative lookbehind for a hyphen; we do not want to match man-in-the-middle but do want (stand-in)
                       ( [[:alpha:]]+- )         # $1 = first word and hyphen, should already be properly capped
-                      ( ' . $smallWordsRx . ' ) # ...followed by small word
+                      ( ' . $smallWordsRx.' ) # ...followed by small word
                       (?!	- )                   # Negative lookahead for another -
                      ~uxi',
-        function ($matches) use ($encoding) {
-          return $matches[1] . static::str_upper_first($matches[2], $encoding);
+        function($matches) use ($encoding) {
+          return $matches[1].static::str_upper_first($matches[2], $encoding);
         },
         $str
     );
@@ -7410,7 +7410,7 @@ 
 
     $truncated = self::substr($str, 0, $length, $encoding);
 
-    return $truncated . $substring;
+    return $truncated.$substring;
   }
 
   /**
@@ -7452,7 +7452,7 @@ 
       }
     }
 
-    $str = $truncated . $substring;
+    $str = $truncated.$substring;
 
     return $str;
   }
@@ -7607,7 +7607,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)
     );
@@ -7641,7 +7641,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]);
     }
 
@@ -7878,7 +7878,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) {
@@ -7900,7 +7900,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;
@@ -7967,7 +7967,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);
     }
 
     //
@@ -8093,7 +8093,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));
   }
 
   /**
@@ -8158,7 +8158,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, (int)\strpos($haystack, $m[0]));
     }
 
@@ -8230,7 +8230,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);
     }
 
     //
@@ -8396,7 +8396,7 @@ 
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
-      \trigger_error('UTF8::strrchr() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      \trigger_error('UTF8::strrchr() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$SUPPORT['mbstring'] === true) {
@@ -8617,7 +8617,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);
     }
 
     //
@@ -8764,7 +8764,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);
     }
 
     //
@@ -8895,7 +8895,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;
   }
 
   /**
@@ -8951,7 +8951,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);
     }
 
     //
@@ -8989,7 +8989,7 @@ 
     // fallback via vanilla php
     //
 
-    \preg_match('/^(.*?)' . \preg_quote($needle, '/') . '/us', $haystack, $match);
+    \preg_match('/^(.*?)'.\preg_quote($needle, '/').'/us', $haystack, $match);
 
     if (!isset($match[1])) {
       return false;
@@ -9127,9 +9127,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() cannot handle special language: ' . $lang, E_USER_WARNING);
+          \trigger_error('UTF8::strtolower() cannot handle special language: '.$lang, E_USER_WARNING);
 
           $langCode = 'Any-Lower';
         }
@@ -9138,7 +9138,7 @@ 
         return transliterator_transliterate($langCode, $str);
       }
 
-      \trigger_error('UTF8::strtolower() without intl cannot handle the "lang" parameter: ' . $lang, E_USER_WARNING);
+      \trigger_error('UTF8::strtolower() without intl cannot handle the "lang" parameter: '.$lang, E_USER_WARNING);
     }
 
     // always fallback via symfony polyfill
@@ -9203,9 +9203,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';
         }
@@ -9214,7 +9214,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);
     }
 
     // always fallback via symfony polyfill
@@ -9421,7 +9421,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);
     }
 
     //
@@ -9601,14 +9601,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);
   }
@@ -9933,8 +9933,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);
     }
 
     if (!isset(self::$SUPPORT['already_checked_via_portable_utf8'])) {
@@ -9960,7 +9959,7 @@ 
         $length = $string_length - $offset;
       }
 
-      return self::substr($str, 0, $offset, $encoding) . $replacement . self::substr($str, $offset + $length, $string_length - $offset - $length, $encoding);
+      return self::substr($str, 0, $offset, $encoding).$replacement.self::substr($str, $offset + $length, $string_length - $offset - $length, $encoding);
     }
 
     \preg_match_all('/./us', $str, $smatches);
@@ -10381,9 +10380,9 @@ 
 
     $string = (string)\preg_replace(
         [
-            '/[^' . $fallback_char_escaped . '\.\-a-zA-Z0-9\s]/', // 1) remove un-needed chars
-            '/[\s]+/',                                            // 2) convert spaces to $fallback_char
-            '/[' . $fallback_char_escaped . ']+/',                // 3) remove double $fallback_char's
+            '/[^'.$fallback_char_escaped.'\.\-a-zA-Z0-9\s]/', // 1) remove un-needed chars
+            '/[\s]+/', // 2) convert spaces to $fallback_char
+            '/['.$fallback_char_escaped.']+/', // 3) remove double $fallback_char's
         ],
         [
             '',
@@ -10484,7 +10483,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_helper($c1);
@@ -10496,7 +10495,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_helper($c1);
@@ -10509,7 +10508,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_helper($c1);
@@ -10531,7 +10530,7 @@ 
     // decode unicode escape sequences
     $buf = \preg_replace_callback(
         '/\\\\u([0-9a-f]{4})/i',
-        function ($match) {
+        function($match) {
           // always fallback via symfony polyfill
           return \mb_convert_encoding(pack('H*', $match[1]), 'UTF-8', 'UCS-2BE');
         },
@@ -10574,7 +10573,7 @@ 
     } else {
       $cc1 = self::$CHR[$ordC1 / 64] | "\xC0";
       $cc2 = ((string)$input & "\x3F") | "\x80";
-      $buf .= $cc1 . $cc2;
+      $buf .= $cc1.$cc2;
     }
 
     return $buf;
@@ -10642,7 +10641,7 @@ 
         $tryToKeepStringLength
     );
 
-    return $strPartOne . $strPartTwo;
+    return $strPartOne.$strPartTwo;
   }
 
   /**
@@ -10687,7 +10686,7 @@ 
       $str = self::clean($str);
     }
 
-    $usePhpDefaultFunctions = !(bool)($charlist . \implode('', $exceptions));
+    $usePhpDefaultFunctions = !(bool)($charlist.\implode('', $exceptions));
 
     if (
         $usePhpDefaultFunctions === true
@@ -11191,7 +11190,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])
@@ -11201,7 +11200,7 @@ 
       return $str;
     }
 
-    return self::rtrim($matches[0]) . $strAddOn;
+    return self::rtrim($matches[0]).$strAddOn;
   }
 
   /**
@@ -11272,7 +11271,7 @@ 
       $strReturn .= $break;
     }
 
-    return $strReturn . \implode('', $chars);
+    return $strReturn.\implode('', $chars);
   }
 
   /**