More work on sebastianbergmann#432

Author: sebastianbergmann

src/Node/File.php

@@ -60,13 +60,23 @@ class File extends AbstractNode
     /**
      * @var int
      */
-    private $numTestedTraits = 0;
+    private $numClasses = null;
 
     /**
      * @var int
      */
     private $numTestedClasses = 0;
 
+    /**
+     * @var int
+     */
+    private $numTraits = null;
+
+    /**
+     * @var int
+     */
+    private $numTestedTraits = 0;
+
     /**
      * @var int
      */
@@ -223,7 +233,21 @@ public function getNumExecutedLines()
      */
     public function getNumClasses()
     {
-        return count($this->classes);
+        if ($this->numClasses === null) {
+            $this->numClasses = 0;
+
+            foreach ($this->classes as $class) {
+                foreach ($class['methods'] as $method) {
+                    if ($method['executableLines'] > 0) {
+                        $this->numClasses++;
+
+                        continue 2;
+                    }
+                }
+            }
+        }
+
+        return $this->numClasses;
     }
 
     /**
@@ -243,7 +267,21 @@ public function getNumTestedClasses()
      */
     public function getNumTraits()
     {
-        return count($this->traits);
+        if ($this->numTraits === null) {
+            $this->numTraits = 0;
+
+            foreach ($this->traits as $trait) {
+                foreach ($trait['methods'] as $method) {
+                    if ($method['executableLines'] > 0) {
+                        $this->numTraits++;
+
+                        continue 2;
+                    }
+                }
+            }
+        }
+
+        return $this->numTraits;
     }
 
     /**
@@ -484,14 +522,14 @@ protected function calculateStatistics()
             if ($trait['executableLines'] > 0) {
                 $trait['coverage'] = ($trait['executedLines'] /
                         $trait['executableLines']) * 100;
+
+                if ($trait['coverage'] == 100) {
+                    $this->numTestedClasses++;
+                }
             } else {
                 $trait['coverage'] = 100;
             }
 
-            if ($trait['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
             $trait['crap'] = $this->crap(
                 $trait['ccn'],
                 $trait['coverage']
@@ -518,14 +556,14 @@ protected function calculateStatistics()
             if ($class['executableLines'] > 0) {
                 $class['coverage'] = ($class['executedLines'] /
                         $class['executableLines']) * 100;
+
+                if ($class['coverage'] == 100) {
+                    $this->numTestedClasses++;
+                }
             } else {
                 $class['coverage'] = 100;
             }
 
-            if ($class['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
             $class['crap'] = $this->crap(
                 $class['ccn'],
                 $class['coverage']

src/Report/Html/Renderer/File.php

@@ -147,24 +147,34 @@ protected function renderTraitOrClassItems(array $items, \Text_Template $templat
                 }
             }
 
+            if ($item['executableLines'] > 0) {
+                $numClasses                   = 1;
+                $numTestedClasses             = $numTestedMethods == $numMethods ? 1 : 0;
+                $linesExecutedPercentAsString = Util::percent(
+                    $item['executedLines'],
+                    $item['executableLines'],
+                    false
+                );
+            } else {
+                $numClasses                   = 'n/a';
+                $numTestedClasses             = 'n/a';
+                $linesExecutedPercentAsString = 'n/a';
+            }
+
             $buffer .= $this->renderItemTemplate(
                 $template,
                 [
                     'name'                         => $name,
-                    'numClasses'                   => 1,
-                    'numTestedClasses'             => $numTestedMethods == $numMethods ? 1 : 0,
+                    'numClasses'                   => $numClasses,
+                    'numTestedClasses'             => $numTestedClasses,
                     'numMethods'                   => $numMethods,
                     'numTestedMethods'             => $numTestedMethods,
                     'linesExecutedPercent'         => Util::percent(
                         $item['executedLines'],
                         $item['executableLines'],
                         false
                     ),
-                    'linesExecutedPercentAsString' => Util::percent(
-                        $item['executedLines'],
-                        $item['executableLines'],
-                        true
-                    ),
+                    'linesExecutedPercentAsString' => $linesExecutedPercentAsString,
                     'numExecutedLines'             => $item['executedLines'],
                     'numExecutableLines'           => $item['executableLines'],
                     'testedMethodsPercent'         => Util::percent(