Method ordering, color and layout fixes for Report_Text

Author: edorian

PHP/CodeCoverage/Report/Text.php

@@ -120,6 +120,8 @@ public function process(PHP_CodeCoverage $coverage, $showColors = false)
           . $colors['lines'] . $colors['eol'] . '  Lines:   ' . PHP_CodeCoverage_Util::percent($report->getNumExecutedLines(), $report->getNumExecutableLines(), TRUE)
           . ' ( ' . $report->getNumExecutedLines() . '/' . $report->getNumExecutableLines() . ' )' . PHP_EOL . $colors['reset'] . $colors ['eol'];
 
+        $classCoverage = array();
+
         foreach ($report as $item) {
             if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
                 continue;
@@ -191,24 +193,57 @@ public function process(PHP_CodeCoverage $coverage, $showColors = false)
                     $namespace = '';
                 }
 
-                if($coveredClassStatements != 0 || $this->showUncoveredFiles || true) { 
-                    $output .= PHP_EOL . $namespace . $className
-                      . PHP_EOL . '  Methods: ' . $coveredMethods . '/' . count($class['methods'])
-                      . '  Lines: ' . $classStatements . '/' . $coveredClassStatements;
+                $classCoverage[$namespace . $className] = array(
+                    'namespace' => $namespace,
+                    'className ' => $className,
+                    'methodsCovered' => $coveredMethods,
+                    'methodCount' => count($class['methods']),
+                    'statementsCovered' => $coveredClassStatements,
+                    'statementCount' => $classStatements,
+                );   
+            }
+        }
+        ksort($classCoverage);
+
+        $methodColor = '';
+        $linesColor = '';
+        $resetColor = '';
+        foreach($classCoverage as $fullQualifiedPath => $classInfo) {
+            if($classInfo['statementsCovered'] != 0 || $this->showUncoveredFiles || true) {
+                if($showColors) {
+                    $methodColor = $this->getCoverageColor($classInfo['methodsCovered'], $classInfo['methodCount']);
+                    $linesColor = $this->getCoverageColor($classInfo['statementsCovered'], $classInfo['statementsCovered' ]);
+                    $resetColor = $colors['reset']; 
                 }
-
+                $output .= PHP_EOL . $fullQualifiedPath . PHP_EOL
+                  . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' '
+                  . '  ' . $linesColor  . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor
+                ;
             }
         }
+
         $this->outputStream->write($output);
         return;
 
     }
 
     protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements) {
         if($totalNumberOfElements > 0) {
-            $coverage = $numberOfCoveredElements / $totalNumberOfElements;
+            $coverage = $numberOfCoveredElements / $totalNumberOfElements * 100;
+            if($coverage > $this->highLowerBound) {
+                return $this->colors['green'];
+            } else if($coverage > $this->lowUpperBound) {
+                return $this->colors['yellow'];
+            }
         }
         return $this->colors['red'];
     }
 
+    protected function printCoverageCounts($numberOfCoveredElements, $totalNumberOfElements, $presicion) {
+        $format = '%' . $presicion . 's';
+        return PHP_CodeCoverage_Util::percent($numberOfCoveredElements, $totalNumberOfElements, TRUE, TRUE)
+          . ' (' . sprintf($format, $numberOfCoveredElements) . '/' . sprintf($format, $totalNumberOfElements) . ')';
+    }
+
 }
+

PHP/CodeCoverage/Util.php

@@ -321,7 +321,7 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
      * @param  float $b
      * @return float ($a / $b) * 100
      */
-    public static function percent($a, $b, $asString = FALSE)
+    public static function percent($a, $b, $asString = FALSE, $fixedWidth = FALSE)
     {
         if ($b > 0) {
             $percent = ($a / $b) * 100;
@@ -330,6 +330,9 @@ public static function percent($a, $b, $asString = FALSE)
         }
 
         if ($asString) {
+            if($fixedWidth) {
+                return sprintf('%6.2F%%', $percent);
+            }
             return sprintf('%01.2F%%', $percent);
         } else {
             return $percent;