voku / portable-utf8

src/voku/helper/data/win1252_to_utf8.php

Spacing +106 added lines, -106 removed lines

@@ -3,17 +3,17 @@ 
 static $data = array(
     0x80 => "\xe2\x82\xac", # €
     0x82 => "\xe2\x80\x9a", # ‚
-    0x83 => "\xc6\x92",     # ƒ
+    0x83 => "\xc6\x92", # ƒ
     0x84 => "\xe2\x80\x9e", # „
     0x85 => "\xe2\x80\xa6", # …
     0x86 => "\xe2\x80\xa0", # †
     0x87 => "\xe2\x80\xa1", # ‡
-    0x88 => "\xcb\x86",     # ˆ
+    0x88 => "\xcb\x86", # ˆ
     0x89 => "\xe2\x80\xb0", # ‰
-    0x8a => "\xc5\xa0",     # Š
+    0x8a => "\xc5\xa0", # Š
     0x8b => "\xe2\x80\xb9", # ‹
-    0x8c => "\xc5\x92",     # Œ
-    0x8e => "\xc5\xbd",     # Ž
+    0x8c => "\xc5\x92", # Œ
+    0x8e => "\xc5\xbd", # Ž
     0x91 => "\xe2\x80\x98", # ‘
     0x92 => "\xe2\x80\x99", # ’
     0x93 => "\xe2\x80\x9c", # “
@@ -21,110 +21,110 @@ 
     0x95 => "\xe2\x80\xa2", # •
     0x96 => "\xe2\x80\x93", # –
     0x97 => "\xe2\x80\x94", # —
-    0x98 => "\xcb\x9c",     # ˜
+    0x98 => "\xcb\x9c", # ˜
     0x99 => "\xe2\x84\xa2", # ™
-    0x9a => "\xc5\xa1",     # š
+    0x9a => "\xc5\xa1", # š
     0x9b => "\xe2\x80\xba", # ›
-    0x9c => "\xc5\x93",     # œ
-    0x9e => "\xc5\xbe",     # ž
-    0x9f => "\xc5\xb8",     # Ÿ
-    0xa0 => "\xc2\xa0",     #
-    0xa1 => "\xc2\xa1",     # ¡
-    0xa2 => "\xc2\xa2",     # ¢
-    0xa3 => "\xc2\xa3",     # £
-    0xa4 => "\xc2\xa4",     # ¤
-    0xa5 => "\xc2\xa5",     # ¥
-    0xa6 => "\xc2\xa6",     # ¦
-    0xa7 => "\xc2\xa7",     # §
-    0xa8 => "\xc2\xa8",     # ¨
-    0xa9 => "\xc2\xa9",     # ©
-    0xaa => "\xc2\xaa",     # ª
-    0xab => "\xc2\xab",     # «
-    0xac => "\xc2\xac",     # ¬
-    0xad => "\xc2\xad",     # ­
-    0xae => "\xc2\xae",     # ®
-    0xaf => "\xc2\xaf",     # ¯
-    0xb0 => "\xc2\xb0",     # °
-    0xb1 => "\xc2\xb1",     # ±
-    0xb2 => "\xc2\xb2",     # ²
-    0xb3 => "\xc2\xb3",     # ³
-    0xb4 => "\xc2\xb4",     # ´
-    0xb5 => "\xc2\xb5",     # µ
-    0xb6 => "\xc2\xb6",     # ¶
-    0xb7 => "\xc2\xb7",     # ·
-    0xb8 => "\xc2\xb8",     # ¸
-    0xb9 => "\xc2\xb9",     # ¹
-    0xba => "\xc2\xba",     # º
-    0xbb => "\xc2\xbb",     # »
-    0xbc => "\xc2\xbc",     # ¼
-    0xbd => "\xc2\xbd",     # ½
-    0xbe => "\xc2\xbe",     # ¾
-    0xbf => "\xc2\xbf",     # ¿
-    0xc0 => "\xc3\x80",     # À
-    0xc1 => "\xc3\x81",     # Á
-    0xc2 => "\xc3\x82",     # Â
-    0xc3 => "\xc3\x83",     # Ã
-    0xc4 => "\xc3\x84",     # Ä
-    0xc5 => "\xc3\x85",     # Å
-    0xc6 => "\xc3\x86",     # Æ
-    0xc7 => "\xc3\x87",     # Ç
-    0xc8 => "\xc3\x88",     # È
-    0xc9 => "\xc3\x89",     # É
-    0xca => "\xc3\x8a",     # Ê
-    0xcb => "\xc3\x8b",     # Ë
-    0xcc => "\xc3\x8c",     # Ì
-    0xcd => "\xc3\x8d",     # Í
-    0xce => "\xc3\x8e",     # Î
-    0xcf => "\xc3\x8f",     # Ï
-    0xd0 => "\xc3\x90",     # Ð
-    0xd1 => "\xc3\x91",     # Ñ
-    0xd2 => "\xc3\x92",     # Ò
-    0xd3 => "\xc3\x93",     # Ó
-    0xd4 => "\xc3\x94",     # Ô
-    0xd5 => "\xc3\x95",     # Õ
-    0xd6 => "\xc3\x96",     # Ö
-    0xd7 => "\xc3\x97",     # ×
-    0xd8 => "\xc3\x98",     # Ø
-    0xd9 => "\xc3\x99",     # Ù
-    0xda => "\xc3\x9a",     # Ú
-    0xdb => "\xc3\x9b",     # Û
-    0xdc => "\xc3\x9c",     # Ü
-    0xdd => "\xc3\x9d",     # Ý
-    0xde => "\xc3\x9e",     # Þ
-    0xdf => "\xc3\x9f",     # ß
-    0xe0 => "\xc3\xa0",     # à
-    0xe1 => "\xa1",         # á
-    0xe2 => "\xc3\xa2",     # â
-    0xe3 => "\xc3\xa3",     # ã
-    0xe4 => "\xc3\xa4",     # ä
-    0xe5 => "\xc3\xa5",     # å
-    0xe6 => "\xc3\xa6",     # æ
-    0xe7 => "\xc3\xa7",     # ç
-    0xe8 => "\xc3\xa8",     # è
-    0xe9 => "\xc3\xa9",     # é
-    0xea => "\xc3\xaa",     # ê
-    0xeb => "\xc3\xab",     # ë
-    0xec => "\xc3\xac",     # ì
-    0xed => "\xc3\xad",     # í
-    0xee => "\xc3\xae",     # î
-    0xef => "\xc3\xaf",     # ï
-    0xf0 => "\xc3\xb0",     # ð
-    0xf1 => "\xc3\xb1",     # ñ
-    0xf2 => "\xc3\xb2",     # ò
-    0xf3 => "\xc3\xb3",     # ó
-    0xf4 => "\xc3\xb4",     # ô
-    0xf5 => "\xc3\xb5",     # õ
-    0xf6 => "\xc3\xb6",     # ö
-    0xf7 => "\xc3\xb7",     # ÷
-    0xf8 => "\xc3\xb8",     # ø
-    0xf9 => "\xc3\xb9",     # ù
-    0xfa => "\xc3\xba",     # ú
-    0xfb => "\xc3\xbb",     # û
-    0xfc => "\xc3\xbc",     # ü
-    0xfd => "\xc3\xbd",     # ý
-    0xfe => "\xc3\xbe",     # þ
+    0x9c => "\xc5\x93", # œ
+    0x9e => "\xc5\xbe", # ž
+    0x9f => "\xc5\xb8", # Ÿ
+    0xa0 => "\xc2\xa0", #
+    0xa1 => "\xc2\xa1", # ¡
+    0xa2 => "\xc2\xa2", # ¢
+    0xa3 => "\xc2\xa3", # £
+    0xa4 => "\xc2\xa4", # ¤
+    0xa5 => "\xc2\xa5", # ¥
+    0xa6 => "\xc2\xa6", # ¦
+    0xa7 => "\xc2\xa7", # §
+    0xa8 => "\xc2\xa8", # ¨
+    0xa9 => "\xc2\xa9", # ©
+    0xaa => "\xc2\xaa", # ª
+    0xab => "\xc2\xab", # «
+    0xac => "\xc2\xac", # ¬
+    0xad => "\xc2\xad", # ­
+    0xae => "\xc2\xae", # ®
+    0xaf => "\xc2\xaf", # ¯
+    0xb0 => "\xc2\xb0", # °
+    0xb1 => "\xc2\xb1", # ±
+    0xb2 => "\xc2\xb2", # ²
+    0xb3 => "\xc2\xb3", # ³
+    0xb4 => "\xc2\xb4", # ´
+    0xb5 => "\xc2\xb5", # µ
+    0xb6 => "\xc2\xb6", # ¶
+    0xb7 => "\xc2\xb7", # ·
+    0xb8 => "\xc2\xb8", # ¸
+    0xb9 => "\xc2\xb9", # ¹
+    0xba => "\xc2\xba", # º
+    0xbb => "\xc2\xbb", # »
+    0xbc => "\xc2\xbc", # ¼
+    0xbd => "\xc2\xbd", # ½
+    0xbe => "\xc2\xbe", # ¾
+    0xbf => "\xc2\xbf", # ¿
+    0xc0 => "\xc3\x80", # À
+    0xc1 => "\xc3\x81", # Á
+    0xc2 => "\xc3\x82", # Â
+    0xc3 => "\xc3\x83", # Ã
+    0xc4 => "\xc3\x84", # Ä
+    0xc5 => "\xc3\x85", # Å
+    0xc6 => "\xc3\x86", # Æ
+    0xc7 => "\xc3\x87", # Ç
+    0xc8 => "\xc3\x88", # È
+    0xc9 => "\xc3\x89", # É
+    0xca => "\xc3\x8a", # Ê
+    0xcb => "\xc3\x8b", # Ë
+    0xcc => "\xc3\x8c", # Ì
+    0xcd => "\xc3\x8d", # Í
+    0xce => "\xc3\x8e", # Î
+    0xcf => "\xc3\x8f", # Ï
+    0xd0 => "\xc3\x90", # Ð
+    0xd1 => "\xc3\x91", # Ñ
+    0xd2 => "\xc3\x92", # Ò
+    0xd3 => "\xc3\x93", # Ó
+    0xd4 => "\xc3\x94", # Ô
+    0xd5 => "\xc3\x95", # Õ
+    0xd6 => "\xc3\x96", # Ö
+    0xd7 => "\xc3\x97", # ×
+    0xd8 => "\xc3\x98", # Ø
+    0xd9 => "\xc3\x99", # Ù
+    0xda => "\xc3\x9a", # Ú
+    0xdb => "\xc3\x9b", # Û
+    0xdc => "\xc3\x9c", # Ü
+    0xdd => "\xc3\x9d", # Ý
+    0xde => "\xc3\x9e", # Þ
+    0xdf => "\xc3\x9f", # ß
+    0xe0 => "\xc3\xa0", # à
+    0xe1 => "\xa1", # á
+    0xe2 => "\xc3\xa2", # â
+    0xe3 => "\xc3\xa3", # ã
+    0xe4 => "\xc3\xa4", # ä
+    0xe5 => "\xc3\xa5", # å
+    0xe6 => "\xc3\xa6", # æ
+    0xe7 => "\xc3\xa7", # ç
+    0xe8 => "\xc3\xa8", # è
+    0xe9 => "\xc3\xa9", # é
+    0xea => "\xc3\xaa", # ê
+    0xeb => "\xc3\xab", # ë
+    0xec => "\xc3\xac", # ì
+    0xed => "\xc3\xad", # í
+    0xee => "\xc3\xae", # î
+    0xef => "\xc3\xaf", # ï
+    0xf0 => "\xc3\xb0", # ð
+    0xf1 => "\xc3\xb1", # ñ
+    0xf2 => "\xc3\xb2", # ò
+    0xf3 => "\xc3\xb3", # ó
+    0xf4 => "\xc3\xb4", # ô
+    0xf5 => "\xc3\xb5", # õ
+    0xf6 => "\xc3\xb6", # ö
+    0xf7 => "\xc3\xb7", # ÷
+    0xf8 => "\xc3\xb8", # ø
+    0xf9 => "\xc3\xb9", # ù
+    0xfa => "\xc3\xba", # ú
+    0xfb => "\xc3\xbb", # û
+    0xfc => "\xc3\xbc", # ü
+    0xfd => "\xc3\xbd", # ý
+    0xfe => "\xc3\xbe", # þ
 );
 
-$result =& $data;
+$result = & $data;
 unset($data);
 return $result;

src/voku/helper/UTF8.php

Doc Comments +5 added lines, -5 removed lines

@@ -2396,7 +2396,7 @@ 
    *
    * @see    http://hsivonen.iki.fi/php-utf8/
    *
-   * @param string|string[] $str    <p>The string to be checked.</p>
+   * @param string $str    <p>The string to be checked.</p>
    * @param bool            $strict <p>Check also if the string is not UTF-16 or UTF-32.</p>
    *
    * @return bool
@@ -5116,7 +5116,7 @@ 
    * @link http://php.net/manual/en/function.mb-strrpos.php
    *
    * @param string     $haystack  <p>The string being checked, for the last occurrence of needle</p>
-   * @param string|int $needle    <p>The string to find in haystack.<br>Or a code point as int.</p>
+   * @param string $needle    <p>The string to find in haystack.<br>Or a code point as int.</p>
    * @param int        $offset    [optional] <p>May be specified to begin searching an arbitrary number of characters
    *                              into the string. Negative values will stop searching at an arbitrary point prior to
    *                              the end of the string.
@@ -5915,8 +5915,8 @@ 
    *
    * source: https://gist.github.com/stemar/8287074
    *
-   * @param string|string[] $str              <p>The input string or an array of stings.</p>
-   * @param string|string[] $replacement      <p>The replacement string or an array of stings.</p>
+   * @param string $str              <p>The input string or an array of stings.</p>
+   * @param string $replacement      <p>The replacement string or an array of stings.</p>
    * @param int|int[]       $offset           <p>
    *                                          If start is positive, the replacing will begin at the start'th offset
    *                                          into string.
@@ -5924,7 +5924,7 @@ 
    *                                          If start is negative, the replacing will begin at the start'th character
    *                                          from the end of string.
    *                                          </p>
-   * @param int|int[]|null  $length           [optional] <p>If given and is positive, it represents the length of the
+   * @param integer  $length           [optional] <p>If given and is positive, it represents the length of the
    *                                          portion of string which is to be replaced. If it is negative, it
    *                                          represents the number of characters from the end of string at which to
    *                                          stop replacing. If it is not given, then it will default to strlen(

Indentation +8 added lines, -8 removed lines

@@ -405,16 +405,16 @@ 
       $chr = self::$CHR[$code_point];
     } elseif ($code_point <= 0x7FF) {
       $chr = self::$CHR[($code_point >> 6) + 0xC0] .
-             self::$CHR[($code_point & 0x3F) + 0x80];
+              self::$CHR[($code_point & 0x3F) + 0x80];
     } elseif ($code_point <= 0xFFFF) {
       $chr = self::$CHR[($code_point >> 12) + 0xE0] .
-             self::$CHR[(($code_point >> 6) & 0x3F) + 0x80] .
-             self::$CHR[($code_point & 0x3F) + 0x80];
+              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] .
-             self::$CHR[($code_point & 0x3F) + 0x80];
+              self::$CHR[(($code_point >> 12) & 0x3F) + 0x80] .
+              self::$CHR[(($code_point >> 6) & 0x3F) + 0x80] .
+              self::$CHR[($code_point & 0x3F) + 0x80];
     }
 
     if ($encoding !== 'UTF-8') {
@@ -2263,10 +2263,10 @@ 
     $json = self::json_decode($str);
 
     return (
-               \is_object($json) === true
+                \is_object($json) === true
                ||
                \is_array($json) === true
-           )
+            )
            &&
            \json_last_error() === JSON_ERROR_NONE;
   }

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)
@@ -1602,7 +1602,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 {
@@ -1610,7 +1610,7 @@ 
 
       $str = \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 !== "'") {
@@ -1932,9 +1932,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;
   }
 
   /**
@@ -2641,7 +2641,7 @@ 
         $cleanUtf8
     );
 
-    return $strPartOne . $strPartTwo;
+    return $strPartOne.$strPartTwo;
   }
 
   /**
@@ -2729,7 +2729,7 @@ 
       return \preg_replace('/^[\pZ\pC]+/u', '', $str);
     }
 
-    return \preg_replace('/^' . self::rxClass($chars) . '+/u', '', $str);
+    return \preg_replace('/^'.self::rxClass($chars).'+/u', '', $str);
   }
 
   /**
@@ -3062,7 +3062,7 @@ 
       }
     }
 
-    $cacheKey = $chr_orig . $encoding;
+    $cacheKey = $chr_orig.$encoding;
     if (isset($CHAR_CACHE[$cacheKey]) === true) {
       return $CHAR_CACHE[$cacheKey];
     }
@@ -3289,7 +3289,7 @@ 
     if (\is_array($what) === true) {
       /** @noinspection ForeachSourceInspection */
       foreach ($what as $item) {
-        $str = \preg_replace('/(' . \preg_quote($item, '/') . ')+/', $item, $str);
+        $str = \preg_replace('/('.\preg_quote($item, '/').')+/', $item, $str);
       }
     }
 
@@ -3399,7 +3399,7 @@ 
       return \preg_replace('/[\pZ\pC]+$/u', '', $str);
     }
 
-    return \preg_replace('/' . self::rxClass($chars) . '+$/u', '', $str);
+    return \preg_replace('/'.self::rxClass($chars).'+$/u', '', $str);
   }
 
   /**
@@ -3414,7 +3414,7 @@ 
   {
     static $RX_CLASSS_CACHE = [];
 
-    $cacheKey = $s . $class;
+    $cacheKey = $s.$class;
 
     if (isset($RX_CLASSS_CACHE[$cacheKey])) {
       return $RX_CLASSS_CACHE[$cacheKey];
@@ -3426,7 +3426,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)) {
@@ -3437,13 +3437,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;
@@ -3462,7 +3462,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>';
   }
@@ -3494,7 +3494,7 @@ 
       $encoding = self::normalize_encoding($encoding, 'UTF-8');
     }
 
-    return '&#' . self::ord($char, $encoding) . ';';
+    return '&#'.self::ord($char, $encoding).';';
   }
 
   /**
@@ -3555,7 +3555,7 @@ 
         ) {
 
           if (($str[$i + 1] & "\xC0") === "\x80") {
-            $ret[] = $str[$i] . $str[$i + 1];
+            $ret[] = $str[$i].$str[$i + 1];
 
             $i++;
           }
@@ -3571,7 +3571,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;
           }
@@ -3589,7 +3589,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;
           }
@@ -3602,7 +3602,7 @@ 
       $ret = \array_chunk($ret, $length);
 
       return \array_map(
-          function ($item) {
+          function($item) {
             return \implode('', $item);
           }, $ret
       );
@@ -3712,7 +3712,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;
       }
     }
@@ -3796,7 +3796,7 @@ 
       if ('' === $s .= '') {
         $s = '/^(?<=.)$/';
       } else {
-        $s = '/' . \preg_quote($s, '/') . '/ui';
+        $s = '/'.\preg_quote($s, '/').'/ui';
       }
     }
 
@@ -3847,7 +3847,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);
@@ -3856,9 +3856,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;
@@ -3913,7 +3913,7 @@ 
           $pre = '';
       }
 
-      return $pre . $str . $post;
+      return $pre.$str.$post;
     }
 
     return $str;
@@ -3973,7 +3973,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);
   }
@@ -4067,7 +4067,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) {
@@ -4292,7 +4292,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)
     );
@@ -4326,7 +4326,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]);
     }
 
@@ -4518,7 +4518,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) {
@@ -4537,7 +4537,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;
@@ -4604,7 +4604,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 (
@@ -4708,7 +4708,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));
   }
 
   /**
@@ -4766,7 +4766,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]));
     }
 
@@ -4830,7 +4830,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 (
@@ -5051,7 +5051,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) {
@@ -5122,7 +5122,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) {
@@ -5187,7 +5187,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;
   }
 
   /**
@@ -5230,7 +5230,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) {
@@ -5245,7 +5245,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;
@@ -5342,9 +5342,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';
         }
@@ -5352,7 +5352,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);
@@ -5407,9 +5407,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';
         }
@@ -5417,7 +5417,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);
@@ -5601,7 +5601,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) {
@@ -5629,8 +5629,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
@@ -5758,14 +5757,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);
   }
@@ -5943,8 +5942,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);
@@ -6015,7 +6013,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) {
@@ -6341,7 +6339,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);
@@ -6353,7 +6351,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);
@@ -6366,7 +6364,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);
@@ -6388,7 +6386,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
@@ -6430,7 +6428,7 @@ 
     } else {
       $cc1 = self::$CHR[$ordC1 / 64] | "\xC0";
       $cc2 = ($int & "\x3F") | "\x80";
-      $buf .= $cc1 . $cc2;
+      $buf .= $cc1.$cc2;
     }
 
     return $buf;
@@ -6491,7 +6489,7 @@ 
         $cleanUtf8
     );
 
-    return $strPartOne . $strPartTwo;
+    return $strPartOne.$strPartTwo;
   }
 
   /**
@@ -6536,7 +6534,7 @@ 
       $str = self::clean($str);
     }
 
-    $usePhpDefaultFunctions = !(bool)($charlist . \implode('', $exceptions));
+    $usePhpDefaultFunctions = !(bool)($charlist.\implode('', $exceptions));
 
     if (
         $usePhpDefaultFunctions === true
@@ -7038,7 +7036,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])
@@ -7048,7 +7046,7 @@ 
       return $str;
     }
 
-    return self::rtrim($matches[0]) . $strAddOn;
+    return self::rtrim($matches[0]).$strAddOn;
   }
 
   /**
@@ -7113,7 +7111,7 @@ 
       $strReturn .= $break;
     }
 
-    return $strReturn . \implode('', $chars);
+    return $strReturn.\implode('', $chars);
   }
 
   /**

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 = preg_replace_callback(
         '/[\x80-\xFF]+/',
-        function ($m) {
+        function($m) {
           return rawurlencode($m[0]);
         },
         $uri
@@ -105,7 +105,7 @@ 
 
     $uri = 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();
     }