Skip to content
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

Jump to bottom

Fix: Pad lines in code coverage report only when colors are shown #1032

Merged
merged 2 commits into from Mar 9, 2024
Merged

Fix: Pad lines in code coverage report only when colors are shown #1032

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
fb2c09c
Fix: Do not pad lines of code coverage report
localheinz Mar 9, 2024
c06fe6c
Fix: Pad lines in code coverage report only when colors are shown
localheinz Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Report/Text.php
View file
Open in desktop
Expand Up @@ -306,8 +306,10 @@ private function printCoverageCounts(int $numberOfCoveredElements, int $totalNum

private function format(string $color, int $padding, false|string $string): string
{
$reset = $color ? self::COLOR_RESET : '';
if ($color === '') {
return (string) $string . PHP_EOL;
}

return $color . str_pad((string) $string, $padding) . $reset . PHP_EOL;
return $color . str_pad((string) $string, $padding) . self::COLOR_RESET . PHP_EOL;
}
}
6 changes: 3 additions & 3 deletions tests/_files/BankAccount-text-line.txt
View file
Open in desktop
@@ -1,9 +1,9 @@


Code Coverage Report:
Code Coverage Report:
%s
Summary:

Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 62.50% (5/8)
Expand Down
6 changes: 3 additions & 3 deletions tests/_files/BankAccount-text-path.txt
View file
Open in desktop
@@ -1,9 +1,9 @@


Code Coverage Report:
Code Coverage Report:
%s
Summary:

Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Paths: 60.00% (3/5)
Expand Down
6 changes: 3 additions & 3 deletions tests/_files/BankAccount-text-summary.txt
View file
Open in desktop
@@ -1,7 +1,7 @@


Code Coverage Report Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 62.50% (5/8)
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 62.50% (5/8)

10 changes: 5 additions & 5 deletions tests/_files/BankAccountWithUncovered-text-line.txt
View file
Open in desktop
@@ -1,11 +1,11 @@


Code Coverage Report:
Code Coverage Report:
%s
Summary:
Classes: 0.00% (0/2)
Methods: 37.50% (3/8)

Summary:
Classes: 0.00% (0/2)
Methods: 37.50% (3/8)
Lines: 31.25% (5/16)

BankAccount
Expand Down
6 changes: 3 additions & 3 deletions tests/_files/BankAccountWithoutUncovered-text-line.txt
View file
Open in desktop
@@ -1,9 +1,9 @@


Code Coverage Report:
Code Coverage Report:
%s
Summary:

Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 62.50% (5/8)
Expand Down
14 changes: 14 additions & 0 deletions tests/_files/NamespacedBankAccount-text-with-colors.txt
View file
Open in desktop
@@ -0,0 +1,14 @@


Code Coverage Report: 
 %s 
 
 Summary: 
 Classes: 0.00% (0/1)
 Methods: 75.00% (3/4)
 Lines: 62.50% (5/8)

SomeNamespace\BankAccount
Methods: ( 0/ 0) Lines: ( 0/ 0)
SomeNamespace\BankAccountTrait
Methods: 75.00% ( 3/ 4) Lines: 62.50% ( 5/ 8)
6 changes: 3 additions & 3 deletions tests/_files/NamespacedBankAccount-text.txt
View file
Open in desktop
@@ -1,9 +1,9 @@


Code Coverage Report:
Code Coverage Report:
%s
Summary:

Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 62.50% (5/8)
Expand Down
6 changes: 3 additions & 3 deletions tests/_files/class-with-anonymous-function-text.txt
View file
Open in desktop
@@ -1,9 +1,9 @@


Code Coverage Report:
Code Coverage Report:
%s
Summary:

Summary:
Classes: 100.00% (1/1)
Methods: 100.00% (1/1)
Lines: 100.00% (8/8)
Expand Down
10 changes: 5 additions & 5 deletions tests/_files/ignored-lines-text.txt
View file
Open in desktop
@@ -1,10 +1,10 @@


Code Coverage Report:%w
Code Coverage Report:
%s
%w
Summary:%w
Classes: (0/0)
Methods: (0/0)

Summary:
Classes: (0/0)
Methods: (0/0)
Lines: 100.00% (1/1)

10 changes: 10 additions & 0 deletions tests/tests/Report/TextTest.php
View file
Open in desktop
Expand Up @@ -57,6 +57,16 @@ public function testTextForNamespacedBankAccountTest(): void
);
}

public function testTextForNamespacedBankAccountTestWhenColorsAreEnabled(): void
{
$text = new Text(Thresholds::default(), true, false);

$this->assertStringMatchesFormatFile(
TEST_FILES_PATH . 'NamespacedBankAccount-text-with-colors.txt',
str_replace(PHP_EOL, "\n", $text->process($this->getLineCoverageForNamespacedBankAccount(), true)),
);
}

public function testTextForFileWithIgnoredLines(): void
{
$text = new Text(Thresholds::default(), false, false);
Expand Down