From 20d853b69e4966d1b576d45d2a7064fad589b257 Mon Sep 17 00:00:00 2001 From: Hans-Peter Buniat Date: Wed, 19 Mar 2014 11:26:16 +0100 Subject: [PATCH 1/2] moved blacklist-classnames to static property, to reuse it in PHPUnit_Util_Blacklist --- src/CodeCoverage/Filter.php | 45 +++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 17 deletions(-) mode change 100644 => 100755 src/CodeCoverage/Filter.php diff --git a/src/CodeCoverage/Filter.php b/src/CodeCoverage/Filter.php old mode 100644 new mode 100755 index 81645fdaa..722d16796 --- a/src/CodeCoverage/Filter.php +++ b/src/CodeCoverage/Filter.php @@ -75,6 +75,31 @@ class PHP_CodeCoverage_Filter */ private $blacklistPrefilled = false; + /** + * A list of classes which are always blacklisted + * + * @var array + */ + public static $blacklistClassNames = array( + 'File_Iterator' => 1, + 'PHP_CodeCoverage' => 1, + 'PHP_Invoker' => 1, + 'PHP_Timer' => 1, + 'PHP_Token' => 1, + 'PHPUnit_Framework_TestCase' => 2, + 'PHPUnit_Extensions_Database_TestCase' => 2, + 'PHPUnit_Framework_MockObject_Generator' => 2, + 'PHPUnit_Extensions_SeleniumTestCase' => 2, + 'PHPUnit_Extensions_Story_TestCase' => 2, + 'Text_Template' => 1, + 'Symfony\Component\Yaml\Yaml' => 1, + 'SebastianBergmann\Diff\Diff' => 1, + 'SebastianBergmann\Environment\Runtime' => 1, + 'SebastianBergmann\Exporter\Exporter' => 1, + 'SebastianBergmann\Version' => 1, + 'Composer\Autoload\ClassLoader' => 1 + ); + /** * Adds a directory to the blacklist (recursively). * @@ -300,23 +325,9 @@ private function prefillBlacklist() $this->addFileToBlacklist(__PHPUNIT_PHAR__); } - $this->addDirectoryContainingClassToBlacklist('File_Iterator'); - $this->addDirectoryContainingClassToBlacklist('PHP_CodeCoverage'); - $this->addDirectoryContainingClassToBlacklist('PHP_Invoker'); - $this->addDirectoryContainingClassToBlacklist('PHP_Timer'); - $this->addDirectoryContainingClassToBlacklist('PHP_Token'); - $this->addDirectoryContainingClassToBlacklist('PHPUnit_Framework_TestCase', 2); - $this->addDirectoryContainingClassToBlacklist('PHPUnit_Extensions_Database_TestCase', 2); - $this->addDirectoryContainingClassToBlacklist('PHPUnit_Framework_MockObject_Generator', 2); - $this->addDirectoryContainingClassToBlacklist('PHPUnit_Extensions_SeleniumTestCase', 2); - $this->addDirectoryContainingClassToBlacklist('PHPUnit_Extensions_Story_TestCase', 2); - $this->addDirectoryContainingClassToBlacklist('Text_Template'); - $this->addDirectoryContainingClassToBlacklist('Symfony\Component\Yaml\Yaml'); - $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Diff\Diff'); - $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Environment\Runtime'); - $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Exporter\Exporter'); - $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Version'); - $this->addDirectoryContainingClassToBlacklist('Composer\Autoload\ClassLoader'); + foreach (self::$blacklistClassNames as $className => $parent) { + $this->addDirectoryContainingClassToBlacklist($className, $parent); + } $this->blacklistPrefilled = true; } From 36b5e7f910e0be19d89f69aad3261df9b3b440f9 Mon Sep 17 00:00:00 2001 From: Hans-Peter Buniat Date: Wed, 19 Mar 2014 11:33:35 +0100 Subject: [PATCH 2/2] fixed mode --- src/CodeCoverage/Filter.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/CodeCoverage/Filter.php diff --git a/src/CodeCoverage/Filter.php b/src/CodeCoverage/Filter.php old mode 100755 new mode 100644