update generation script and map/regex files

closes #4

build/generate-map.php

@@ -8,13 +8,25 @@
 $map = [];
 
 foreach($emoji_data as $emoji) {
-  $map[$emoji['unified']] = $emoji['short_name'];
-  foreach($emoji['variations'] as $var) {
-    $map[$var] = $emoji['short_name'];
+  $short_name = $emoji['short_name'];
+
+  // Slack changed flag-de shortname to de, but we still want to keep flag-de
+  // Most of the flag emojis are still flag-*, they only changed some of them
+  if(isset($emoji['short_names']) && in_array('flag-'.$short_name, $emoji['short_names'])) {
+    $short_name = 'flag-' . $short_name;
+  }
+
+  $map[$emoji['unified']] = $short_name;
+
+  if(isset($emoji['variations'])) {
+    foreach($emoji['variations'] as $var) {
+      $map[$var] = $short_name;
+    }
   }
-  if(array_key_exists('skin_variations', $emoji)) {
+
+  if(isset($emoji['skin_variations'])) {
     foreach($emoji['skin_variations'] as $key=>$var) {
-      $map[$emoji['unified'] . '-' . $key] = $emoji['short_name'];
+      $map[$var['unified']] = $short_name;
     }
   }
 }

tests/EmojiDetectTest.php

@@ -60,7 +60,7 @@ public function testDetectSymbolWithModifier() {
   }
 
   public function testDetectCharacterSymbol() {
-    $string = '™';
+    $string = '™️';
     $emoji = Emoji\detect_emoji($string);
     $this->assertEquals(1, count($emoji));
     $this->assertEquals('tm', $emoji[0]['short_name']);
@@ -87,4 +87,20 @@ public function testDetectInText() {
     $this->assertEquals('tada', $emoji[0]['short_name']);
   }
 
+  public function testDetectGenderModifier() {
+    // Added in June 2017 http://www.unicode.org/Public/emoji/5.0/emoji-test.txt
+    $string = 'guardswoman 💂‍♀️';
+    $emoji = Emoji\detect_emoji($string);
+    $this->assertEquals(1, count($emoji));
+    $this->assertEquals('female-guard', $emoji[0]['short_name']);
+  }
+
+  public function testDetectGenderAndSkinToneModifier() {
+    // Added in June 2017 http://www.unicode.org/Public/emoji/5.0/emoji-test.txt
+    $string = 'guardswoman 💂🏼‍♀️';
+    $emoji = Emoji\detect_emoji($string);
+    $this->assertEquals(1, count($emoji));
+    $this->assertEquals('female-guard', $emoji[0]['short_name']);
+  }
+
 }