Merge branch 'master' of github.com:sebastianbergmann/php-code-coverage into report-refactoring

Author: sebastianbergmann

PHP/CodeCoverage/Util.php

@@ -531,7 +531,8 @@ protected static function resolveCoversToReflectionObjects($coveredElement)
                         );
                     } else {
                         if (!((class_exists($className) ||
-                               interface_exists($className)) &&
+                               interface_exists($className) ||
+                               trait_exists($className)) &&
                               method_exists($className, $methodName))) {
                             throw new RuntimeException(
                               sprintf(
@@ -571,7 +572,8 @@ class_parents($coveredElement)
 
             foreach ($classes as $className) {
                 if (!class_exists($className) &&
-                    !interface_exists($className)) {
+                    !interface_exists($className) &&
+                    !trait_exists($className)) {
                     throw new RuntimeException(
                       sprintf(
                         'Trying to @cover not existing class or ' .