Merge branch '1.2'

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -81,6 +81,11 @@ class PHP_CodeCoverage
      */
     protected $mapTestClassNameToCoveredClassName = FALSE;
 
+    /**
+     * @var boolean
+     */
+    protected $addUncoveredFilesFromWhitelist = TRUE;
+
     /**
      * @var boolean
      */
@@ -167,7 +172,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.
@@ -381,6 +388,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
@@ -476,7 +498,7 @@ protected function initializeFilesThatAreSeenTheFirstTime($data)
     /**
      * Processes whitelisted files that are not covered.
      */
-    protected function processUncoveredFilesFromWhitelist()
+    protected function addUncoveredFilesFromWhitelist()
     {
         $data           = array();
         $uncoveredFiles = array_diff(