Killed 2 out of 3 mbstring uses.

thephpleague · Dec 26, 2014 · 82421eb · 82421eb
1 parent 3f7b787
commit 82421eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Util/Html5Entities.php b/src/Util/Html5Entities.php
@@ -2278,9 +2278,9 @@ public static function fromDecimal($number)
     {
         $entity = '&#' . $number . ';';
 
-        $converted = mb_decode_numericentity($entity, array(0x0, 0x2FFFF, 0, 0xFFFF), 'UTF-8');
+        $converted = html_entity_decode($entity, ENT_COMPAT, 'UTF-8');
 
-        if ($converted == $entity) {
+        if ($converted === $entity) {
             return self::fromHex('fffd');
         }
 

diff --git a/src/Util/TextHelper.php b/src/Util/TextHelper.php
@@ -36,7 +36,8 @@ public static function detabLine($string)
 
         foreach ($parts as $part) {
             // Calculate number of spaces; insert them followed by the non-tab contents
-            $amount = 4 - mb_strlen($line, 'UTF-8') % 4;
+            $lineLength = preg_match_all('(.)su', $line);
+            $amount = 4 - $lineLength % 4;
             $line .= str_repeat(' ', $amount) . $part;
         }