Merge branch 'master' into report-refactoring

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -101,26 +101,6 @@ class PHP_CodeCoverage
      */
     protected $tests = array();
 
-    /**
-     * @var boolean
-     */
-    protected $isCodeCoverageTestSuite = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $isFileIteratorTestSuite = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $isTimerTestSuite = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $isTokenStreamTestSuite = FALSE;
-
     /**
      * Constructor.
      *
@@ -141,23 +121,34 @@ public function __construct(PHP_CodeCoverage_Driver $driver = NULL, PHP_CodeCove
         $this->driver = $driver;
         $this->filter = $filter;
 
-        if (defined('PHP_CODECOVERAGE_TESTSUITE')) {
-            $this->isCodeCoverageTestSuite = TRUE;
+        // @codeCoverageIgnoreStart
+        if (!defined('PHP_CODECOVERAGE_TESTSUITE')) {
+            $this->filter->addFilesToBlacklist(php_codecoverage_autoload());
         }
 
-        // @codeCoverageIgnoreStart
-        if (defined('FILE_ITERATOR_TESTSUITE')) {
-            $this->isFileIteratorTestSuite = TRUE;
+        if (!defined('PHPUNIT_TESTSUITE')) {
+            $this->filter->addFilesToBlacklist(phpunit_autoload());
+            $this->filter->addFilesToBlacklist(phpunit_dbunit_autoload());
+            $this->filter->addFilesToBlacklist(phpunit_mockobject_autoload());
+            $this->filter->addFilesToBlacklist(phpunit_selenium_autoload());
+            $this->filter->addFilesToBlacklist(phpunit_story_autoload());
+        }
+
+        if (!defined('FILE_ITERATOR_TESTSUITE')) {
+            $this->filter->addFilesToBlacklist(file_iterator_autoload());
         }
 
-        if (defined('PHP_TIMER_TESTSUITE')) {
-            $this->isTimerTestSuite = TRUE;
+        if (!defined('PHP_TIMER_TESTSUITE') &&
+            function_exists('php_timer_autoload')) {
+            $this->filter->addFilesToBlacklist(php_timer_autoload());
         }
 
-        if (defined('PHP_TOKENSTREAM_TESTSUITE')) {
-            $this->isTokenStreamTestSuite = TRUE;
+        if (!defined('PHP_TOKENSTREAM_TESTSUITE')) {
+            $this->filter->addFilesToBlacklist(php_tokenstream_autoload());
         }
         // @codeCoverageIgnoreEnd
+
+        $this->filter->addFilesToBlacklist(text_template_autoload());
     }
 
     /**
@@ -280,7 +271,6 @@ public function append(array $data, $id = NULL)
             throw new InvalidArgumentException;
         }
 
-        $this->applySelfFilter($data);
         $this->applyListsFilter($data);
         $this->initializeFilesThatAreSeenTheFirstTime($data);
         $this->applyCoversAnnotationFilter($data, $id);
@@ -443,54 +433,6 @@ protected function applyListsFilter(&$data)
         }
     }
 
-    /**
-     * Filters sourcecode files from PHP_CodeCoverage, PHP_TokenStream,
-     * Text_Template, and File_Iterator.
-     *
-     * @param array $data
-     * @codeCoverageIgnore
-     */
-    protected function applySelfFilter(&$data)
-    {
-        foreach (array_keys($data) as $filename) {
-            if (!$this->filter->isFile($filename)) {
-                unset($data[$filename]);
-                continue;
-            }
-
-            if (!$this->isCodeCoverageTestSuite &&
-                strpos($filename, dirname(__FILE__)) === 0) {
-                unset($data[$filename]);
-                continue;
-            }
-
-            if (!$this->isFileIteratorTestSuite &&
-                (substr($filename, -17) == 'File/Iterator.php' ||
-                 substr($filename, -25) == 'File/Iterator/Factory.php')) {
-                unset($data[$filename]);
-                continue;
-            }
-
-            if (!$this->isTimerTestSuite &&
-                (substr($filename, -13) == 'PHP/Timer.php')) {
-                unset($data[$filename]);
-                continue;
-            }
-
-            if (!$this->isTokenStreamTestSuite &&
-                (substr($filename, -13) == 'PHP/Token.php' ||
-                 substr($filename, -20) == 'PHP/Token/Stream.php' ||
-                 substr($filename, -35) == 'PHP/Token/Stream/CachingFactory.php')) {
-                unset($data[$filename]);
-                continue;
-            }
-
-            if (substr($filename, -17) == 'Text/Template.php') {
-                unset($data[$filename]);
-            }
-        }
-    }
-
     /**
      * @since Method available since Release 1.1.0
      */

PHP/CodeCoverage/Autoload.php

@@ -47,7 +47,7 @@
 require_once 'PHP/Token/Stream/Autoload.php';
 require_once 'Text/Template/Autoload.php';
 
-function php_codecoverage_autoload($class) {
+function php_codecoverage_autoload($class = NULL) {
     static $classes = NULL;
     static $path = NULL;
 
@@ -77,6 +77,16 @@ function php_codecoverage_autoload($class) {
         $path = dirname(dirname(__FILE__));
     }
 
+    if ($class === NULL) {
+        $result = array();
+
+        foreach ($classes as $file) {
+            $result[] = $path . $file;
+        }
+
+        return $result;
+    }
+
     $cn = strtolower($class);
 
     if (isset($classes[$cn])) {

PHP/CodeCoverage/Autoload.php.in

@@ -47,7 +47,7 @@ require_once 'File/Iterator/Autoload.php';
 require_once 'PHP/Token/Stream/Autoload.php';
 require_once 'Text/Template/Autoload.php';
 
-function php_codecoverage_autoload($class) {
+function php_codecoverage_autoload($class = NULL) {
     static $classes = NULL;
     static $path = NULL;
 
@@ -59,6 +59,16 @@ function php_codecoverage_autoload($class) {
         $path = dirname(dirname(__FILE__));
     }
 
+    if ($class === NULL) {
+        $result = array();
+
+        foreach ($classes as $file) {
+            $result[] = $path . $file;
+        }
+
+        return $result;
+    }
+
     $cn = strtolower($class);
 
     if (isset($classes[$cn])) {