voku / portable-utf8

src/voku/helper/data/caseFolding_full.php

Spacing +1 added lines, -1 removed lines

@@ -217,6 +217,6 @@
         ),
 );
 
-$result =& $data;
+$result = & $data;
 unset($data);
 return $result;

src/voku/helper/Bootup.php

Spacing +4 added lines, -4 removed lines

@@ -94,7 +94,7 @@ 
 
     $uri = preg_replace_callback(
         '/[\x80-\xFF]+/',
-        function ($m) {
+        function($m) {
           return urlencode($m[0]);
         },
         $uri
@@ -102,7 +102,7 @@ 
 
     $uri = preg_replace_callback(
         '/(?:%[89A-F][0-9A-F])+/i',
-        function ($m) {
+        function($m) {
           return urlencode(UTF8::encode('UTF-8', urldecode($m[0])));
         },
         $uri
@@ -117,8 +117,8 @@ 
     ) {
       // Use ob_start() to buffer content and avoid problem of headers already sent...
       $severProtocol = (isset($_SERVER['SERVER_PROTOCOL']) ? $_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 +68 added lines, -68 removed lines

@@ -850,7 +850,7 @@ 
   public static function add_bom_to_string($str)
   {
     if (self::string_has_bom($str) === false) {
-      $str = self::bom() . $str;
+      $str = self::bom().$str;
     }
 
     return $str;
@@ -956,7 +956,7 @@ 
 
     // use static cache, if there is no support for "IntlChar"
     static $cache = array();
-    $cacheKey = $code_point . $encoding;
+    $cacheKey = $code_point.$encoding;
     if (isset($cache[$cacheKey]) === true) {
       return $cache[$cacheKey];
     }
@@ -964,16 +964,16 @@ 
     if (0x80 > $code_point %= 0x200000) {
       $str = chr($code_point);
     } elseif (0x800 > $code_point) {
-      $str = chr(0xC0 | $code_point >> 6) .
+      $str = chr(0xC0 | $code_point >> 6).
              chr(0x80 | $code_point & 0x3F);
     } elseif (0x10000 > $code_point) {
-      $str = chr(0xE0 | $code_point >> 12) .
-             chr(0x80 | $code_point >> 6 & 0x3F) .
+      $str = chr(0xE0 | $code_point >> 12).
+             chr(0x80 | $code_point >> 6 & 0x3F).
              chr(0x80 | $code_point & 0x3F);
     } else {
-      $str = chr(0xF0 | $code_point >> 18) .
-             chr(0x80 | $code_point >> 12 & 0x3F) .
-             chr(0x80 | $code_point >> 6 & 0x3F) .
+      $str = chr(0xF0 | $code_point >> 18).
+             chr(0x80 | $code_point >> 12 & 0x3F).
+             chr(0x80 | $code_point >> 6 & 0x3F).
              chr(0x80 | $code_point & 0x3F);
     }
 
@@ -1248,7 +1248,7 @@ 
    */
   public static function decimal_to_chr($int)
   {
-    return self::html_decode('&#' . $int . ';');
+    return self::html_decode('&#'.$int.';');
   }
 
   /**
@@ -1325,7 +1325,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(
@@ -1524,7 +1524,7 @@ 
           ) {
             // Prevent leading combining chars
             // for NFC-safe concatenations.
-            $var = $leading_combining . $var;
+            $var = $leading_combining.$var;
           }
         }
 
@@ -1945,7 +1945,7 @@ 
    */
   private static function getData($file)
   {
-    $file = __DIR__ . '/data/' . $file . '.php';
+    $file = __DIR__.'/data/'.$file.'.php';
     if (file_exists($file)) {
       /** @noinspection PhpIncludeInspection */
       return require $file;
@@ -2062,7 +2062,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)
@@ -2181,7 +2181,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 !== "'") {
@@ -2505,9 +2505,9 @@ 
     if (ctype_digit((string)$int)) {
       $hex = dechex((int)$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;
     }
 
     return '';
@@ -3211,7 +3211,7 @@ 
    */
   public static function lcfirst($str)
   {
-    return self::strtolower(self::substr($str, 0, 1)) . self::substr($str, 1);
+    return self::strtolower(self::substr($str, 0, 1)).self::substr($str, 1);
   }
 
   /**
@@ -3235,7 +3235,7 @@ 
       return preg_replace('/^[\pZ\pC]+/u', '', $str);
     }
 
-    return preg_replace('/^' . self::rxClass($chars) . '+/u', '', $str);
+    return preg_replace('/^'.self::rxClass($chars).'+/u', '', $str);
   }
 
   /**
@@ -3738,7 +3738,7 @@ 
     if (is_array($what)) {
       /** @noinspection ForeachSourceInspection */
       foreach ($what as $item) {
-        $str = preg_replace('/(' . preg_quote($item, '/') . ')+/', $item, $str);
+        $str = preg_replace('/('.preg_quote($item, '/').')+/', $item, $str);
       }
     }
 
@@ -3840,7 +3840,7 @@ 
       return preg_replace('/[\pZ\pC]+$/u', '', $str);
     }
 
-    return preg_replace('/' . self::rxClass($chars) . '+$/u', '', $str);
+    return preg_replace('/'.self::rxClass($chars).'+$/u', '', $str);
   }
 
   /**
@@ -3855,7 +3855,7 @@ 
   {
     static $rxClassCache = array();
 
-    $cacheKey = $s . $class;
+    $cacheKey = $s.$class;
 
     if (isset($rxClassCache[$cacheKey])) {
       return $rxClassCache[$cacheKey];
@@ -3867,7 +3867,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)) {
@@ -3878,13 +3878,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).')';
     }
 
     $rxClassCache[$cacheKey] = $return;
@@ -3902,7 +3902,7 @@ 
     }
 
     foreach (self::$support as $utf8Support) {
-      echo $utf8Support . "\n<br>";
+      echo $utf8Support."\n<br>";
     }
   }
 
@@ -3936,7 +3936,7 @@ 
       $encoding = self::normalize_encoding($encoding);
     }
 
-    return '&#' . self::ord($char, $encoding) . ';';
+    return '&#'.self::ord($char, $encoding).';';
   }
 
   /**
@@ -3988,19 +3988,19 @@ 
           $ret[] = $str[$i];
         } elseif ((($str[$i] & "\xE0") === "\xC0") && isset($str[$i + 1])) {
           if (($str[$i + 1] & "\xC0") === "\x80") {
-            $ret[] = $str[$i] . $str[$i + 1];
+            $ret[] = $str[$i].$str[$i + 1];
 
             $i++;
           }
         } elseif ((($str[$i] & "\xF0") === "\xE0") && isset($str[$i + 2])) {
           if ((($str[$i + 1] & "\xC0") === "\x80") && (($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;
           }
         } elseif ((($str[$i] & "\xF8") === "\xF0") && isset($str[$i + 3])) {
           if ((($str[$i + 1] & "\xC0") === "\x80") && (($str[$i + 2] & "\xC0") === "\x80") && (($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;
           }
@@ -4012,7 +4012,7 @@ 
       $ret = array_chunk($ret, $length);
 
       return array_map(
-          function ($item) {
+          function($item) {
             return implode('', $item);
           }, $ret
       );
@@ -4111,7 +4111,7 @@ 
     foreach (self::$iconvEncoding 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;
       }
     }
@@ -4201,7 +4201,7 @@ 
       if ('' === $s .= '') {
         $s = '/^(?<=.)$/';
       } else {
-        $s = '/' . preg_quote($s, '/') . '/ui';
+        $s = '/'.preg_quote($s, '/').'/ui';
       }
     }
 
@@ -4259,7 +4259,7 @@ 
     }
 
     if (self::substr($str, $length - 1, 1) === ' ') {
-      return self::substr($str, 0, $length - 1) . $strAddOn;
+      return self::substr($str, 0, $length - 1).$strAddOn;
     }
 
     $str = self::substr($str, 0, $length);
@@ -4268,9 +4268,9 @@ 
     $new_str = implode(' ', $array);
 
     if ($new_str === '') {
-      $str = self::substr($str, 0, $length - 1) . $strAddOn;
+      $str = self::substr($str, 0, $length - 1).$strAddOn;
     } else {
-      $str = $new_str . $strAddOn;
+      $str = $new_str.$strAddOn;
     }
 
     return $str;
@@ -4325,7 +4325,7 @@ 
           $pre = '';
       }
 
-      return $pre . $str . $post;
+      return $pre.$str.$post;
     }
 
     return $str;
@@ -4455,7 +4455,7 @@ 
     }
 
     /** @noinspection PhpInternalEntityUsedInspection */
-    preg_match_all('/' . Grapheme::GRAPHEME_CLUSTER_RX . '/u', $str, $a);
+    preg_match_all('/'.Grapheme::GRAPHEME_CLUSTER_RX.'/u', $str, $a);
     $a = $a[0];
 
     if ($len === 1) {
@@ -4650,7 +4650,7 @@ 
   public static function strcmp($str1, $str2)
   {
     /** @noinspection PhpUndefinedClassInspection */
-    return $str1 . '' === $str2 . '' ? 0 : strcmp(
+    return $str1.'' === $str2.'' ? 0 : strcmp(
         \Normalizer::normalize($str1, \Normalizer::NFD),
         \Normalizer::normalize($str2, \Normalizer::NFD)
     );
@@ -4681,7 +4681,7 @@ 
       return null;
     }
 
-    if (preg_match('/^(.*?)' . self::rxClass($charList) . '/us', $str, $length)) {
+    if (preg_match('/^(.*?)'.self::rxClass($charList).'/us', $str, $length)) {
       /** @noinspection OffsetOperationsInspection */
       return self::strlen($length[1]);
     }
@@ -4888,7 +4888,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) {
@@ -4899,7 +4899,7 @@ 
       return \grapheme_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;
@@ -4961,7 +4961,7 @@ 
         &&
         self::$support['mbstring'] === false
     ) {
-      trigger_error('UTF8::strlen() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      trigger_error('UTF8::strlen() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$support['mbstring'] === true) {
@@ -5026,7 +5026,7 @@ 
    */
   public static function strnatcmp($str1, $str2)
   {
-    return $str1 . '' === $str2 . '' ? 0 : strnatcmp(self::strtonatfold($str1), self::strtonatfold($str2));
+    return $str1.'' === $str2.'' ? 0 : strnatcmp(self::strtonatfold($str1), self::strtonatfold($str2));
   }
 
   /**
@@ -5087,7 +5087,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]));
     } else {
       return false;
@@ -5154,7 +5154,7 @@ 
         &&
         self::$support['mbstring'] === false
     ) {
-      trigger_error('UTF8::strpos() without mbstring cannot handle "' . $encoding . '" encoding', E_USER_WARNING);
+      trigger_error('UTF8::strpos() without mbstring cannot handle "'.$encoding.'" encoding', E_USER_WARNING);
     }
 
     if (self::$support['mbstring'] === true) {
@@ -5356,7 +5356,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) {
@@ -5436,7 +5436,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) {
@@ -5496,7 +5496,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;
   }
 
   /**
@@ -5542,7 +5542,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) {
@@ -5559,7 +5559,7 @@ 
       }
     }
 
-    preg_match('/^(.*?)' . preg_quote($needle, '/') . '/us', $haystack, $match);
+    preg_match('/^(.*?)'.preg_quote($needle, '/').'/us', $haystack, $match);
 
     if (!isset($match[1])) {
       return false;
@@ -5823,7 +5823,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) {
@@ -5936,14 +5936,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);
   }
@@ -6190,7 +6190,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) {
@@ -6380,7 +6380,7 @@ 
 
       $bank = $ord >> 8;
       if (!array_key_exists($bank, (array)$UTF8_TO_ASCII)) {
-        $bankfile = __DIR__ . '/data/' . sprintf('x%02x', $bank) . '.php';
+        $bankfile = __DIR__.'/data/'.sprintf('x%02x', $bank).'.php';
         if (file_exists($bankfile)) {
           /** @noinspection PhpIncludeInspection */
           require $bankfile;
@@ -6502,40 +6502,40 @@ 
         if ($c1 >= "\xc0" & $c1 <= "\xdf") { // looks like 2 bytes UTF8
 
           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
             $cc1 = (chr(ord($c1) / 64) | "\xc0");
             $cc2 = ($c1 & "\x3f") | "\x80";
-            $buf .= $cc1 . $cc2;
+            $buf .= $cc1.$cc2;
           }
 
         } elseif ($c1 >= "\xe0" & $c1 <= "\xef") { // looks like 3 bytes UTF8
 
           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
             $cc1 = (chr(ord($c1) / 64) | "\xc0");
             $cc2 = ($c1 & "\x3f") | "\x80";
-            $buf .= $cc1 . $cc2;
+            $buf .= $cc1.$cc2;
           }
 
         } elseif ($c1 >= "\xf0" & $c1 <= "\xf7") { // looks like 4 bytes UTF8
 
           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
             $cc1 = (chr(ord($c1) / 64) | "\xc0");
             $cc2 = ($c1 & "\x3f") | "\x80";
-            $buf .= $cc1 . $cc2;
+            $buf .= $cc1.$cc2;
           }
 
         } else { // doesn't look like UTF8, but should be converted
           $cc1 = (chr(ord($c1) / 64) | "\xc0");
           $cc2 = (($c1 & "\x3f") | "\x80");
-          $buf .= $cc1 . $cc2;
+          $buf .= $cc1.$cc2;
         }
 
       } elseif (($c1 & "\xc0") === "\x80") { // needs conversion
@@ -6546,7 +6546,7 @@ 
         } else {
           $cc1 = (chr($ordC1 / 64) | "\xc0");
           $cc2 = (($c1 & "\x3f") | "\x80");
-          $buf .= $cc1 . $cc2;
+          $buf .= $cc1.$cc2;
         }
 
       } else { // it doesn't need conversion
@@ -6557,7 +6557,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
@@ -6611,7 +6611,7 @@ 
    */
   public static function ucfirst($str, $encoding = 'UTF-8', $cleanUtf8 = false)
   {
-    return self::strtoupper(self::substr($str, 0, 1, $encoding, $cleanUtf8), $encoding, $cleanUtf8) . self::substr($str, 1, null, $encoding, $cleanUtf8);
+    return self::strtoupper(self::substr($str, 0, 1, $encoding, $cleanUtf8), $encoding, $cleanUtf8).self::substr($str, 1, null, $encoding, $cleanUtf8);
   }
 
   /**
@@ -7088,7 +7088,7 @@ 
       return '';
     }
 
-    preg_match('/^\s*+(?:\S++\s*+){1,' . $words . '}/u', $str, $matches);
+    preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $str, $matches);
 
     if (
         !isset($matches[0])
@@ -7098,7 +7098,7 @@ 
       return $str;
     }
 
-    return self::rtrim($matches[0]) . $strAddOn;
+    return self::rtrim($matches[0]).$strAddOn;
   }
 
   /**
@@ -7166,7 +7166,7 @@ 
       $strReturn .= $break;
     }
 
-    return $strReturn . implode('', $chars);
+    return $strReturn.implode('', $chars);
   }
 
   /**