Merge branch '1.2'

Author: sebastianbergmann

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

@@ -132,8 +132,8 @@ protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
             'numExecutableLines'           => $node->getNumExecutableLines(),
             'testedMethodsPercent'         => $node->getTestedMethodsPercent(FALSE),
             'testedMethodsPercentAsString' => $node->getTestedMethodsPercent(),
-            'testedClassesPercent'         => $node->getTestedClassesPercent(FALSE),
-            'testedClassesPercentAsString' => $node->getTestedClassesPercent(),
+            'testedClassesPercent'         => $node->getTestedClassesAndTraitsPercent(FALSE),
+            'testedClassesPercentAsString' => $node->getTestedClassesAndTraitsPercent(),
             'crap'                         => '<acronym title="Change Risk Anti-Patterns (CRAP) Index">CRAP</acronym>'
           )
         );