Skip to content

Fixed incorrect lengths for colorized strings in ASCII table #69

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
danielbachhuber merged 2 commits into from
Nov 12, 2014
Merged

Fixed incorrect lengths for colorized strings in ASCII table #69

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
a32db1a
Add tests for colored string in ASCII table
Oct 24, 2014
b57396d
Fix colorized string pad
Nov 8, 2014
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
3 changes: 2 additions & 1 deletion lib/cli/cli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,14 @@ function safe_substr( $str, $start, $length = false ) {
*/
function safe_str_pad( $string, $length ) {
// Hebrew vowel characters
$cleaned_string = preg_replace( '#[\x{591}-\x{5C7}]+#u', '', $string );
$cleaned_string = preg_replace( '#[\x{591}-\x{5C7}]+#u', '', Colors::decolorize( $string ) );
if ( function_exists( 'mb_strwidth' ) ) {
$real_length = mb_strwidth( $cleaned_string, mb_detect_encoding( $string ) );
} else {
$real_length = safe_strlen( $cleaned_string );
}
$diff = strlen( $string ) - $real_length;
$length += $diff;

return str_pad( $string, $length );
}
4 changes: 4 additions & 0 deletions tests/test-cli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ function test_encoded_string_pad() {
$this->assertEquals( 7, strlen( \cli\Colors::pad( 'óra', 6 ) ) ); // special characters take one byte
$this->assertEquals( 9, strlen( \cli\Colors::pad( '日本語', 6 ) ) ); // each character takes two bytes
$this->assertEquals( 17, strlen( \cli\Colors::pad( 'עִבְרִית', 6 ) ) ); // process Hebrew vowels
}

function test_colorized_string_pad() {
$this->assertEquals( 22, strlen( \cli\Colors::pad( \cli\Colors::colorize( "%Gx%n", true ), 11 ))); // colorized `x` string
$this->assertEquals( 23, strlen( \cli\Colors::pad( \cli\Colors::colorize( "%Góra%n", true ), 11 ))); // colorized `óra` string
}

function test_encoded_substr() {
Expand Down
30 changes: 30 additions & 0 deletions tests/test-table-ascii.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,36 @@ public function testDrawOneColumnTable() {
| x |
+-------------+

OUT;
$this->assertInOutEquals(array($headers, $rows), $output);
}

/**
* Draw simple One column table with colored string
* Output should look like:
* +-------------+
* | Test Header |
* +-------------+
* | x |
* +-------------+
*
* where `x` character has green color.
* At the same time it checks that `green` defined in `cli\Colors` really looks as `green`.
*/
public function testDrawOneColumnColoredTable() {
$headers = array('Test Header');
$rows = array(
array(Colors::colorize('%Gx%n', true)),
);
// green `x`
$x = "\x1B\x5B\x33\x32\x3B\x31\x6Dx\x1B\x5B\x30\x6D";
$output = <<<OUT
+-------------+
| Test Header |
+-------------+
| $x |
+-------------+

OUT;
$this->assertInOutEquals(array($headers, $rows), $output);
}
Expand Down