fix truncating in WordBefore mode with length after last space

xabbuh · xabbuh · commit df4b23d1b6ce · 2024-07-19T15:10:40.000+02:00
diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php
@@ -620,7 +620,7 @@ public function truncate(int $length, string $ellipsis = '', bool|TruncateMode $
         }
 
         $desiredLength = $length;
-        if (TruncateMode::WordAfter === $cut || TruncateMode::WordBefore === $cut || !$cut) {
+        if (TruncateMode::WordAfter === $cut || !$cut) {
             if (null === $length = $this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1)) {
                 return clone $this;
             }
diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
@@ -1536,12 +1536,24 @@ public static function provideTruncate(): array
             ['foobar foo aar', 'foobar foo aar', 12, '...', false],
             ['foobar...', 'foobar foo', 6, '...', TruncateMode::WordAfter],
             ['foobar...', 'foobar foo', 7, '...', TruncateMode::WordAfter],
+            ['foobar...', 'foobar foo a', 10, '...', TruncateMode::Char],
+            ['foobar...', 'foobar foo a', 10, '...', TruncateMode::WordBefore],
             ['foobar foo...', 'foobar foo a', 10, '...', TruncateMode::WordAfter],
+            ['foobar fo...', 'foobar foo aar', 12, '...', TruncateMode::Char],
             ['foobar foo aar', 'foobar foo aar', 12, '...', TruncateMode::WordAfter],
+            ['foobar...', 'foobar foo aar', 12, '...', TruncateMode::WordBefore],
+            ['foobar foo', 'foobar foo aar', 10, '', TruncateMode::Char],
             ['foobar foo', 'foobar foo aar', 10, '', TruncateMode::WordBefore],
+            ['foobar foo', 'foobar foo aar', 10, '', TruncateMode::WordAfter],
+            ['foobar...', 'foobar foo aar', 10, '...', TruncateMode::Char],
             ['foobar...', 'foobar foo aar', 10, '...', TruncateMode::WordBefore],
+            ['foobar foo...', 'foobar foo aar', 10, '...', TruncateMode::WordAfter],
+            ['Lorem ipsum do', 'Lorem ipsum dolor sit amet', 14, '', TruncateMode::Char],
             ['Lorem ipsum', 'Lorem ipsum dolor sit amet', 14, '', TruncateMode::WordBefore],
+            ['Lorem ipsum dolor', 'Lorem ipsum dolor sit amet', 14, '', TruncateMode::WordAfter],
+            ['Lorem i...', 'Lorem ipsum dolor sit amet', 10, '...', TruncateMode::Char],
             ['Lorem...', 'Lorem ipsum dolor sit amet', 10, '...', TruncateMode::WordBefore],
+            ['Lorem ipsum...', 'Lorem ipsum dolor sit amet', 10, '...', TruncateMode::WordAfter],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ public function truncate(int $length, string $ellipsis = '', bool\|TruncateMode $`
`620`	`620`	`}`
`621`	`621`
`622`	`622`	`$desiredLength = $length;`
`623`		`- if (TruncateMode::WordAfter === $cut \|\| TruncateMode::WordBefore === $cut \|\| !$cut) {`
	`623`	`+ if (TruncateMode::WordAfter === $cut \|\| !$cut) {`
`624`	`624`	`if (null === $length = $this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1)) {`
`625`	`625`	`return clone $this;`
`626`	`626`	`}`