bug #47083 [Intl] Fix EmojiTransliterator on PHP 8.2 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 5bf31c57c3d0 · 2022-07-28T10:21:08.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [Intl] Fix EmojiTransliterator on PHP 8.2 | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Requires php/php-src#9167 Commits ------- c1df6da [Intl] Fix EmojiTransliterator on PHP 8.2
diff --git a/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php b/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
@@ -18,8 +18,15 @@
 /**
  * @requires extension intl
  */
-final class EmojiTransliteratorTest extends TestCase
+class EmojiTransliteratorTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        if (\PHP_VERSION_ID >= 80200 && !(new \ReflectionProperty(\Transliterator::class, 'id'))->isReadOnly()) {
+            $this->markTestSkipped('Waiting for https://github.com/php/php-src/pull/9167 to be merged');
+        }
+    }
+
     public function provideTransliterateTests(): iterable
     {
         yield [
diff --git a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
@@ -11,10 +11,29 @@
 
 namespace Symfony\Component\Intl\Transliterator;
 
-final class EmojiTransliterator extends \Transliterator
-{
-    private const QUICK_CHECK = "\xE2\xE3\xF0";
+if (\PHP_VERSION_ID >= 80200) {
+    final class EmojiTransliterator extends \Transliterator
+    {
+        use EmojiTransliteratorTrait;
+
+        private const QUICK_CHECK = "\xE2\xE3\xF0";
+
+        public readonly string $id;
+    }
+} else {
+    final class EmojiTransliterator extends \Transliterator
+    {
+        use EmojiTransliteratorTrait;
+
+        private const QUICK_CHECK = "\xE2\xE3\xF0";
+    }
+}
 
+/**
+ * @internal
+ */
+trait EmojiTransliteratorTrait
+{
     private array $map;
     private \Transliterator $transliterator;
 
@@ -37,7 +56,14 @@ public static function create(string $id, int $direction = self::FORWARD): ?\Tra
         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));
+        if (\PHP_VERSION_ID >= 80200) {
+            static $newInstance;
+            $instance = ($newInstance ??= (new \ReflectionClass(self::class))->newInstanceWithoutConstructor(...))();
+            $instance->id = $id;
+        } else {
+            $instance = unserialize(sprintf('O:%d:"%s":1:{s:2:"id";s:%d:"%s";}', \strlen(self::class), self::class, \strlen($id), $id));
+        }
+
         $instance->map = $maps[$id] ??= require \dirname(__DIR__)."/Resources/data/transliterator/emoji/{$id}.php";
 
         return $instance;
@@ -95,10 +121,6 @@ public function transliterate(string $string, int $start = 0, int $end = -1): st
             return false;
         }
 
-        if ($cookie === $result) {
-            return \strlen($string) === strcspn($string, self::QUICK_CHECK) ? $string : strtr($string, $this->map);
-        }
-
         $parts = explode($cookie, $result);
         $start = \strlen($parts[0]);
         $length = -\strlen($parts[1]) ?: null;
