Moved ignored lines check

Author: Rob Caiger

src/CodeCoverage.php

@@ -52,6 +52,11 @@ class PHP_CodeCoverage
      */
     private $addUncoveredFilesFromWhitelist = true;
 
+    /**
+     * @var bool
+     */
+    private $processUncoveredFilesFromWhitelist = false;
+
     /**
      * @var mixed
      */
@@ -81,13 +86,6 @@ class PHP_CodeCoverage
      */
     private $tests = [];
 
-    /**
-     * Store all uncovered files
-     *
-     * @var array
-     */
-    private $uncoveredFiles = [];
-
     /**
      * Constructor.
      *
@@ -107,8 +105,6 @@ public function __construct(PHP_CodeCoverage_Driver $driver = null, PHP_CodeCove
 
         $this->driver = $driver;
         $this->filter = $filter;
-
-        $this->initData();
     }
 
     /**
@@ -155,9 +151,7 @@ public function filter()
      */
     public function getData($raw = false)
     {
-        if (!$raw && $this->addUncoveredFilesFromWhitelist) {
-            $this->addUncoveredFilesFromWhitelist();
-        }
+        $this->processUncoveredLines($raw);
 
         return $this->data;
     }
@@ -248,12 +242,6 @@ public function stop($append = true, $linesToBeCovered = [], array $linesToBeUse
         $data = $this->driver->stop();
         $this->append($data, null, $append, $linesToBeCovered, $linesToBeUsed);
 
-        foreach (array_keys($data) as $file) {
-            if (isset($this->uncoveredFiles[$file])) {
-                unset($this->uncoveredFiles[$file]);
-            }
-        }
-
         $this->currentId = null;
 
         return $data;
@@ -463,6 +451,22 @@ public function setAddUncoveredFilesFromWhitelist($flag)
         $this->addUncoveredFilesFromWhitelist = $flag;
     }
 
+    /**
+     * @param  bool                                      $flag
+     * @throws PHP_CodeCoverage_InvalidArgumentException
+     */
+    public function setProcessUncoveredFilesFromWhitelist($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_InvalidArgumentException::create(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->processUncoveredFilesFromWhitelist = $flag;
+    }
+
     /**
      * @param  bool                                      $flag
      * @throws PHP_CodeCoverage_InvalidArgumentException
@@ -553,20 +557,6 @@ private function initializeFilesThatAreSeenTheFirstTime(array $data)
         }
     }
 
-    /**
-     * Processes whitelisted files that are not covered.
-     */
-    private function addUncoveredFilesFromWhitelist()
-    {
-        $data = [];
-
-        foreach (array_keys($this->uncoveredFiles) as $file) {
-            $data[$file] = $this->data[$file];
-        }
-
-        $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
-    }
-
     /**
      * Returns the lines of a source file that should be ignored.
      *
@@ -841,24 +831,59 @@ private function selectDriver()
     }
 
     /**
-     * Initialise the data with the executable/dead lines from each file in the whitelist
+     * Determine uncovered lines
      */
-    private function initData()
+    private function processUncoveredLines($raw = false)
     {
-        foreach ($this->filter()->getWhitelist() as $file) {
-            $this->driver->start();
-            include_once($file);
-            $data = $this->driver->stop();
+        if (!$raw && $this->addUncoveredFilesFromWhitelist) {
+            $filesToProcess = $this->filter()->getWhitelist();
+        } else {
+            $filesToProcess = array_keys($this->data);
+        }
 
-            foreach ($this->getLinesToBeIgnored($file) as $line) {
-                unset($data[$file][$line]);
+        foreach ($filesToProcess as $file) {
+
+            if (!file_exists($file)) {
+                continue;
             }
 
-            $this->initializeFilesThatAreSeenTheFirstTime($data);
-        }
+            $isCoveredFile = isset($this->data[$file]);
+            $data = [];
+
+            // If we have coverage data, or we are allowed to process uncovered files
+            if ($isCoveredFile || $this->processUncoveredFilesFromWhitelist) {
+                $this->driver->start();
+                include_once($file);
+                $data = $this->driver->stop();
+            } else {
+                $lines = count(file($file));
 
-        foreach (array_keys($this->data) as $file) {
-            $this->uncoveredFiles[$file] = 1;
+                for ($i = 1; $i <= $lines; $i++) {
+                    $data[$file][$i] = [];
+                }
+            }
+
+            if (empty($data[$file])) {
+                continue;
+            }
+
+            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 ($this->getLinesToBeIgnored($file) as $line) {
+                unset($this->data[$file][$line]);
+            }
         }
     }
 }