Merge pull request #14 from juliangut/fix/unicode-emoji

Fix/unicode emoji
instasent · May 27, 2019 · d80bcbf · d80bcbf
2 parents ccdbf6d + 83f0cfa
commit d80bcbf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/SMSCounter.php b/SMSCounter.php
@@ -342,14 +342,20 @@ public function utf8ToUnicode($str)
             }
 
             if ($thisValue >= 128) {
-                if (count($values) == 0) {
-                    $lookingFor = ($thisValue < 224) ? 2 : 3;
+                if (count($values) === 0) {
+                    $lookingFor = 2;
+
+                    if ($thisValue >= 240) {
+                        $lookingFor = 4;
+                    } elseif ($thisValue >= 224) {
+                        $lookingFor = 3;
+                    }
                 }
 
                 $values[] = $thisValue;
 
-                if (count($values) == $lookingFor) {
-                    $number = ($lookingFor == 3) ?
+                if (count($values) === $lookingFor) {
+                    $number = ($lookingFor === 3) ?
                     (($values[0] % 16) * 4096) + (($values[1] % 64) * 64) + ($values[2] % 64) :
                     (($values[0] % 32) * 64) + ($values[1] % 64);
 

diff --git a/Tests/SMSCounterTest.php b/Tests/SMSCounterTest.php
@@ -180,6 +180,23 @@ public function testUnicode()
         $this->assertEquals($expected, $count);
     }
 
+    public function testUnicodeEmoji()
+    {
+        $text = '😎😎';
+
+        $smsCounter = new SMSCounter();
+        $count = $smsCounter->count($text);
+
+        $expected = new \stdClass();
+        $expected->encoding = SMSCounter::UTF16;
+        $expected->length = 2;
+        $expected->per_message = 70;
+        $expected->remaining = 68;
+        $expected->messages = 1;
+
+        $this->assertEquals($expected, $count);
+    }
+
     public function testRemoveNonGSMChars()
     {
         $text = 'áno-unicode-remaining` ñ';