Add flag to TextReport constructor

Fix additional covered lines functionality

Author: jmrieger

phpunit.xml

@@ -8,10 +8,6 @@
         <directory suffix="Test.php">tests/tests</directory>
     </testsuite>
 
-    <logging>
-        <log type="coverage-clover" target="./build/clover.xml" />
-    </logging>
-
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>

src/CodeCoverage.php

@@ -625,7 +625,6 @@ private function initializeFilesThatAreSeenTheFirstTime(array $data): void
             }
 
             foreach ($fileData['functions'] as $functionName => $functionData) {
-                // @todo - should this have a helper to merge covered paths?
                 $this->data[$file]['paths'][$functionName] = $functionData['paths'];
 
                 foreach ($functionData['branches'] as $branchIndex => $branchData) {
@@ -839,7 +838,6 @@ private function addUncoveredFilesFromWhitelist(): void
             for ($line = 1; $line <= $lines; $line++) {
                 $data[$uncoveredFile]['lines'][$line] = Driver::LINE_NOT_EXECUTED;
             }
-            // @todo - do the same here with functions and paths
         }
 
         $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');

src/Node/File.php

@@ -382,16 +382,21 @@ private function calculateStatistics(): void
         unset($tokens);
 
         foreach (\range(1, $this->linesOfCode['loc']) as $lineNumber) {
-            if (isset($this->coverageData['lines'][$lineNumber])) {
-                foreach ($this->codeUnitsByLine[$lineNumber] as &$codeUnit) {
-                    $codeUnit['executableLines']++;
-                }
+            // Check to see if we've identified this line as executed, not executed, or not executable
+            if (\array_key_exists($lineNumber, $this->coverageData['lines'])) {
+                // If the element is null, that indicates this line is not executable
+                if ($this->coverageData['lines'][$lineNumber] !== null) {
+                    foreach ($this->codeUnitsByLine[$lineNumber] as &$codeUnit) {
+                        $codeUnit['executableLines']++;
+                    }
+
+                    unset($codeUnit);
 
-                unset($codeUnit);
+                    $this->numExecutableLines++;
+                }
 
-                $this->numExecutableLines++;
 
-                if (\count($this->coverageData['lines'][$lineNumber]) > 0) {
+                if ($this->coverageData['lines'][$lineNumber]['pathCovered'] === true) {
                     foreach ($this->codeUnitsByLine[$lineNumber] as &$codeUnit) {
                         $codeUnit['executedLines']++;
                     }
@@ -477,6 +482,19 @@ private function calcAndApplyClassAggregate(
         foreach ($classOrTrait['methods'] as &$method) {
             $methodName = $method['methodName'];
 
+            if ($method['executableLines'] > 0) {
+                $method['coverage'] = ($method['executedLines'] / $method['executableLines']) * 100;
+            } else {
+                $method['coverage'] = 100;
+            }
+
+            $method['crap'] = $this->crap(
+                $method['ccn'],
+                $method['coverage']
+            );
+
+            $classOrTrait['ccn'] += $method['ccn'];
+
             if (isset($this->coverageData['paths'])) {
                 $methodCoveragePath = $methodName;
 
@@ -504,19 +522,6 @@ private function calcAndApplyClassAggregate(
                     $this->numTestedPaths += $numExexutedPaths;
                 }
 
-                if ($method['executableLines'] > 0) {
-                    $method['coverage'] = ($method['executedLines'] /
-                            $method['executableLines']) * 100;
-                } else {
-                    $method['coverage'] = 100;
-                }
-
-                $method['crap'] = $this->crap(
-                    $method['ccn'],
-                    $method['coverage']
-                );
-
-                $classOrTrait['ccn'] += $method['ccn'];
             }
 
             if (isset($this->coverageData['branches'])) {