bug symfony#47010 [String] Fix width method in AbstractUnicodeString (TBoileau)

fabpot · fabpot · commit c02b7049d723 · 2022-07-24T18:15:30.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [String] Fix `width` method in `AbstractUnicodeString` | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#47004 | License | MIT | Doc PR | none - bugfix This PR ensures that the `width` method of `AbstractUnicodeString` returns the width and not the length of the text. Commits ------- 8150678 [String] Fix `width` method in `AbstractUnicodeString`
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -498,8 +498,11 @@ public function width(bool $ignoreAnsiDecoration = true): int
                 )|[\p{Cc}\x7F]++)/xu', '', $s);
             }
 
-            // Non printable characters have been dropped, so wcswidth cannot logically return -1.
-            $width += $this->wcswidth($s);
+            $lineWidth = $this->wcswidth($s);
+
+            if ($lineWidth > $width) {
+                $width = $lineWidth;
+            }
         }
 
         return $width;
diff --git a/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php b/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php
@@ -15,6 +15,19 @@
 
 abstract class AbstractUnicodeTestCase extends AbstractAsciiTestCase
 {
+    public static function provideWidth(): array
+    {
+        return array_merge(
+            parent::provideWidth(),
+            [
+                [14, '<<<END
+This is a
+multiline text
+END'],
+            ]
+        );
+    }
+
     public function testCreateFromStringWithInvalidUtf8Input()
     {
         $this->expectException(InvalidArgumentException::class);

Original file line number	Diff line number	Diff line change
`@@ -498,8 +498,11 @@ public function width(bool $ignoreAnsiDecoration = true): int`
`498`	`498`	`)\|[\p{Cc}\x7F]++)/xu', '', $s);`
`499`	`499`	`}`
`500`	`500`
`501`		`- // Non printable characters have been dropped, so wcswidth cannot logically return -1.`
`502`		`- $width += $this->wcswidth($s);`
	`501`	`+ $lineWidth = $this->wcswidth($s);`
	`502`	`+`
	`503`	`+ if ($lineWidth > $width) {`
	`504`	`+ $width = $lineWidth;`
	`505`	`+ }`
`503`	`506`	`}`
`504`	`507`
`505`	`508`	`return $width;`