Merge branch '2.0'

Author: sebastianbergmann

composer.json

@@ -30,7 +30,7 @@
         "sebastian/version": ">=1.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.1.*@dev",
+        "phpunit/phpunit": "4.0.*@dev",
         "ext-xdebug": ">=2.1.4"
     },
     "suggest": {

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

@@ -43,6 +43,28 @@
  * @since      File available since Release 1.1.0
  */
 
+// @codeCoverageIgnoreStart
+if (!defined('T_TRAIT')) {
+    define('T_TRAIT', 1001);
+}
+
+if (!defined('T_INSTEADOF')) {
+    define('T_INSTEADOF', 1002);
+}
+
+if (!defined('T_CALLABLE')) {
+    define('T_CALLABLE', 1003);
+}
+
+if (!defined('T_FINALLY')) {
+    define('T_FINALLY', 1004);
+}
+
+if (!defined('T_YIELD')) {
+    define('T_YIELD', 1005);
+}
+// @codeCoverageIgnoreEnd
+
 /**
  * Renders a PHP_CodeCoverage_Report_Node_File node.
  *
@@ -483,6 +505,7 @@ protected function loadFile($file)
                                 case T_EXIT:
                                 case T_EXTENDS:
                                 case T_FINAL:
+                                case T_FINALLY:
                                 case T_FOREACH:
                                 case T_FUNCTION:
                                 case T_GLOBAL:
@@ -512,7 +535,8 @@ protected function loadFile($file)
                                 case T_UNSET:
                                 case T_USE:
                                 case T_VAR:
-                                case T_WHILE: {
+                                case T_WHILE:
+                                case T_YIELD: {
                                     $colour = 'keyword';
                                 }
                                     break;