bug #37054 [String] Fix ellipsis of truncate when not using cut option (DuboisS)

nicolas-grekas · nicolas-grekas · commit 69c37c0335e3 · 2020-06-11T14:17:23.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [String] Fix ellipsis of truncate when not using cut option | Q | A | ------------- | --- | Branch? | 5.1  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | -  | License | MIT | Doc PR | -  [Since 5.1](https://symfony.com/blog/new-in-symfony-5-1-string-improvements#keep-the-last-word-when-truncating), we can use a cut option on truncate. But with this option, we don't have the expected behavior when the entire chain is returned. Currently: `u('Lorem Ipsum')->truncate(8, '…', false); // 'Lorem Ipsum...'` Instead of: `u('Lorem Ipsum')->truncate(8, '…', false); // 'Lorem Ipsum'` Thanks to @jmsche for his help. Commits ------- a2ee6c6 [String] Fix ellipsis of truncate when not using cut option
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],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,11 @@ public function truncate(int $length, string $ellipsis = '', bool $cut = true):`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`if (!$cut) {`
`646`		`- $length = $ellipsisLength + ($this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1) ?? $stringLength);`
	`646`	`+ if (null === $length = $this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1)) {`
	`647`	`+ return clone $this;`
	`648`	`+ }`
	`649`	`+`
	`650`	`+ $length += $ellipsisLength;`
`647`	`651`	`}`
`648`	`652`
`649`	`653`	`$str = $this->slice(0, $length - $ellipsisLength);`
Original file line number	Diff line number	Diff line change
`@@ -1450,6 +1450,7 @@ public static function provideTruncate()`
`1450`	`1450`	`['foobar...', 'foobar foo', 6, '...', false],`
`1451`	`1451`	`['foobar...', 'foobar foo', 7, '...', false],`
`1452`	`1452`	`['foobar foo...', 'foobar foo a', 10, '...', false],`
	`1453`	`+ ['foobar foo aar', 'foobar foo aar', 12, '...', false],`
`1453`	`1454`	`];`
`1454`	`1455`	`}`
`1455`	`1456`