Reuse original order

smnandre · smnandre · commit d0c5f9cb20ec · 2023-12-26T19:30:48.000+01:00
diff --git a/src/Symfony/Component/Intl/Resources/emoji/build.php b/src/Symfony/Component/Intl/Resources/emoji/build.php
@@ -68,15 +68,10 @@ public static function buildRules(array $emojisCodePoints): Generator
         $ignored = [];
         $mapsByLocale = [];
 
-        // Build a map of all emojis, ordered by code points length
-        $orderedEmojis = [...$emojisCodePoints];
-        uksort($orderedEmojis, fn ($a, $b) => mb_strlen($b, 'utf-8') <=> mb_strlen($a, 'utf-8'));
-        $emojiMap = array_fill_keys($orderedEmojis, null);
-
         foreach ($files as $file) {
             $locale = $file->getBasename('.xml');
 
-            $mapsByLocale[$locale] ??= [...$emojiMap];
+            $mapsByLocale[$locale] ??= [];
 
             $document = new DOMDocument();
             $document->loadXML(file_get_contents($file));
@@ -104,24 +99,29 @@ public static function buildRules(array $emojisCodePoints): Generator
                 if (!self::testEmoji($emoji, $locale, $emojiCodePoints)) {
                     continue;
                 }
-                $mapsByLocale[$locale][$emoji] = $name;
+                $codePointsCount = mb_strlen($emoji);
+                $mapsByLocale[$locale][$codePointsCount][$emoji] = $name;
             }
         }
 
         ksort($mapsByLocale);
 
-        foreach ($mapsByLocale as $locale => $localeMap) {
+        foreach ($mapsByLocale as $locale => $localeMaps) {
             $parentLocale = $locale;
 
             while (false !== $i = strrpos($parentLocale, '_')) {
                 $parentLocale = substr($parentLocale, 0, $i);
-                // Override parent map with child one, ensuring the result map contains
-                // all the emojis while keeping a shared order between locales
-                $localeMap = [...($mapsByLocale[$parentLocale] ?? []), ...array_filter($localeMap)];
+                $parentMaps = $mapsByLocale[$parentLocale] ?? [];
+                foreach ($parentMaps as $codePointsCount => $parentMap) {
+                    // Ensuring the result map contains all the emojis from the parent map
+                    // if not already defined by the current locale
+                    $localeMaps[$codePointsCount] = [...$parentMap, ...$localeMaps[$codePointsCount] ?? []];
+                }
             }
 
-            if ($localeMap = [...array_filter($localeMap)]) {
-                yield strtolower("emoji-$locale") => $localeMap;
+            // Skip locales without any emoji
+            if ($localeRules = self::createRules($localeMaps)) {
+                yield strtolower("emoji-$locale") => $localeRules;
             }
         }
     }
