voku / portable-utf8

src/voku/helper/UTF8.php

Doc Comments +2 added lines, -2 removed lines

@@ -1703,7 +1703,7 @@ 
    * @param string $encodingLabel ISO-8859-1 || UTF-8
    * @param string $str
    *
-   * @return false|string Will return false on error.
+   * @return string Will return false on error.
    */
   public static function encode($encodingLabel, $str)
   {
@@ -4843,7 +4843,7 @@ 
    * @param int    $start
    * @param int    $len
    *
-   * @return int|null
+   * @return integer
    */
   public static function strspn($s, $mask, $start = 0, $len = 2147483647)
   {

Spacing +44 added lines, -44 removed lines

@@ -364,7 +364,7 @@ 
   public static function add_bom_to_string($str)
   {
     if (!self::is_bom(substr($str, 0, 3))) {
-      $str = self::bom() . $str;
+      $str = self::bom().$str;
     }
 
     return $str;
@@ -1684,7 +1684,7 @@ 
     self::checkForSupport();
 
     return mb_convert_encoding(
-        '&#x' . dechex($code) . ';',
+        '&#x'.dechex($code).';',
         'UTF-8',
         'HTML-ENTITIES'
     );
@@ -1902,7 +1902,7 @@ 
           if ($var[0] >= "\x80" && isset($n[0], $leading_combining[0]) && preg_match('/^\p{Mn}/u', $var)) {
             // Prevent leading combining chars
             // for NFC-safe concatenations.
-            $var = $leading_combining . $var;
+            $var = $leading_combining.$var;
           }
         }
         break;
@@ -2169,7 +2169,7 @@ 
    */
   protected static function getData($file)
   {
-    $file = __DIR__ . '/data/' . $file . '.ser';
+    $file = __DIR__.'/data/'.$file.'.ser';
     if (file_exists($file)) {
       return unserialize(file_get_contents($file));
     } else {
@@ -2634,9 +2634,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 '';
@@ -3173,7 +3173,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);
   }
 
   /**
@@ -3561,7 +3561,7 @@ 
 
     if (is_array($what)) {
       foreach ($what as $item) {
-        $str = preg_replace('/(' . preg_quote($item, '/') . ')+/', $item, $str);
+        $str = preg_replace('/('.preg_quote($item, '/').')+/', $item, $str);
       }
     }
 
@@ -3660,7 +3660,7 @@ 
   {
     static $rxClassCache = array();
 
-    $cacheKey = $s . $class;
+    $cacheKey = $s.$class;
 
     if (isset($rxClassCache[$cacheKey])) {
       return $rxClassCache[$cacheKey];
@@ -3670,7 +3670,7 @@ 
 
     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)) {
@@ -3680,12 +3680,12 @@ 
       }
     }
 
-    $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;
@@ -3699,7 +3699,7 @@ 
   public static function showSupport()
   {
     foreach (self::$support as $utf8Support) {
-      echo $utf8Support . "\n<br>";
+      echo $utf8Support."\n<br>";
     }
   }
 
@@ -3716,7 +3716,7 @@ 
       return '';
     }
 
-    return '&#' . self::ord($chr) . ';';
+    return '&#'.self::ord($chr).';';
   }
 
   /**
@@ -3765,19 +3765,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;
           }
@@ -3897,7 +3897,7 @@ 
       if ('' === $s .= '') {
         $s = '/^(?<=.)$/';
       } else {
-        $s = '/' . preg_quote($s, '/') . '/ui';
+        $s = '/'.preg_quote($s, '/').'/ui';
       }
     }
 
@@ -3929,7 +3929,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);
@@ -3938,9 +3938,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;
@@ -3986,7 +3986,7 @@ 
           $pre = '';
       }
 
-      return $pre . $input . $post;
+      return $pre.$input.$post;
     }
 
     return $input;
@@ -4121,7 +4121,7 @@ 
         $a[] = grapheme_extract($str, 1, GRAPHEME_EXTR_COUNT, $p, $p);
       }
     } else {
-      preg_match_all('/' . Grapheme::GRAPHEME_CLUSTER_RX . '/u', $str, $a);
+      preg_match_all('/'.Grapheme::GRAPHEME_CLUSTER_RX.'/u', $str, $a);
       $a = $a[0];
     }
 
@@ -4262,7 +4262,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 */
           include $bankfile;
@@ -4342,7 +4342,7 @@ 
    */
   public static function strcmp($str1, $str2)
   {
-    return $str1 . '' === $str2 . '' ? 0 : strcmp(
+    return $str1.'' === $str2.'' ? 0 : strcmp(
         Normalizer::normalize($str1, Normalizer::NFD),
         Normalizer::normalize($str2, Normalizer::NFD)
     );
@@ -4371,7 +4371,7 @@ 
     }
 
     /* @var $len array */
-    if (preg_match('/^(.*?)' . self::rxClass($charlist) . '/us', $str, $len)) {
+    if (preg_match('/^(.*?)'.self::rxClass($charlist).'/us', $str, $len)) {
       return self::strlen($len[1]);
     } else {
       return self::strlen($str);
@@ -4568,7 +4568,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));
   }
 
   /**
@@ -4611,7 +4611,7 @@ 
    */
   public static function strpbrk($s, $charList)
   {
-    if (preg_match('/' . self::rxClass($charList) . '/us', $s, $m)) {
+    if (preg_match('/'.self::rxClass($charList).'/us', $s, $m)) {
       return substr($s, strpos($s, $m[0]));
     } else {
       return false;
@@ -4880,7 +4880,7 @@ 
       $s = self::substr($s, $start, $len);
     }
 
-    return preg_match('/^' . self::rxClass($mask) . '+/u', $s, $s) ? self::strlen($s[0]) : 0;
+    return preg_match('/^'.self::rxClass($mask).'+/u', $s, $s) ? self::strlen($s[0]) : 0;
   }
 
   /**
@@ -5287,7 +5287,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) {
@@ -5496,40 +5496,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
@@ -5540,7 +5540,7 @@ 
         } else {
           $cc1 = (chr($ordC1 / 64) | "\xc0");
           $cc2 = (($c1 & "\x3f") | "\x80");
-          $buf .= $cc1 . $cc2;
+          $buf .= $cc1.$cc2;
         }
 
       } else { // it doesn't need conversion
@@ -5553,7 +5553,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
@@ -5562,7 +5562,7 @@ 
     // decode UTF-8 codepoints
     $buf = preg_replace_callback(
         '/&#\d{2,4};/',
-        function ($match) {
+        function($match) {
           return mb_convert_encoding($match[0], 'UTF-8', 'HTML-ENTITIES');
         },
         $buf
@@ -5633,7 +5633,7 @@ 
    */
   public static function ucfirst($str)
   {
-    return self::strtoupper(self::substr($str, 0, 1)) . self::substr($str, 1);
+    return self::strtoupper(self::substr($str, 0, 1)).self::substr($str, 1);
   }
 
   /**
@@ -6076,7 +6076,7 @@ 
 
     $words = (int)$words;
 
-    preg_match('/^\s*+(?:\S++\s*+){1,' . $words . '}/u', $str, $matches);
+    preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $str, $matches);
 
     if (
         !isset($matches[0])
@@ -6086,7 +6086,7 @@ 
       return $str;
     }
 
-    return self::rtrim($matches[0]) . $strAddOn;
+    return self::rtrim($matches[0]).$strAddOn;
   }
 
   /**
@@ -6153,7 +6153,7 @@ 
       $str .= $break;
     }
 
-    return $str . implode('', $chars);
+    return $str.implode('', $chars);
   }
 
   /**

src/voku/helper/Bootup.php

Spacing +5 added lines, -5 removed lines

@@ -91,7 +91,7 @@ 
     if (!preg_match('//u', urldecode($uri))) {
       $uri = preg_replace_callback(
           '/[\x80-\xFF]+/',
-          function ($m) {
+          function($m) {
             return urlencode($m[0]);
           },
           $uri
@@ -99,7 +99,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
@@ -109,8 +109,8 @@ 
         // Use ob_start() to buffer content and avoid problem of headers already sent...
         if (headers_sent() === false) {
           $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();
         }
       }
@@ -197,7 +197,7 @@ 
       if ($s[0] >= "\x80" && isset($n[0], $leading_combining[0]) && preg_match('/^\p{Mn}/u', $s)) {
         // Prevent leading combining chars
         // for NFC-safe concatenations.
-        $s = $leading_combining . $s;
+        $s = $leading_combining.$s;
       }
     }