[String] Fix ellipsis of truncate when not using cut option

symfony · Jun 11, 2020 · a2ee6c6 · a2ee6c6
1 parent e5b5d9e
commit a2ee6c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php
@@ -643,7 +643,11 @@ public function truncate(int $length, string $ellipsis = '', bool $cut = true):
         }
 
         if (!$cut) {
-            $length = $ellipsisLength + ($this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1) ?? $stringLength);
+            if (null === $length = $this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1)) {
+                return clone $this;
+            }
+
+            $length += $ellipsisLength;
         }
 
         $str = $this->slice(0, $length - $ellipsisLength);

diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
@@ -1450,6 +1450,7 @@ public static function provideTruncate()
             ['foobar...', 'foobar foo', 6, '...', false],
             ['foobar...', 'foobar foo', 7, '...', false],
             ['foobar foo...', 'foobar foo a', 10, '...', false],
+            ['foobar foo aar', 'foobar foo aar', 12, '...', false],
         ];
     }