Work in progress.

Author: sebastianbergmann

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

@@ -149,8 +149,8 @@ protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
           array(
             'itemClass'                    => 'coverDirectory',
             'name'                         => 'Total',
-            'numClasses'                   => $node->getNumClasses(),
-            'numTestedClasses'             => $node->getNumTestedClasses(),
+            'numClasses'                   => $node->getNumClasses() + $node->getNumTraits(),
+            'numTestedClasses'             => $node->getNumTestedClasses() + $node->getNumTestedTraits(),
             'numMethods'                   => $node->getNumMethods(),
             'numTestedMethods'             => $node->getNumTestedMethods(),
             'linesExecutedPercent'         => $node->getLineExecutedPercent(FALSE),
@@ -164,9 +164,50 @@ protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
           )
         );
 
+        $items .= $this->renderTraitOrClassItems($node->getTraits(), 'Traits');
+        $items .= $this->renderTraitOrClassItems($node->getClasses(), 'Classes');
+        $items .= $this->renderFunctionItems($node->getFunctions());
+
         return $items;
     }
 
+    /**
+     * @param  array  $items
+     * @param  string $title
+     * @return string
+     */
+    protected function renderTraitOrClassItems(array $items, $title)
+    {
+        if (empty($items)) {
+            return '';
+        }
+
+        $buffer = '';
+
+        foreach ($items as $name => $item) {
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @param  array $items
+     * @return string
+     */
+    protected function renderFunctionItems(array $items)
+    {
+        if (empty($items)) {
+            return '';
+        }
+
+        $buffer = '';
+
+        foreach ($items as $name => $item) {
+        }
+
+        return $buffer;
+    }
+
     /**
      * @param  PHP_CodeCoverage_Report_Node_File $node
      * @return string

PHP/CodeCoverage/Report/Node/File.php

@@ -102,6 +102,11 @@ class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
      */
     protected $linesOfCode = array();
 
+    /**
+     * @var integer
+     */
+    protected $numTestedTraits = 0;
+
     /**
      * @var integer
      */
@@ -465,6 +470,38 @@ protected function calculateStatistics()
             }
         }
 
+        foreach ($this->traits as $traitName => &$trait) {
+            foreach ($trait['methods'] as &$method) {
+                if ($method['executableLines'] > 0) {
+                    $method['coverage'] = ($method['executedLines'] /
+                                           $method['executableLines']) * 100;
+                } else {
+                    $method['coverage'] = 100;
+                }
+
+                $method['crap'] = PHP_CodeCoverage_Util::crap(
+                  $method['ccn'], $method['coverage']
+                );
+
+                $trait['ccn'] += $method['ccn'];
+            }
+
+            if ($trait['executableLines'] > 0) {
+                $trait['coverage'] = ($trait['executedLines'] /
+                                      $trait['executableLines']) * 100;
+            } else {
+                $trait['coverage'] = 100;
+            }
+
+            if ($trait['coverage'] == 100) {
+                $this->numTestedClasses++;
+            }
+
+            $trait['crap'] = PHP_CodeCoverage_Util::crap(
+              $trait['ccn'], $trait['coverage']
+            );
+        }
+
         foreach ($this->classes as $className => &$class) {
             foreach ($class['methods'] as &$method) {
                 if ($method['executableLines'] > 0) {