Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sebastianbergmann/phpunit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.6.3
Choose a base ref
...
head repository: sebastianbergmann/phpunit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.6.4
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 11, 2015

  1. Always pass the default list of blacklisted classes to PHP_CodeCoverage

    @sebastianbergmann
    sebastianbergmann committed Apr 11, 2015
    Copy the full SHA
    2d4c02c View commit details

  2. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Apr 11, 2015
    Copy the full SHA
    1632329 View commit details
Showing with 26 additions and 12 deletions.
  1. +4 −0 ChangeLog-4.6.md
  2. +1 −1 src/Runner/Version.php
  3. +21 −11 src/TextUI/TestRunner.php
4 changes: 4 additions & 0 deletions ChangeLog-4.6.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changes in PHPUnit 4.6

## PHPUnit 4.6.4

* The default list of blacklisted classes is now always passed to PHP_CodeCoverage

## PHPUnit 4.6.3

* Updated the default list of blacklisted classes
2 changes: 1 addition & 1 deletion src/Runner/Version.php
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public static function id()
}

if (self::$version === null) {
$version = new SebastianBergmann\Version('4.6.3', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.6.4', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}

32 changes: 21 additions & 11 deletions src/TextUI/TestRunner.php
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner
public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = null, PHP_CodeCoverage_Filter $filter = null)
{
if ($filter === null) {
$filter = new PHP_CodeCoverage_Filter;
$filter = $this->getCodeCoverageFilter();
}

$this->codeCoverageFilter = $filter;
@@ -837,16 +837,6 @@ protected function handleConfiguration(array &$arguments)

if (empty($filterConfiguration['whitelist']['include']['directory']) &&
empty($filterConfiguration['whitelist']['include']['file'])) {
if (defined('__PHPUNIT_PHAR__')) {
$this->codeCoverageFilter->addFileToBlacklist(__PHPUNIT_PHAR__);
}

$blacklist = new PHPUnit_Util_Blacklist;

foreach ($blacklist->getBlacklistedDirectories() as $directory) {
$this->codeCoverageFilter->addDirectoryToBlacklist($directory);
}

foreach ($filterConfiguration['blacklist']['include']['directory'] as $dir) {
$this->codeCoverageFilter->addDirectoryToBlacklist(
$dir['path'],
@@ -971,4 +961,24 @@ private function showMessage($message, $exit = false)
exit(self::EXCEPTION_EXIT);
}
}

/**
* @return PHP_CodeCoverage_Filter
*/
private function getCodeCoverageFilter()
{
$filter = new PHP_CodeCoverage_Filter;

if (defined('__PHPUNIT_PHAR__')) {
$filter->addFileToBlacklist(__PHPUNIT_PHAR__);
}

$blacklist = new PHPUnit_Util_Blacklist;

foreach ($blacklist->getBlacklistedDirectories() as $directory) {
$filter->addDirectoryToBlacklist($directory);
}

return $filter;
}
}