Merge branch '10.1'

sebastianbergmann · sebastianbergmann · commit 457e418f6302 · 2024-03-09T17:55:38.000+01:00
diff --git a/src/Report/Text.php b/src/Report/Text.php
@@ -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;
     }
 }
diff --git a/tests/_files/BankAccount-text-line.txt b/tests/_files/BankAccount-text-line.txt
@@ -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)
diff --git a/tests/_files/BankAccount-text-path.txt b/tests/_files/BankAccount-text-path.txt
@@ -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)
diff --git a/tests/_files/BankAccount-text-summary.txt b/tests/_files/BankAccount-text-summary.txt
@@ -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)
 
diff --git a/tests/_files/BankAccountWithUncovered-text-line.txt b/tests/_files/BankAccountWithUncovered-text-line.txt
@@ -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
diff --git a/tests/_files/BankAccountWithoutUncovered-text-line.txt b/tests/_files/BankAccountWithoutUncovered-text-line.txt
@@ -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)
diff --git a/tests/_files/NamespacedBankAccount-text-with-colors.txt b/tests/_files/NamespacedBankAccount-text-with-colors.txt
@@ -0,0 +1,14 @@
+
+
+[1;37;40mCode Coverage Report:  [0m
+[1;37;40m  %s  [0m
+[1;37;40m                       [0m
+[1;37;40m Summary:              [0m
+[37;41m  Classes:  0.00% (0/1)[0m
+[30;43m  Methods: 75.00% (3/4)[0m
+[30;43m  Lines:   62.50% (5/8)[0m
+
+SomeNamespace\BankAccount
+  [30;42mMethods:  ( 0/ 0)[0m   [30;42mLines:  (  0/  0)[0m
+SomeNamespace\BankAccountTrait
+  [30;43mMethods:  75.00% ( 3/ 4)[0m   [30;43mLines:  62.50% (  5/  8)[0m
diff --git a/tests/_files/NamespacedBankAccount-text.txt b/tests/_files/NamespacedBankAccount-text.txt
@@ -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)
diff --git a/tests/_files/class-with-anonymous-function-text.txt b/tests/_files/class-with-anonymous-function-text.txt
@@ -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)
diff --git a/tests/_files/ignored-lines-text.txt b/tests/_files/ignored-lines-text.txt
@@ -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)
 
diff --git a/tests/tests/Report/TextTest.php b/tests/tests/Report/TextTest.php
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,10 @@ private function printCoverageCounts(int $numberOfCoveredElements, int $totalNum`
`306`	`306`
`307`	`307`	`private function format(string $color, int $padding, false\|string $string): string`
`308`	`308`	`{`
`309`		`- $reset = $color ? self::COLOR_RESET : '';`
	`309`	`+ if ($color === '') {`
	`310`	`+ return (string) $string . PHP_EOL;`
	`311`	`+ }`
`310`	`312`
`311`		`- return $color . str_pad((string) $string, $padding) . $reset . PHP_EOL;`
	`313`	`+ return $color . str_pad((string) $string, $padding) . self::COLOR_RESET . PHP_EOL;`
`312`	`314`	`}`
`313`	`315`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,14 @@ @@
++
++
 +[1;37;40mCode Coverage Report:  [0m
 +[1;37;40m  %s  [0m
 +[1;37;40m                       [0m
 +[1;37;40m Summary:              [0m
 +[37;41m  Classes:  0.00% (0/1)[0m
 +[30;43m  Methods: 75.00% (3/4)[0m
 +[30;43m  Lines:   62.50% (5/8)[0m
++
 +SomeNamespace\BankAccount
 +  [30;42mMethods:  ( 0/ 0)[0m   [30;42mLines:  (  0/  0)[0m
 +SomeNamespace\BankAccountTrait
 +  [30;43mMethods:  75.00% ( 3/ 4)[0m   [30;43mLines:  62.50% (  5/  8)[0m