Skip to content

Fix wordwrap #134

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 2 commits into from
May 13, 2018
Merged

Fix wordwrap #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5ffe6c
Fix wordwrap
AydinHassan May 13, 2018
1dc8b08
CS
AydinHassan May 13, 2018
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
5 changes: 3 additions & 2 deletions src/Util/StringUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ public static function wordwrap(string $str, int $width, string $break = "\n") :
$length += (mb_strlen($word) + 1);

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

return $word;
Expand Down
3 changes: 2 additions & 1 deletion test/MenuItem/MenuMenuItemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public function testGetRowsWithMultipleLines() : void
$this->assertEquals(
[
" LONG ",
" ITEM LINE"
" ITEM ",
" LINE"
],
$item->getRows($menuStyle)
);
Expand Down
3 changes: 2 additions & 1 deletion test/MenuItem/SelectableItemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ public function testGetRowsWithMultipleLinesWithItemExtra() : void
$this->assertEquals(
[
" LONG [EXTRA]",
" ITEM LINE"
" ITEM ",
" LINE"
],
$item->getRows($menuStyle)
);
Expand Down
74 changes: 42 additions & 32 deletions test/Util/StringUtilTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,30 @@ class StringUtilTest extends TestCase
{
protected $dummyText;

protected function setup() : void
{
parent::setUp();

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

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 nostrud \n" .
"exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor \n" .
"in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. \n" .
"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt \n" .
"mollit anim id est laborum";
"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";

$this->assertEquals($result, $expected);
self::assertEquals($expected, $result);
}

public function testItWrapsAsExpectedTo60Length() : void
Expand All @@ -32,30 +44,30 @@ 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 ullamco \n" .
"laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure \n" .
"dolor in reprehenderit in voluptate velit esse cillum dolore eu \n" .
"fugiat nulla pariatur. Excepteur sint occaecat cupidatat non \n" .
"proident, sunt in culpa qui officia deserunt mollit anim id est \n" .
"laborum";

$this->assertEquals($result, $expected);
"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);
}

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 ullamco H" .
"laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure H" .
"dolor in reprehenderit in voluptate velit esse cillum dolore eu H" .
"fugiat nulla pariatur. Excepteur sint occaecat cupidatat non H" .
"proident, sunt in culpa qui officia deserunt mollit anim id est H" .
"laborum";

$this->assertEquals($result, $expected);
"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" .
"deserunt mollit anim id est laborum";

self::assertEquals($expected, $result);
}

public function testItCanStripAnsiEscapeSequence() : void
Expand All @@ -70,15 +82,13 @@ public function testItCanStripAnsiEscapeSequence() : void
$this->assertEquals('foobarbaz!!!', $result);
}

protected function setup() : void
public function testSplitItemBug() : void
{
parent::setUp();

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