bug #52491 [String] Method toByteString conversion using iconv is unreachable (Vincentv92)

nicolas-grekas · nicolas-grekas · commit 0ff9ed4036f0 · 2023-11-09T09:19:52.000+01:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [String] Method toByteString conversion using iconv is unreachable | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues | Fix #52489  | License | MIT  Originating from original issue: >It is possible that nobody noticed that PHP 8.0 added ValueError exception https://www.php.net/manual/en/function.mb-convert-encoding so the code is not compatible with php >= 8.0 That seems indeed to be the case Commits ------- 08a27c2 [String] Method toByteString conversion using iconv is unreachable
diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php
@@ -577,8 +577,11 @@ public function toByteString(string $toEncoding = null): ByteString
         try {
             try {
                 $b->string = mb_convert_encoding($this->string, $toEncoding, 'UTF-8');
-            } catch (InvalidArgumentException $e) {
+            } catch (InvalidArgumentException|\ValueError $e) {
                 if (!\function_exists('iconv')) {
+                    if ($e instanceof \ValueError) {
+                        throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+                    }
                     throw $e;
                 }
 
diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
@@ -1583,4 +1583,22 @@ public static function provideWidth(): array
             [17, "\u{007f}\u{007f}f\u{001b}[0moo\u{0001}bar\u{007f}cccïf\u{008e}cy\u{0005}1", false], // f[0moobarcccïfcy1
         ];
     }
+
+    /**
+     * @dataProvider provideToByteString
+     */
+    public function testToByteString(string $origin, string $encoding)
+    {
+        $instance = static::createFromString($origin)->toByteString($encoding);
+        $this->assertInstanceOf(ByteString::class, $instance);
+    }
+
+    public static function provideToByteString(): array
+    {
+        return [
+            ['žsžsý', 'UTF-8'],
+            ['žsžsý', 'windows-1250'],
+            ['žsžsý', 'Windows-1252'],
+        ];
+    }
 }
