Skip to content

New wordwrap method #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2018
Merged

New wordwrap method #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions src/Util/StringUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,32 @@ class StringUtil
* Minimal multi-byte wordwrap implementation
* which also takes break length into consideration
*/
public static function wordwrap(string $str, int $width, string $break = "\n") : string
public static function wordwrap(string $string, int $width, string $break = "\n") : string
{
$length = 0;
return implode(' ', array_map(function ($word) use (&$length, $width, $break) {
$length += (mb_strlen($word) + 1);

if ($length > $width) {
$word = sprintf('%s%s', $break, $word);
$length = mb_strlen($word);
return $word;
}

return $word;
}, explode(' ', $str)));
return implode(
$break,
array_map(function (string $line) use ($width, $break) {
$line = rtrim($line);
if (mb_strlen($line) <= $width) {
return $line;
}

$words = explode(' ', $line);
$line = '';
$actual = '';
foreach ($words as $word) {
if (mb_strlen($actual . $word) <= $width) {
$actual .= $word . ' ';
} else {
if ($actual !== '') {
$line .= rtrim($actual) . $break;
}
$actual = $word . ' ';
}
}
return $line . trim($actual);
}, explode($break, $string))
);
}

public static function stripAnsiEscapeSequence(string $str) : string
Expand Down
5 changes: 2 additions & 3 deletions test/MenuItem/MenuMenuItemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@ public function testGetRowsWithMultipleLines() : void
$item = new MenuMenuItem('LONG ITEM LINE', $subMenu);
$this->assertEquals(
[
" LONG ",
" ITEM ",
" LINE"
" LONG ITEM",
" LINE",
],
$item->getRows($menuStyle)
);
Expand Down
5 changes: 2 additions & 3 deletions test/MenuItem/SelectableItemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,8 @@ public function testGetRowsWithMultipleLinesWithItemExtra() : void
}, true);
$this->assertEquals(
[
" LONG [EXTRA]",
" ITEM ",
" LINE"
" LONG ITEM [EXTRA]",
" LINE",
],
$item->getRows($menuStyle)
);
Expand Down
2 changes: 1 addition & 1 deletion test/MenuItem/StaticItemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function testGetRowsWithContentWhichDoesNotFitOnOneLineIsWrapped() : void
$item = new StaticItem('CONTENT 1 LINE');

$this->assertEquals(
['CONTENT 1 ', 'LINE'],
['CONTENT 1', 'LINE'],
$item->getRows($menuStyle)
);
}
Expand Down
42 changes: 21 additions & 21 deletions test/Util/StringUtilTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public function testItWrapsAsExpectedTo80Length() : void
{

$result = StringUtil::wordwrap($this->dummyText, 80);
$expected = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor \n" .
"incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis \n" .
"nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. \n" .
"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu \n" .
"fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in \n" .
$expected = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor\n" .
"incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis\n" .
"nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n" .
"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu\n" .
"fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in\n" .
"culpa qui officia deserunt mollit anim id est laborum";

self::assertEquals($expected, $result);
Expand All @@ -42,13 +42,13 @@ public function testItWrapsAsExpectedTo60Length() : void
{

$result = StringUtil::wordwrap($this->dummyText, 60);
$expected = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, \n" .
"sed do eiusmod tempor incididunt ut labore et dolore magna \n" .
"aliqua. Ut enim ad minim veniam, quis nostrud exercitation \n" .
"ullamco laboris nisi ut aliquip ex ea commodo consequat. \n" .
"Duis aute irure dolor in reprehenderit in voluptate velit \n" .
"esse cillum dolore eu fugiat nulla pariatur. Excepteur sint \n" .
"occaecat cupidatat non proident, sunt in culpa qui officia \n" .
$expected = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed\n" .
"do eiusmod tempor incididunt ut labore et dolore magna\n" .
"aliqua. Ut enim ad minim veniam, quis nostrud exercitation\n" .
"ullamco laboris nisi ut aliquip ex ea commodo consequat.\n" .
"Duis aute irure dolor in reprehenderit in voluptate velit\n" .
"esse cillum dolore eu fugiat nulla pariatur. Excepteur sint\n" .
"occaecat cupidatat non proident, sunt in culpa qui officia\n" .
"deserunt mollit anim id est laborum";

self::assertEquals($expected, $result);
Expand All @@ -58,13 +58,13 @@ public function testItCanUseACustomBreakCharacter() : void
{
$result = StringUtil::wordwrap($this->dummyText, 60, 'H');

$expected = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, H" .
"sed do eiusmod tempor incididunt ut labore et dolore magna H" .
"aliqua. Ut enim ad minim veniam, quis nostrud exercitation H" .
"ullamco laboris nisi ut aliquip ex ea commodo consequat. H" .
"Duis aute irure dolor in reprehenderit in voluptate velit H" .
"esse cillum dolore eu fugiat nulla pariatur. Excepteur sint H" .
"occaecat cupidatat non proident, sunt in culpa qui officia H" .
$expected = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sedH" .
"do eiusmod tempor incididunt ut labore et dolore magnaH" .
"aliqua. Ut enim ad minim veniam, quis nostrud exercitationH" .
"ullamco laboris nisi ut aliquip ex ea commodo consequat.H" .
"Duis aute irure dolor in reprehenderit in voluptate velitH" .
"esse cillum dolore eu fugiat nulla pariatur. Excepteur sintH" .
"occaecat cupidatat non proident, sunt in culpa qui officiaH" .
"deserunt mollit anim id est laborum";

self::assertEquals($expected, $result);
Expand All @@ -84,10 +84,10 @@ public function testItCanStripAnsiEscapeSequence() : void

public function testSplitItemBug() : void
{
$test = 'item three I guess it isn\'t that bad, is it ?';
$test = 'Item three I guess it isn\'t that bad, is it ?';

self::assertEquals(
"item three \nI guess it \nisn't that \nbad, is it \n?",
"Item three\nI guess it\nisn't that\nbad, is it\n?",
StringUtil::wordwrap($test, 11)
);
}
Expand Down