bug #60340 [String] fix EmojiTransliterator return type compatibility with PHP 8.5 (xabbuh)

fabpot · fabpot · commit 6b4f603edbd2 · 2025-05-04T14:26:50.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [String] fix EmojiTransliterator return type compatibility with PHP 8.5 | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT see php/php-src#18470 Commits ------- 19df3db fix EmojiTransliterator return type compatibility with PHP 8.5
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -8923,6 +8923,23 @@ diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface
 -    public function write(string $path, string $locale, mixed $data);
 +    public function write(string $path, string $locale, mixed $data): void;
  }
+diff --git a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+--- a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
++++ b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+@@ -74,5 +74,5 @@ if (!class_exists(\Transliterator::class)) {
+          */
+         #[\ReturnTypeWillChange]
+-        public function getErrorCode(): int|false
++        public function getErrorCode(): int
+         {
+             return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;
+@@ -83,5 +83,5 @@ if (!class_exists(\Transliterator::class)) {
+          */
+         #[\ReturnTypeWillChange]
+-        public function getErrorMessage(): string|false
++        public function getErrorMessage(): string
+         {
+             return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';
 diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
 --- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php
 +++ b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
diff --git a/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php b/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
@@ -189,6 +189,6 @@ public function testGetErrorMessageWithUninitializedTransliterator()
     {
         $transliterator = EmojiTransliterator::create('emoji-en');
 
-        $this->assertFalse($transliterator->getErrorMessage());
+        $this->assertSame('', $transliterator->getErrorMessage());
     }
 }
diff --git a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
@@ -70,14 +70,22 @@ public function createInverse(): self
             return self::create($this->id, self::REVERSE);
         }
 
+        /**
+         * @return int
+         */
+        #[\ReturnTypeWillChange]
         public function getErrorCode(): int|false
         {
             return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;
         }
 
+        /**
+         * @return string
+         */
+        #[\ReturnTypeWillChange]
         public function getErrorMessage(): string|false
         {
-            return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : false;
+            return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';
         }
 
         public static function listIDs(): array

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,6 @@ public function testGetErrorMessageWithUninitializedTransliterator()`
`189`	`189`	`{`
`190`	`190`	`$transliterator = EmojiTransliterator::create('emoji-en');`
`191`	`191`
`192`		`- $this->assertFalse($transliterator->getErrorMessage());`
	`192`	`+ $this->assertSame('', $transliterator->getErrorMessage());`
`193`	`193`	`}`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,14 +70,22 @@ public function createInverse(): self`
`70`	`70`	`return self::create($this->id, self::REVERSE);`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ /**`
	`74`	`+ * @return int`
	`75`	`+ */`
	`76`	`+ #[\ReturnTypeWillChange]`
`73`	`77`	`public function getErrorCode(): int\|false`
`74`	`78`	`{`
`75`	`79`	`return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;`
`76`	`80`	`}`
`77`	`81`
	`82`	`+ /**`
	`83`	`+ * @return string`
	`84`	`+ */`
	`85`	`+ #[\ReturnTypeWillChange]`
`78`	`86`	`public function getErrorMessage(): string\|false`
`79`	`87`	`{`
`80`		`- return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : false;`
	`88`	`+ return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';`
`81`	`89`	`}`
`82`	`90`
`83`	`91`	`public static function listIDs(): array`