symfony
diff --git a/‎src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
+1-2Lines changed: 1 addition & 2 deletions b/‎src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+26-11Lines changed: 26 additions & 11 deletions b/‎src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+26-11Lines changed: 26 additions & 11 deletions
@@ -77,9 +77,8 @@ public function testAllTransliterator(string $locale)
 
     public function testTransliterateWithInvalidLocale()
     {
-        $this->iniSet('intl.use_exceptions', '1');
         $this->expectException(\IntlException::class);
-        $this->expectExceptionMessage('transliterator_create: unable to open ICU transliterator with id "invalid"');
+        $this->expectExceptionMessage('transliterator_create: unable to open ICU transliterator with id "Emoji: invalid"');
 
         EmojiTransliterator::create('invalid');
     }
 
@@ -14,41 +14,54 @@
 final class EmojiTransliterator extends \Transliterator
 {
     private array $map;
+    private \Transliterator $transliterator;
 
     public static function create(string $id, int $direction = self::FORWARD): ?\Transliterator
     {
         if (self::REVERSE === $direction) {
-            return \Transliterator::createFromRules('A > B')->createInverse();
+            // Create a failing reverse-transliterator to populate intl_get_error_*()
+            \Transliterator::createFromRules('A > B')->createInverse();
+
+            throw new \IntlException(intl_get_error_message(), intl_get_error_code());
         }
         $id = strtolower($id);
 
         if (!preg_match('/^[a-z0-9@_\\.\\-]*$/', $id)) {
-            return \Transliterator::create($id);
+            \Transliterator::create('Emoji: '.$id);
+
+            throw new \IntlException(intl_get_error_message(), intl_get_error_code());
         }
 
         if (!is_file(\dirname(__DIR__)."/Resources/data/transliterator/emoji/{$id}.php")) {
-            return \Transliterator::create($id);
+            // Populate intl_get_error_*()
+            \Transliterator::create('Emoji: '.$id);
+
+            throw new \IntlException(intl_get_error_message(), intl_get_error_code());
         }
 
+        static $maps;
+
+        // Create an instance of \Transliterator with a custom id; that's the only way
         $instance = unserialize(sprintf('O:%d:"%s":1:{s:2:"id";s:%d:"%s";}', \strlen(self::class), self::class, \strlen($id), $id));
-        $instance->map = require \dirname(__DIR__)."/Resources/data/transliterator/emoji/{$id}.php";
+        $instance->map = $maps[$id] ??= require \dirname(__DIR__)."/Resources/data/transliterator/emoji/{$id}.php";
 
         return $instance;
     }
 
     public function createInverse(): ?self
     {
+        // Create a failing reverse-transliterator to populate intl_get_error_*()
         return \Transliterator::createFromRules('A > B')->createInverse();
     }
 
     public function getErrorCode(): int|false
     {
-        return $this->transliterator?->getErrorCode() ?? false;
+        return $this->transliterator?->getErrorCode() ?? 0;
     }
 
     public function getErrorMessage(): string|false
     {
-        return $this->transliterator->getErrorMessage() ?? false;
+        return $this->transliterator?->getErrorMessage() ?? false;
     }
 
     public static function listIDs(): array|false
@@ -68,18 +81,20 @@ public static function listIDs(): array|false
 
     public function transliterate(string $string, int $start = 0, int $end = -1): string|false
     {
+        // Here we rely on intl to validate the $string, $start and $end arguments
+        // and to slice the string. Slicing is done by replacing the part if $string
+        // between $start and $end by a unique cookie that can be reliably used to
+        // identify which part of $string should be transliterated.
+
         static $cookie;
         static $transliterator;
 
         $cookie ??= md5(random_bytes(8));
-        $transliterator ??= \Transliterator::createFromRules('[:any:]* > '.$cookie);
+        $this->transliterator ??= clone $transliterator ??= \Transliterator::createFromRules('[:any:]* > '.$cookie);
 
-        if (false === $result = $transliterator->transliterate($string, $start, $end)) {
+        if (false === $result = $this->transliterator->transliterate($string, $start, $end)) {
             return false;
         }
-        if (4 > \strlen($string)) {
-            return $string;
-        }
         $map = $this->map;
 
         if ($cookie === $result) {
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,8 @@ public function testAllTransliterator(string $locale)`
`77`	`77`
`78`	`78`	`public function testTransliterateWithInvalidLocale()`
`79`	`79`	`{`
`80`		`- $this->iniSet('intl.use_exceptions', '1');`
`81`	`80`	`$this->expectException(\IntlException::class);`
`82`		`- $this->expectExceptionMessage('transliterator_create: unable to open ICU transliterator with id "invalid"');`
	`81`	`+ $this->expectExceptionMessage('transliterator_create: unable to open ICU transliterator with id "Emoji: invalid"');`
`83`	`82`
`84`	`83`	`EmojiTransliterator::create('invalid');`
`85`	`84`	`}`