Add PHP_CodeCoverage_Util::percent().

Author: sebastianbergmann

PHP/CodeCoverage/Report/HTML/Node.php

@@ -91,9 +91,10 @@ public function __construct($name, PHP_CodeCoverage_Report_HTML_Node $parent = N
      */
     public function getTestedClassesPercent()
     {
-        return $this->calculatePercent(
+        return PHP_CodeCoverage_Util::percent(
           $this->getNumTestedClasses(),
-          $this->getNumClasses()
+          $this->getNumClasses(),
+          TRUE
         );
     }
 
@@ -104,9 +105,10 @@ public function getTestedClassesPercent()
      */
     public function getTestedMethodsPercent()
     {
-        return $this->calculatePercent(
+        return PHP_CodeCoverage_Util::percent(
           $this->getNumTestedMethods(),
-          $this->getNumMethods()
+          $this->getNumMethods(),
+          TRUE
         );
     }
 
@@ -117,9 +119,10 @@ public function getTestedMethodsPercent()
      */
     public function getLineExecutedPercent()
     {
-        return $this->calculatePercent(
+        return PHP_CodeCoverage_Util::percent(
           $this->getNumExecutedLines(),
-          $this->getNumExecutableLines()
+          $this->getNumExecutableLines(),
+          TRUE
         );
     }
 
@@ -248,27 +251,6 @@ public function getPath()
         return $this->cache['path'];
     }
 
-    /**
-     * Calculates a percentage value.
-     *
-     * @param  integer $a
-     * @param  integer $b
-     * @return float   ($a / $b) * 100
-     */
-    protected function calculatePercent($a, $b)
-    {
-        if ($b > 0) {
-            $percent = ($a / $b) * 100;
-        } else {
-            $percent = 100;
-        }
-
-        return sprintf(
-          '%01.2F',
-          $percent
-        );
-    }
-
     protected function doRenderItemObject(PHP_CodeCoverage_Report_HTML_Node $item, $lowUpperBound, $highLowerBound, $link = NULL, $itemClass = 'coverItem')
     {
         return $this->doRenderItem(

PHP/CodeCoverage/Report/HTML/Node/File.php

@@ -427,13 +427,15 @@ public function render($target, $title, $charset = 'ISO-8859-1', $lowUpperBound
                                           ),
                 'numMethods'           => $numMethods,
                 'numTestedMethods'     => $numTestedMethods,
-                'testedMethodsPercent' => $this->calculatePercent(
-                  $numTestedMethods, $numMethods
+                'testedMethodsPercent' => PHP_CodeCoverage_Util::percent(
+                  $numTestedMethods, $numMethods, TRUE
                 ),
                 'numExecutableLines'   => $classData['executableLines'],
                 'numExecutedLines'     => $classData['executedLines'],
-                'executedLinesPercent' => $this->calculatePercent(
-                  $classData['executedLines'], $classData['executableLines']
+                'executedLinesPercent' => PHP_CodeCoverage_Util::percent(
+                  $classData['executedLines'],
+                  $classData['executableLines'],
+                  TRUE
                 )
               ),
               $lowUpperBound,
@@ -468,9 +470,10 @@ public function render($target, $title, $charset = 'ISO-8859-1', $lowUpperBound
                                               ),
                     'numExecutableLines'   => $methodData['executableLines'],
                     'numExecutedLines'     => $methodData['executedLines'],
-                    'executedLinesPercent' => $this->calculatePercent(
+                    'executedLinesPercent' => PHP_CodeCoverage_Util::percent(
                       $methodData['executedLines'],
-                      $methodData['executableLines']
+                      $methodData['executableLines'],
+                      TRUE
                     )
                   ),
                   $lowUpperBound,

PHP/CodeCoverage/Util.php

@@ -408,6 +408,26 @@ public static function getSafeFilename($filename)
         return preg_replace('#[^\w.]#', '_', $filename);
     }
 
+    /**
+     * @param  float $a
+     * @param  float $b
+     * @return float ($a / $b) * 100
+     */
+    public static function percent($a, $b, $asString = FALSE)
+    {
+        if ($b > 0) {
+            $percent = ($a / $b) * 100;
+        } else {
+            $percent = 100;
+        }
+
+        if ($asString) {
+            return sprintf('%01.2F', $percent);
+        } else {
+            return $percent;
+        }
+    }
+
     /**
      * Reduces the paths by cutting the longest common start path.
      *