[+]: add "UTF8::strlen_in_byte()"

[+]: fix typo in "UTF8::strpos()"
voku · Oct 8, 2017 · 162de9c · 162de9c
1 parent f678bdd
commit 162de9c
Showing 1 changed file with 24 additions and 25 deletions.
diff --git a/src/voku/helper/UTF8.php b/src/voku/helper/UTF8.php
@@ -2545,16 +2545,11 @@ public static function is_utf8($str, $strict = false)
       self::checkForSupport();
     }
 
-    if (self::$SUPPORT['mbstring_func_overload'] === true) {
-      $len = \mb_strlen($str, '8BIT');
-    } else {
-      $len = \strlen($str);
-    }
-
     if (self::$ORD === null) {
       self::$ORD = self::getData('ord');
     }
 
+    $len = self::strlen_in_byte($str);
     /** @noinspection ForeachInvariantsInspection */
     for ($i = 0; $i < $len; $i++) {
       $in = self::$ORD[$str[$i]];
@@ -3730,11 +3725,7 @@ public static function split($str, $length = 1, $cleanUtf8 = false)
         self::checkForSupport();
       }
 
-      if (self::$SUPPORT['mbstring_func_overload'] === true) {
-        $len = \mb_strlen($str, '8BIT');
-      } else {
-        $len = strlen($str);
-      }
+      $len = self::strlen_in_byte($str);
 
       /** @noinspection ForeachInvariantsInspection */
       for ($i = 0; $i < $len; $i++) {
@@ -4895,6 +4886,24 @@ public static function strlen($str, $encoding = 'UTF-8', $cleanUtf8 = false)
     return \mb_strlen($str, $encoding);
   }
 
+  /**
+   * Get string length in byte.
+   *
+   * @param string $str
+   *
+   * @return int
+   */
+  public static function strlen_in_byte($str)
+  {
+    if (self::$SUPPORT['mbstring_func_overload'] === true) {
+      $len = \mb_strlen($str, '8BIT');
+    } else {
+      $len = \strlen($str);
+    }
+
+    return $len;
+  }
+
   /**
    * Case insensitive string comparisons using a "natural order" algorithm.
    *
@@ -5061,8 +5070,8 @@ public static function strpos($haystack, $needle, $offset = 0, $encoding = 'UTF-
 
     if (
         $encoding !== 'UTF-8'
-        &
-        self::$SUPPORT['iconv'] === true
+        &&
+        self::$SUPPORT['iconv'] === false
         &&
         self::$SUPPORT['mbstring'] === false
     ) {
@@ -6663,12 +6672,7 @@ public static function to_utf8($str, $decodeHtmlEntityToUtf8 = false)
       self::checkForSupport();
     }
 
-    if (self::$SUPPORT['mbstring_func_overload'] === true) {
-      $max = \mb_strlen($str, '8BIT');
-    } else {
-      $max = strlen($str);
-    }
-
+    $max = self::strlen_in_byte($str);
     $buf = '';
 
     /** @noinspection ForeachInvariantsInspection */
@@ -7249,12 +7253,7 @@ public static function utf8_decode($str, $keepUtf8Chars = false)
 
     // save for later comparision
     $str_backup = $str;
-
-    if (self::$SUPPORT['mbstring_func_overload'] === true) {
-      $len = \mb_strlen($str, '8BIT');
-    } else {
-      $len = \strlen($str);
-    }
+    $len = self::strlen_in_byte($str);
 
     if (self::$ORD === null) {
       self::$ORD = self::getData('ord');