Re-introduction of processUncoveredFilesFromWhitelist alongside performance tweaks

Author: Rob Caiger

src/CodeCoverage.php

@@ -841,6 +841,9 @@ private function processUncoveredLines($raw = false)
             $filesToProcess = array_keys($this->data);
         }
 
+        $coverageData = $this->data;
+        $this->data = [];
+
         foreach ($filesToProcess as $file) {
 
             if (!file_exists($file)) {
@@ -855,32 +858,30 @@ private function processUncoveredLines($raw = false)
                 $this->driver->start();
                 include_once($file);
                 $data = $this->driver->stop();
+
             } else {
                 $lines = count(file($file));
 
                 for ($i = 1; $i <= $lines; $i++) {
-                    $data[$file][$i] = [];
+                    $data[$file][$i] = PHP_CodeCoverage_Driver::LINE_NOT_EXECUTED;
                 }
             }
 
-            if (empty($data[$file])) {
-                continue;
-            }
+            $this->initializeFilesThatAreSeenTheFirstTime($data);
 
             if (!$isCoveredFile) {
                 // If it is an uncovered file, just append the data
                 $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
-            } else {
-
-                // Otherwise, we need to merge the uncovered/dead code with the coverage data
+            }
+        }
 
-                foreach ($data[$file] as $k => $v) {
-                    if (!isset($this->data[$file][$k])) {
-                        $this->data[$file][$k] = $v == -2 ? null : [];
-                    }
-                }
+        foreach ($coverageData as $file => $lines) {
+            foreach ($lines as $k => $v) {
+                $this->data[$file][$k] = $v;
             }
+        }
 
+        foreach ($this->data as $file => $lines) {
             foreach ($this->getLinesToBeIgnored($file) as $line) {
                 unset($this->data[$file][$line]);
             }