Merge branch '4.0'

Author: sebastianbergmann

ChangeLog-4.0.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHP_CodeCoverage 4.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.0.4] - 2016-12-20
+
+### Changed
+
+* Implemented [#432](https://github.com/sebastianbergmann/php-code-coverage/issues/432): Change how files with no executable lines are displayed in the HTML report
+
 ## [4.0.3] - 2016-11-28
 
 ### Changed
@@ -26,6 +32,7 @@ All notable changes of the PHP_CodeCoverage 4.0 release series are documented in
 
 * This component now uses namespaces
 
+[4.0.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.3...4.0.4
 [4.0.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.2...4.0.3
 [4.0.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.1...4.0.2
 [4.0.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/4.0.0...4.0.1

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.php

@@ -92,9 +92,10 @@ protected function renderItemTemplate(\Text_Template $template, array $data)
                 $data['testedClassesPercent']
             );
         } else {
-            $classesLevel  = 'success';
-            $classesNumber = '0' . $numSeparator . '0';
-            $classesBar    = $this->getCoverageBar(100);
+            $classesLevel                         = '';
+            $classesNumber                        = '0' . $numSeparator . '0';
+            $classesBar                           = '';
+            $data['testedClassesPercentAsString'] = 'n/a';
         }
 
         if ($data['numMethods'] > 0) {
@@ -107,10 +108,10 @@ protected function renderItemTemplate(\Text_Template $template, array $data)
                 $data['testedMethodsPercent']
             );
         } else {
-            $methodsLevel                         = 'success';
+            $methodsLevel                         = '';
             $methodsNumber                        = '0' . $numSeparator . '0';
-            $methodsBar                           = $this->getCoverageBar(100);
-            $data['testedMethodsPercentAsString'] = '100.00%';
+            $methodsBar                           = '';
+            $data['testedMethodsPercentAsString'] = 'n/a';
         }
 
         if ($data['numExecutableLines'] > 0) {
@@ -123,10 +124,10 @@ protected function renderItemTemplate(\Text_Template $template, array $data)
                 $data['linesExecutedPercent']
             );
         } else {
-            $linesLevel                           = 'success';
+            $linesLevel                           = '';
             $linesNumber                          = '0' . $numSeparator . '0';
-            $linesBar                             = $this->getCoverageBar(100);
-            $data['linesExecutedPercentAsString'] = '100.00%';
+            $linesBar                             = '';
+            $data['linesExecutedPercentAsString'] = 'n/a';
         }
 
         $template->setVar(

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(