Add addUncoveredFilesFromWhitelist flag back in.

Author: sebastianbergmann

ChangeLog.markdown

@@ -7,6 +7,8 @@ PHP_CodeCoverage 1.2.3
 ----------------------
 
 * Added support for parentheses after method names in the `@covers` annotation.
+* When `addUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted but not covered by a single test are now excluded from the code coverage.
+
 
 PHP_CodeCoverage 1.2.2
 ----------------------
@@ -25,5 +27,5 @@ PHP_CodeCoverage 1.2.0
 * The HTML report has been redesigned.
 * The new `@coversDefaultClass` annotation enables short `@covers` annotations when working with long class names or namespaces.
 * The new `@coversNothing` annotation can be used so tests do not record any code coverage. Useful for integration testing. 
-* When `processUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted and uncovered are now included in the code coverage but with all lines, including those that are not executable, counted as not executed.
+* When `processUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted but not covered by a single test are now included in the code coverage but with all lines, including those that are not executable, counted as not executed.
 * PHP_CodeCoverage 1.2 is only supported on PHP 5.3.3 (or later) and PHP 5.4.7 (or later) is highly recommended.

PHP/CodeCoverage.php

@@ -95,6 +95,11 @@ class PHP_CodeCoverage
      */
     protected $mapTestClassNameToCoveredClassName = FALSE;
 
+    /**
+     * @var boolean
+     */
+    protected $addUncoveredFilesFromWhitelist = TRUE;
+
     /**
      * @var boolean
      */
@@ -181,7 +186,9 @@ public function filter()
      */
     public function getData()
     {
-        $this->processUncoveredFilesFromWhitelist();
+        if ($this->addUncoveredFilesFromWhitelist) {
+            $this->addUncoveredFilesFromWhitelist();
+        }
 
         // We need to apply the blacklist filter a second time
         // when no whitelist is used.
@@ -395,6 +402,21 @@ public function setMapTestClassNameToCoveredClassName($flag)
         $this->mapTestClassNameToCoveredClassName = $flag;
     }
 
+    /**
+     * @param  boolean $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setAddUncoveredFilesFromWhitelist($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+              1, 'boolean'
+            );
+        }
+
+        $this->addUncoveredFilesFromWhitelist = $flag;
+    }
+
     /**
      * @param  boolean $flag
      * @throws PHP_CodeCoverage_Exception
@@ -490,7 +512,7 @@ protected function initializeFilesThatAreSeenTheFirstTime($data)
     /**
      * Processes whitelisted files that are not covered.
      */
-    protected function processUncoveredFilesFromWhitelist()
+    protected function addUncoveredFilesFromWhitelist()
     {
         $data           = array();
         $uncoveredFiles = array_diff(