Move blacklist initialization code to filter class.

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -125,8 +125,6 @@ public function __construct(PHP_CodeCoverage_Driver $driver = NULL, PHP_CodeCove
 
         $this->driver = $driver;
         $this->filter = $filter;
-
-        $this->prefillBlacklist();
     }
 
     /**
@@ -529,47 +527,4 @@ protected function processUncoveredFilesFromWhitelist()
 
         $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
     }
-
-    /**
-     * Prefills the blacklist with source files used by PHPUnit
-     * and PHP_CodeCoverage.
-     */
-    protected function prefillBlacklist()
-    {
-        $functions = array(
-          'file_iterator_autoload',
-          'php_codecoverage_autoload',
-          'php_invoker_autoload',
-          'php_timer_autoload',
-          'php_tokenstream_autoload',
-          'phpunit_autoload',
-          'phpunit_dbunit_autoload',
-          'phpunit_mockobject_autoload',
-          'phpunit_selenium_autoload',
-          'phpunit_story_autoload',
-          'text_template_autoload'
-        );
-
-        foreach ($functions as $function) {
-            if (function_exists($function)) {
-                $this->filter->addFilesToBlacklist($function());
-            }
-        }
-
-        $file = PHP_CodeCoverage_Util::fileExistsInIncludePath(
-          'SymfonyComponents/YAML/sfYaml.php'
-        );
-
-        if ($file) {
-            $this->filter->addFileToBlacklist($file);
-        }
-
-        $file = PHP_CodeCoverage_Util::fileExistsInIncludePath(
-          'SymfonyComponents/YAML/sfYamlDumper.php'
-        );
-
-        if ($file) {
-            $this->filter->addFileToBlacklist($file);
-        }
-    }
 }

PHP/CodeCoverage/Filter.php

@@ -71,6 +71,49 @@ class PHP_CodeCoverage_Filter
      */
     protected $whitelistedFiles = array();
 
+    /**
+     * Prefills the blacklist with source files used by PHPUnit
+     * and PHP_CodeCoverage.
+     */
+    public function __construct()
+    {
+        $functions = array(
+          'file_iterator_autoload',
+          'php_codecoverage_autoload',
+          'php_invoker_autoload',
+          'php_timer_autoload',
+          'php_tokenstream_autoload',
+          'phpunit_autoload',
+          'phpunit_dbunit_autoload',
+          'phpunit_mockobject_autoload',
+          'phpunit_selenium_autoload',
+          'phpunit_story_autoload',
+          'text_template_autoload'
+        );
+
+        foreach ($functions as $function) {
+            if (function_exists($function)) {
+                $this->addFilesToBlacklist($function());
+            }
+        }
+
+        $file = PHP_CodeCoverage_Util::fileExistsInIncludePath(
+          'SymfonyComponents/YAML/sfYaml.php'
+        );
+
+        if ($file) {
+            $this->addFileToBlacklist($file);
+        }
+
+        $file = PHP_CodeCoverage_Util::fileExistsInIncludePath(
+          'SymfonyComponents/YAML/sfYamlDumper.php'
+        );
+
+        if ($file) {
+            $this->addFileToBlacklist($file);
+        }
+    }
+
     /**
      * Adds a directory to the blacklist (recursively).
      *

Tests/PHP/CodeCoverage/FilterTest.php

@@ -72,7 +72,7 @@ class PHP_CodeCoverage_FilterTest extends PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->filter = new PHP_CodeCoverage_Filter;
+        $this->filter = unserialize('O:23:"PHP_CodeCoverage_Filter":0:{}');
 
         $this->files = array(
           TEST_FILES_PATH . 'BankAccount.php',