Add branch coverage to clover report

Author: dvdoug

src/Report/Clover.php

@@ -139,12 +139,12 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
                 $xmlMetrics->setAttribute('complexity', (string) $class['ccn']);
                 $xmlMetrics->setAttribute('methods', (string) $classMethods);
                 $xmlMetrics->setAttribute('coveredmethods', (string) $coveredMethods);
-                $xmlMetrics->setAttribute('conditionals', '0');
-                $xmlMetrics->setAttribute('coveredconditionals', '0');
+                $xmlMetrics->setAttribute('conditionals', (string) $class['executableBranches']);
+                $xmlMetrics->setAttribute('coveredconditionals', (string) $class['executedBranches']);
                 $xmlMetrics->setAttribute('statements', (string) $classStatements);
                 $xmlMetrics->setAttribute('coveredstatements', (string) $coveredClassStatements);
-                $xmlMetrics->setAttribute('elements', (string) ($classMethods + $classStatements /* + conditionals */));
-                $xmlMetrics->setAttribute('coveredelements', (string) ($coveredMethods + $coveredClassStatements /* + coveredconditionals */));
+                $xmlMetrics->setAttribute('elements', (string) ($classMethods + $classStatements + $class['executableBranches']));
+                $xmlMetrics->setAttribute('coveredelements', (string) ($coveredMethods + $coveredClassStatements + $class['executedBranches']));
                 $xmlClass->appendChild($xmlMetrics);
             }
 
@@ -193,12 +193,12 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
             $xmlMetrics->setAttribute('classes', (string) $item->getNumClassesAndTraits());
             $xmlMetrics->setAttribute('methods', (string) $item->getNumMethods());
             $xmlMetrics->setAttribute('coveredmethods', (string) $item->getNumTestedMethods());
-            $xmlMetrics->setAttribute('conditionals', '0');
-            $xmlMetrics->setAttribute('coveredconditionals', '0');
+            $xmlMetrics->setAttribute('conditionals', (string) $item->getNumExecutableBranches());
+            $xmlMetrics->setAttribute('coveredconditionals', (string) $item->getNumExecutedBranches());
             $xmlMetrics->setAttribute('statements', (string) $item->getNumExecutableLines());
             $xmlMetrics->setAttribute('coveredstatements', (string) $item->getNumExecutedLines());
-            $xmlMetrics->setAttribute('elements', (string) ($item->getNumMethods() + $item->getNumExecutableLines() /* + conditionals */));
-            $xmlMetrics->setAttribute('coveredelements', (string) ($item->getNumTestedMethods() + $item->getNumExecutedLines() /* + coveredconditionals */));
+            $xmlMetrics->setAttribute('elements', (string) ($item->getNumMethods() + $item->getNumExecutableLines() + $item->getNumExecutableBranches()));
+            $xmlMetrics->setAttribute('coveredelements', (string) ($item->getNumTestedMethods() + $item->getNumExecutedLines() + $item->getNumExecutedBranches()));
             $xmlFile->appendChild($xmlMetrics);
 
             if ($namespace === 'global') {
@@ -226,12 +226,12 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
         $xmlMetrics->setAttribute('classes', (string) $report->getNumClassesAndTraits());
         $xmlMetrics->setAttribute('methods', (string) $report->getNumMethods());
         $xmlMetrics->setAttribute('coveredmethods', (string) $report->getNumTestedMethods());
-        $xmlMetrics->setAttribute('conditionals', '0');
-        $xmlMetrics->setAttribute('coveredconditionals', '0');
+        $xmlMetrics->setAttribute('conditionals', (string) $report->getNumExecutableBranches());
+        $xmlMetrics->setAttribute('coveredconditionals', (string) $report->getNumExecutedBranches());
         $xmlMetrics->setAttribute('statements', (string) $report->getNumExecutableLines());
         $xmlMetrics->setAttribute('coveredstatements', (string) $report->getNumExecutedLines());
-        $xmlMetrics->setAttribute('elements', (string) ($report->getNumMethods() + $report->getNumExecutableLines() /* + conditionals */));
-        $xmlMetrics->setAttribute('coveredelements', (string) ($report->getNumTestedMethods() + $report->getNumExecutedLines() /* + coveredconditionals */));
+        $xmlMetrics->setAttribute('elements', (string) ($report->getNumMethods() + $report->getNumExecutableLines() + $report->getNumExecutableBranches()));
+        $xmlMetrics->setAttribute('coveredelements', (string) ($report->getNumTestedMethods() + $report->getNumExecutedLines() + $report->getNumExecutedBranches()));
         $xmlProject->appendChild($xmlMetrics);
 
         $buffer = $xmlDocument->saveXML();

tests/_files/BankAccount-clover.xml renamed to tests/_files/BankAccount-clover-line.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<coverage generated="%i">
+  <project timestamp="%i" name="BankAccount">
+    <file name="%s%eBankAccount.php">
+      <class name="BankAccount" namespace="global">
+        <metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="10" coveredstatements="5" elements="21" coveredelements="11"/>
+      </class>
+      <line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
+      <line num="8" type="stmt" count="2"/>
+      <line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
+      <line num="13" type="stmt" count="0"/>
+      <line num="14" type="stmt" count="0"/>
+      <line num="15" type="stmt" count="0"/>
+      <line num="16" type="stmt" count="0"/>
+      <line num="18" type="stmt" count="0"/>
+      <line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
+      <line num="22" type="stmt" count="2"/>
+      <line num="24" type="stmt" count="1"/>
+      <line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
+      <line num="29" type="stmt" count="2"/>
+      <line num="31" type="stmt" count="1"/>
+      <metrics loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="10" coveredstatements="5" elements="21" coveredelements="11"/>
+    </file>
+    <metrics files="1" loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="10" coveredstatements="5" elements="21" coveredelements="11"/>
+  </project>
+</coverage>

tests/_files/BankAccount-clover-path.xml

@@ -16,16 +16,26 @@
  */
 final class CloverTest extends TestCase
 {
-    public function testCloverForBankAccountTest(): void
+    public function testLineCoverageForBankAccountTest(): void
     {
         $clover = new Clover;
 
         $this->assertStringMatchesFormatFile(
-            TEST_FILES_PATH . 'BankAccount-clover.xml',
+            TEST_FILES_PATH . 'BankAccount-clover-line.xml',
             $clover->process($this->getLineCoverageForBankAccount(), null, 'BankAccount')
         );
     }
 
+    public function testPathCoverageForBankAccountTest(): void
+    {
+        $clover = new Clover;
+
+        $this->assertStringMatchesFormatFile(
+            TEST_FILES_PATH . 'BankAccount-clover-path.xml',
+            $clover->process($this->getPathCoverageForBankAccount(), null, 'BankAccount')
+        );
+    }
+
     public function testCloverForFileWithIgnoredLines(): void
     {
         $clover = new Clover;