diff --git a/ChangeLog-4.0.md b/ChangeLog-4.0.md index 015b3a852..f0e37217a 100644 --- a/ChangeLog-4.0.md +++ b/ChangeLog-4.0.md @@ -2,6 +2,14 @@ All notable changes of the PHP_CodeCoverage 4.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [4.1.0] - 2019-01-26 + +### Should be 5.0.0 but that version already exists + +### Changed + +* Do not apply the whitelist if it is empty + ## [4.0.4] - 2016-12-20 ### Changed diff --git a/composer.json b/composer.json index 2dc52d827..16d4ed6b1 100644 --- a/composer.json +++ b/composer.json @@ -1,24 +1,23 @@ { - "name": "phpunit/php-code-coverage", - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "name": "mmapes/php-code-coverage-optional-whitelist", + "description": "Fork with optional whitelist of Library that provides collection, processing, and rendering functionality for PHP code coverage information.", "type": "library", "keywords": [ "coverage", "testing", "xunit" ], - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "homepage": "https://github.com/mmapes/php-code-coverage-optional-whitelist", "license": "BSD-3-Clause", "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "name": "Marty Mapes", + "email": "github@boulderinformationservices.com", "role": "lead" } ], "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "irc": "irc://irc.freenode.net/phpunit" + "issues": "https://github.com/mmapes/php-code-coverage-optional-whitelist/pulls" }, "require": { "php": "^5.6 || ^7.0", diff --git a/src/Filter.php b/src/Filter.php index 771a657ae..e89f45e5b 100644 --- a/src/Filter.php +++ b/src/Filter.php @@ -128,7 +128,7 @@ public function isFiltered($filename) $filename = realpath($filename); - return !isset($this->whitelistedFiles[$filename]); + return $this->hasWhitelist() && !isset($this->whitelistedFiles[$filename]); } /**