Merge branch 'master' into feature/path-coverage

Author: sebastianbergmann

src/CodeCoverage.php

@@ -305,17 +305,17 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
             return;
         }
 
-        $size   = null;
+        $size   = 'unknown';
         $status = null;
 
         if ($id instanceof PHPUnit_Framework_TestCase) {
-            $size   = $id->getSize();
+            $_size = $id->getSize();
 
-            if ($size == PHPUnit_Util_Test::SMALL) {
+            if ($_size == PHPUnit_Util_Test::SMALL) {
                 $size = 'small';
-            } elseif ($size == PHPUnit_Util_Test::MEDIUM) {
+            } elseif ($_size == PHPUnit_Util_Test::MEDIUM) {
                 $size = 'medium';
-            } else {
+            } elseif ($_size == PHPUnit_Util_Test::LARGE) {
                 $size = 'large';
             }
 

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

@@ -339,7 +339,7 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
                                         $testCSS = ' class="covered-by-medium-tests"';
                                         break;
 
-                                    case 'large':
+                                    default:
                                         $testCSS = ' class="covered-by-large-tests"';
                                         break;
                                 }

tests/PHP/CodeCoverageTest.php

@@ -272,12 +272,18 @@ public function testCollect()
             $coverage->getData()
         );
 
+        if (version_compare(PHPUnit_Runner_Version::id(), '4.7', '>=')) {
+            $size = 'unknown';
+        } else {
+            $size = 'small';
+        }
+
         $this->assertEquals(
             array(
-                'BankAccountTest::testBalanceIsInitiallyZero' => array('size' => 'small', 'status' => null),
-                'BankAccountTest::testBalanceCannotBecomeNegative' => array('size' => 'small', 'status' => null),
-                'BankAccountTest::testBalanceCannotBecomeNegative2' => array('size' => 'small', 'status' => null),
-                'BankAccountTest::testDepositWithdrawMoney' => array('size' => 'small', 'status' => null)
+                'BankAccountTest::testBalanceIsInitiallyZero' => array('size' => $size, 'status' => null),
+                'BankAccountTest::testBalanceCannotBecomeNegative' => array('size' => $size, 'status' => null),
+                'BankAccountTest::testBalanceCannotBecomeNegative2' => array('size' => $size, 'status' => null),
+                'BankAccountTest::testDepositWithdrawMoney' => array('size' => $size, 'status' => null)
             ),
             $coverage->getTests()
         );