From 1532eca72482895186fdedbef620e3dde2c792c6 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 2 Mar 2014 18:02:08 +0100 Subject: [PATCH 1/5] Fix dependency --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cc00a4dbf..409ce8a38 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "sebastian/version": ">=1.0.0" }, "require-dev": { - "phpunit/phpunit": "4.0.*@dev", + "phpunit/phpunit": "4.1.*@dev", "ext-xdebug": ">=2.1.4" }, "suggest": { From 86cb041851e83b681ac1c44b83ba5b8931234f77 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 16 Mar 2014 09:35:54 +0100 Subject: [PATCH 2/5] Eliminate unused local variable --- src/CodeCoverage/Report/HTML/Renderer/Dashboard.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php b/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php index dbf21252e..1c2f1fd55 100644 --- a/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php +++ b/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php @@ -175,7 +175,7 @@ protected function coverageDistribution(array $classes) ); foreach ($classes as $class) { - foreach ($class['methods'] as $methodName => $method) { + foreach ($class['methods'] as $method) { if ($method['coverage'] == 0) { $result['method']['0%']++; } elseif ($method['coverage'] == 100) { @@ -318,6 +318,10 @@ protected function projectRisks(array $classes) return $result; } + /** + * @param PHP_CodeCoverage_Report_Node $node + * @return string + */ protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node) { return sprintf( From 1068cf760851468b95439ae6f1b789420e1b2e61 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 16 Mar 2014 09:37:05 +0100 Subject: [PATCH 3/5] Eliminate unused local variable --- src/CodeCoverage/Report/HTML/Renderer/File.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CodeCoverage/Report/HTML/Renderer/File.php b/src/CodeCoverage/Report/HTML/Renderer/File.php index 8c73f8f63..7657e7af2 100644 --- a/src/CodeCoverage/Report/HTML/Renderer/File.php +++ b/src/CodeCoverage/Report/HTML/Renderer/File.php @@ -329,7 +329,6 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node) $i = 1; foreach ($codeLines as $line) { - $numTests = ''; $trClass = ''; $popoverContent = ''; $popoverTitle = ''; From 4876f10eb89914c2b17b178ecd5289954c180bcc Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 16 Mar 2014 09:37:25 +0100 Subject: [PATCH 4/5] Add/Fix docblocks --- src/CodeCoverage/Filter.php | 6 +++--- src/CodeCoverage/Report/Factory.php | 3 ++- src/CodeCoverage/Report/HTML/Renderer.php | 21 +++++++++++++++++++ .../Report/HTML/Renderer/File.php | 2 ++ src/CodeCoverage/Util.php | 6 ++++-- .../Util/InvalidArgumentHelper.php | 7 ++++--- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/CodeCoverage/Filter.php b/src/CodeCoverage/Filter.php index 361ca48a2..904651639 100644 --- a/src/CodeCoverage/Filter.php +++ b/src/CodeCoverage/Filter.php @@ -218,7 +218,8 @@ public function removeFileFromWhitelist($filename) /** * Checks whether a filename is a real filename. * - * @param string $filename + * @param string $filename + * @return boolean */ public function isFile($filename) { @@ -240,8 +241,7 @@ public function isFile($filename) * When the whitelist is empty (default), blacklisting is used. * When the whitelist is not empty, whitelisting is used. * - * @param string $filename - * @param boolean $ignoreWhitelist + * @param string $filename * @return boolean * @throws PHP_CodeCoverage_Exception */ diff --git a/src/CodeCoverage/Report/Factory.php b/src/CodeCoverage/Report/Factory.php index c8cb63b4b..72b974a84 100644 --- a/src/CodeCoverage/Report/Factory.php +++ b/src/CodeCoverage/Report/Factory.php @@ -57,7 +57,8 @@ class PHP_CodeCoverage_Report_Factory { /** - * @param PHP_CodeCoverage $coverage + * @param PHP_CodeCoverage $coverage + * @return PHP_CodeCoverage_Report_Node_Directory */ public function create(PHP_CodeCoverage $coverage) { diff --git a/src/CodeCoverage/Report/HTML/Renderer.php b/src/CodeCoverage/Report/HTML/Renderer.php index 6f0876c8a..598b10a7e 100644 --- a/src/CodeCoverage/Report/HTML/Renderer.php +++ b/src/CodeCoverage/Report/HTML/Renderer.php @@ -211,6 +211,10 @@ protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeC ); } + /** + * @param PHP_CodeCoverage_Report_Node $node + * @return string + */ protected function getBreadcrumbs(PHP_CodeCoverage_Report_Node $node) { $breadcrumbs = ''; @@ -239,6 +243,10 @@ protected function getBreadcrumbs(PHP_CodeCoverage_Report_Node $node) return $breadcrumbs; } + /** + * @param PHP_CodeCoverage_Report_Node $node + * @return string + */ protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node) { $buffer = sprintf( @@ -253,6 +261,11 @@ protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node) return $buffer; } + /** + * @param PHP_CodeCoverage_Report_Node $node + * @param $pathToRoot + * @return string + */ protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $pathToRoot) { return sprintf( @@ -262,6 +275,10 @@ protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $pa ); } + /** + * @param PHP_CodeCoverage_Report_Node $node + * @return string + */ protected function getPathToRoot(PHP_CodeCoverage_Report_Node $node) { $id = $node->getId(); @@ -275,6 +292,10 @@ protected function getPathToRoot(PHP_CodeCoverage_Report_Node $node) return str_repeat('../', $depth); } + /** + * @param float $percent + * @return string + */ protected function getCoverageBar($percent) { $level = $this->getColorLevel($percent); diff --git a/src/CodeCoverage/Report/HTML/Renderer/File.php b/src/CodeCoverage/Report/HTML/Renderer/File.php index 7657e7af2..b8a119655 100644 --- a/src/CodeCoverage/Report/HTML/Renderer/File.php +++ b/src/CodeCoverage/Report/HTML/Renderer/File.php @@ -272,6 +272,8 @@ protected function renderFunctionItems(array $functions, Text_Template $template /** * @param Text_Template $template + * @param array $item + * @param string $indent * @return string */ protected function renderFunctionOrMethodItem(Text_Template $template, array $item, $indent = '') diff --git a/src/CodeCoverage/Util.php b/src/CodeCoverage/Util.php index f17904279..8cf922389 100644 --- a/src/CodeCoverage/Util.php +++ b/src/CodeCoverage/Util.php @@ -57,8 +57,10 @@ class PHP_CodeCoverage_Util { /** - * @param float $a - * @param float $b + * @param float $a + * @param float $b + * @param boolean $asString + * @param boolean $fixedWidth * @return float ($a / $b) * 100 */ public static function percent($a, $b, $asString = false, $fixedWidth = false) diff --git a/src/CodeCoverage/Util/InvalidArgumentHelper.php b/src/CodeCoverage/Util/InvalidArgumentHelper.php index 6637a978d..7cd5e712c 100644 --- a/src/CodeCoverage/Util/InvalidArgumentHelper.php +++ b/src/CodeCoverage/Util/InvalidArgumentHelper.php @@ -58,9 +58,10 @@ class PHP_CodeCoverage_Util_InvalidArgumentHelper { /** - * @param integer $argument - * @param string $type - * @param mixed $value + * @param integer $argument + * @param string $type + * @param mixed $value + * @return PHP_CodeCoverage_Exception */ public static function factory($argument, $type, $value = null) { From edd13bbf938b1fa6d41edf8e68d7d696e9a605b1 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Mon, 17 Mar 2014 09:42:12 +0100 Subject: [PATCH 5/5] Blacklist SebastianBergmann\Comparator\Comparator --- src/CodeCoverage/Filter.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CodeCoverage/Filter.php b/src/CodeCoverage/Filter.php index 904651639..4f9f8055f 100644 --- a/src/CodeCoverage/Filter.php +++ b/src/CodeCoverage/Filter.php @@ -314,6 +314,7 @@ private function prefillBlacklist() $this->addDirectoryContainingClassToBlacklist('Symfony\Component\Yaml\Yaml'); $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Diff'); $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Environment\Runtime'); + $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Comparator\Comparator'); $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Exporter\Exporter'); $this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Version'); $this->addDirectoryContainingClassToBlacklist('Composer\Autoload\ClassLoader');