Cleanup

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -195,6 +195,17 @@ public function getData()
         return $this->data;
     }
 
+    /**
+     * Sets the coverage data.
+     *
+     * @param array $data
+     * @since Method available since Release 1.3.0
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+    }
+
     /**
      * Returns the test data.
      *
@@ -206,6 +217,17 @@ public function getTests()
         return $this->tests;
     }
 
+    /**
+     * Sets the test data.
+     *
+     * @param array $tests
+     * @since Method available since Release 1.3.0
+     */
+    public function setTests(array $tests)
+    {
+        $this->tests = $tests;
+    }
+
     /**
      * Start collection of code coverage information.
      *
@@ -794,14 +816,4 @@ protected function getLinesToBeIgnored($filename)
 
         return $this->ignoredLines[$filename];
     }
-
-    public function setData(array $data)
-    {
-        $this->data = $data;
-    }
-
-    public function setTests(array $tests)
-    {
-        $this->tests = $tests;
-    }
 }

PHP/CodeCoverage/Filter.php

@@ -348,21 +348,45 @@ protected function addDirectoryContainingClassToBlacklist($className, $parent =
         $this->addDirectoryToBlacklist($directory);
     }
 
+    /**
+     * Returns the blacklisted files.
+     *
+     * @return array
+     * @since Method available since Release 1.3.0
+     */
     public function getBlacklistedFiles()
     {
         return $this->blacklistedFiles;
     }
 
+    /**
+     * Sets the blacklisted files.
+     *
+     * @param array $blacklistedFiles
+     * @since Method available since Release 1.3.0
+     */
     public function setBlacklistedFiles($blacklistedFiles)
     {
         $this->blacklistedFiles = $blacklistedFiles;
     }
 
+    /**
+     * Returns the whitelisted files.
+     *
+     * @return array
+     * @since Method available since Release 1.3.0
+     */
     public function getWhitelistedFiles()
     {
         return $this->whitelistedFiles;
     }
 
+    /**
+     * Sets the whitelisted files.
+     *
+     * @param array $whitelistedFiles
+     * @since Method available since Release 1.3.0
+     */
     public function setWhitelistedFiles($whitelistedFiles)
     {
         $this->whitelistedFiles = $whitelistedFiles;

PHP/CodeCoverage/Report/PHP.php

@@ -48,6 +48,7 @@
  *
  * @category   PHP
  * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     uyga <iamuyga@gmail.com>
  * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
@@ -63,12 +64,25 @@ class PHP_CodeCoverage_Report_PHP
      */
     public function process(PHP_CodeCoverage $coverage, $target = NULL)
     {
-        $output = '<?php $filter = new PHP_CodeCoverage_Filter();'
-            . '$filter->setBlacklistedFiles(' . var_export($coverage->filter()->getBlacklistedFiles(), 1) . ');'
-            . '$filter->setWhitelistedFiles(' . var_export($coverage->filter()->getWhitelistedFiles(), 1) . ');'
-            . '$object = new PHP_CodeCoverage(new PHP_CodeCoverage_Driver_Xdebug(), $filter); $object->setData('
-            . var_export($coverage->getData(), 1) . '); $object->setTests('
-            . var_export($coverage->getTests(), 1) . '); return $object;';
+        $filter = $coverage->filter();
+
+        $output = sprintf(
+          '<?php
+$coverage = new PHP_CodeCoverage;
+$coverage->setData(%s);
+$coverage->setTests(%s);
+
+$filter = $coverage->filter();
+$filter->setBlacklistedFiles(%s);
+$filter->setWhitelistedFiles(%s);
+
+return $coverage;',
+
+          var_export($coverage->getData(), 1),
+          var_export($coverage->getTests(), 1),
+          var_export($filter->getBlacklistedFiles(), 1),
+          var_export($filter->getWhitelistedFiles(), 1)
+        );
 
         if ($target !== NULL) {
             return file_put_contents($target, $output);

Tests/_files/CoverageClassExtendedTest.php

@@ -1,5 +1,4 @@
 <?php
-include_once('CoveredClass.php');
 class CoverageClassExtendedTest extends PHPUnit_Framework_TestCase
 {
     /**

Tests/_files/CoverageFunctionParenthesesTest.php

@@ -1,5 +1,4 @@
 <?php
-include_once('CoveredFunction.php');
 class CoverageFunctionParenthesesTest extends PHPUnit_Framework_TestCase
 {
     /**

Tests/_files/NamespaceCoverageClassExtendedTest.php

@@ -1,5 +1,4 @@
 <?php
-include_once('NamespaceCoveredClass.php');
 class NamespaceCoverageClassExtendedTest extends PHPUnit_Framework_TestCase
 {
     /**