From c1188a08697794f43ff6361f1a1f72db67268b04 Mon Sep 17 00:00:00 2001
From: Mauro Cassani <maurocassani1978@gmail.com>
Date: Fri, 22 Dec 2023 16:35:50 +0100
Subject: [PATCH] Emoji fix

---
 src/Utils/Emoji.php |  8 ++++++--
 tests/EmojiTest.php | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/Utils/Emoji.php b/src/Utils/Emoji.php
index e3913e7..624825c 100644
--- a/src/Utils/Emoji.php
+++ b/src/Utils/Emoji.php
@@ -6897,7 +6897,7 @@ class Emoji {
             '🏼'  => '&#127996;',
             '🏽'  => '&#127997;',
             '🏾'  => '&#127998;',
-            '🟿'  => '&#127999;',
+            '🏿'  => '&#127999;',
             '️'  => '&#65039;',
             '⃣'  => '&#8419;',
             '𝐀'  => '&#119808;',
@@ -7401,7 +7401,7 @@ class Emoji {
             '􏰀'  => '&#1113088;',
             '🛼'  => '&#128764;',
             '🥷'  => '&#129399;',
-            '🤌'  => '&#127996;',
+            '🤌'  => '&#129292;',
             "󠅸"  => '&#917880;',  // invisible glyph
             '󠄀'  => '&#917760;',
             '󠇡'  => '&#917985;',
@@ -7463,6 +7463,10 @@ public static function toEntity( $str ) {
         return $str;
     }
 
+    /**
+     * @param $str
+     * @return string
+     */
     public static function toEmoji( $str ) {
         self::generateReverseMap();
         preg_match_all( '/&#[0-9a-fA-F]+;/', $str, $emoji_entity_list, PREG_PATTERN_ORDER );
diff --git a/tests/EmojiTest.php b/tests/EmojiTest.php
index 9fa4e07..2aadde5 100644
--- a/tests/EmojiTest.php
+++ b/tests/EmojiTest.php
@@ -124,4 +124,28 @@ public function entityToEmojiTest() {
         $this->assertEquals( 'Questo ✕ è un emoji a croce 􀅖🪙 manina 👋🏻', Emoji::toEmoji( $segment ) );
     }
 
+    /**
+     * This test is performed on the same emoji (flexed arm) in different shades
+     *
+     * @test
+     */
+    public function canEncodeAndDecodeDifferentShades()
+    {
+        $emojis = [
+            '🤌',
+            '💪🏻',
+            '💪🏽',
+            '💪🏾',
+            '💪🏿',
+            '💪🏼'
+        ];
+
+        foreach ($emojis as $i => $emoji){
+
+            $entity = Emoji::toEntity($emoji);
+            $toEmoji = Emoji::toEmoji($entity);
+
+            $this->assertEquals($emojis[$i], $toEmoji);
+        }
+    }
 }
\ No newline at end of file