From 91387b83d6bd752ee403c59956c23b732685925d Mon Sep 17 00:00:00 2001
From: Maks3w <github.maks3w@virtualplanets.net>
Date: Wed, 4 Nov 2015 16:56:06 +0100
Subject: [PATCH] Clover report. Fill Agregate

---
 src/CodeCoverage/Report/Clover.php                   | 12 ++++++------
 tests/_files/BankAccount-clover.xml                  |  6 +++---
 .../_files/class-with-anonymous-function-clover.xml  |  6 +++---
 tests/_files/ignored-lines-clover.xml                |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/CodeCoverage/Report/Clover.php b/src/CodeCoverage/Report/Clover.php
index 47d932dc4..eb8304680 100644
--- a/src/CodeCoverage/Report/Clover.php
+++ b/src/CodeCoverage/Report/Clover.php
@@ -136,8 +136,8 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
                 $xmlMetrics->setAttribute('complexity', $class['ccn']);
                 $xmlMetrics->setAttribute('methods', $classMethods);
                 $xmlMetrics->setAttribute('coveredmethods', $coveredMethods);
-                $xmlMetrics->setAttribute('conditionals', 0);
-                $xmlMetrics->setAttribute('coveredconditionals', 0);
+                $xmlMetrics->setAttribute('conditionals', $class['executablePaths']);
+                $xmlMetrics->setAttribute('coveredconditionals', $class['executedPaths']);
                 $xmlMetrics->setAttribute('statements', $classStatements);
                 $xmlMetrics->setAttribute(
                     'coveredstatements',
@@ -206,8 +206,8 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
                 'coveredmethods',
                 $item->getNumTestedMethods()
             );
-            $xmlMetrics->setAttribute('conditionals', 0);
-            $xmlMetrics->setAttribute('coveredconditionals', 0);
+            $xmlMetrics->setAttribute('conditionals', $item->getNumExecutablePaths());
+            $xmlMetrics->setAttribute('coveredconditionals', $item->getNumExecutedPaths());
             $xmlMetrics->setAttribute(
                 'statements',
                 $item->getNumExecutableLines()
@@ -259,8 +259,8 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
             'coveredmethods',
             $report->getNumTestedMethods()
         );
-        $xmlMetrics->setAttribute('conditionals', 0);
-        $xmlMetrics->setAttribute('coveredconditionals', 0);
+        $xmlMetrics->setAttribute('conditionals', $report->getNumExecutablePaths());
+        $xmlMetrics->setAttribute('coveredconditionals', $report->getNumExecutedPaths());
         $xmlMetrics->setAttribute(
             'statements',
             $report->getNumExecutableLines()
diff --git a/tests/_files/BankAccount-clover.xml b/tests/_files/BankAccount-clover.xml
index 0986fdf71..b39cc51dd 100644
--- a/tests/_files/BankAccount-clover.xml
+++ b/tests/_files/BankAccount-clover.xml
@@ -3,7 +3,7 @@
   <project timestamp="%i" name="BankAccount">
     <file name="%s/BankAccount.php">
       <class name="BankAccount" namespace="global">
-        <metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
+        <metrics complexity="5" methods="4" coveredmethods="3" conditionals="5" coveredconditionals="1" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
       </class>
       <line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
       <line num="8" type="stmt" count="2"/>
@@ -19,8 +19,8 @@
       <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="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
+      <metrics loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="5" coveredconditionals="1" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
+    <metrics files="1" loc="33" ncloc="33" classes="1" methods="4" coveredmethods="3" conditionals="5" coveredconditionals="1" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
   </project>
 </coverage>
diff --git a/tests/_files/class-with-anonymous-function-clover.xml b/tests/_files/class-with-anonymous-function-clover.xml
index d6a8b4085..44b51122f 100644
--- a/tests/_files/class-with-anonymous-function-clover.xml
+++ b/tests/_files/class-with-anonymous-function-clover.xml
@@ -3,7 +3,7 @@
   <project timestamp="%i">
     <file name="%s/source_with_class_and_anonymous_function.php">
       <class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
-        <metrics complexity="2" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
+        <metrics complexity="2" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
       </class>
       <line num="5" type="method" name="runAnonymous" visibility="public" complexity="1" crap="1.04" count="1"/>
       <line num="7" type="stmt" count="1"/>
@@ -15,8 +15,8 @@
       <line num="14" type="stmt" count="1"/>
       <line num="17" type="stmt" count="1"/>
       <line num="18" type="stmt" count="1"/>
-      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
   </project>
 </coverage>
diff --git a/tests/_files/ignored-lines-clover.xml b/tests/_files/ignored-lines-clover.xml
index 81a9aaa3d..bd72ae967 100644
--- a/tests/_files/ignored-lines-clover.xml
+++ b/tests/_files/ignored-lines-clover.xml
@@ -3,15 +3,15 @@
   <project timestamp="%i">
     <file name="%s/source_with_ignore.php">
       <class name="Foo" namespace="global">
-        <metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
+        <metrics complexity="1" methods="0" coveredmethods="0" conditionals="1" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>
       <class name="Bar" namespace="global">
-        <metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
+        <metrics complexity="1" methods="0" coveredmethods="0" conditionals="1" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>
       <line num="2" type="stmt" count="1"/>
       <line num="6" type="stmt" count="0"/>
-      <metrics loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+      <metrics loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="3" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
     </file>
-    <metrics files="1" loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+    <metrics files="1" loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="3" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
   </project>
 </coverage>