Update report generators for the new data format

Author: sebastianbergmann

src/CodeCoverage/Report/Clover.php

@@ -85,8 +85,8 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
                     for ($i  = $method['startLine'];
                          $i <= $method['endLine'];
                          $i++) {
-                        if (isset($coverage[$i]) && ($coverage[$i] !== null)) {
-                            $methodCount = max($methodCount, count($coverage[$i]));
+                        if (isset($coverage['lines'][$i]) && ($coverage['lines'][$i] !== null)) {
+                            $methodCount = max($methodCount, count($coverage['lines'][$i]));
                         }
                     }
 
@@ -161,7 +161,7 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
                 $xmlClass->appendChild($xmlMetrics);
             }
 
-            foreach ($coverage as $line => $data) {
+            foreach ($coverage['lines'] as $line => $data) {
                 if ($data === null || isset($lines[$line])) {
                     continue;
                 }

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

@@ -303,10 +303,10 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
             $popoverContent = '';
             $popoverTitle   = '';
 
-            if (array_key_exists($i, $coverageData)) {
-                $numTests = count($coverageData[$i]);
+            if (array_key_exists($i, $coverageData['lines'])) {
+                $numTests = count($coverageData['lines'][$i]);
 
-                if ($coverageData[$i] === null) {
+                if ($coverageData['lines'][$i] === null) {
                     $trClass = ' class="warning"';
                 } elseif ($numTests == 0) {
                     $trClass = ' class="danger"';
@@ -320,7 +320,7 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
                         $popoverTitle = '1 test covers line ' . $i;
                     }
 
-                    foreach ($coverageData[$i] as $test) {
+                    foreach ($coverageData['lines'][$i] as $test) {
                         if ($lineCss == 'covered-by-large-tests' && $testData[$test]['size'] == 'medium') {
                             $lineCss = 'covered-by-medium-tests';
                         } elseif ($testData[$test]['size'] == 'small') {

src/CodeCoverage/Report/Node/File.php

@@ -386,8 +386,8 @@ protected function calculateStatistics()
                 }
             }
 
-            if (isset($this->coverageData[$lineNumber]) &&
-                $this->coverageData[$lineNumber] !== null) {
+            if (isset($this->coverageData['lines'][$lineNumber]) &&
+                $this->coverageData['lines'][$lineNumber] !== null) {
                 if (isset($currentClass)) {
                     $currentClass['executableLines']++;
                 }
@@ -406,7 +406,7 @@ protected function calculateStatistics()
 
                 $this->numExecutableLines++;
 
-                if (count($this->coverageData[$lineNumber]) > 0) {
+                if (count($this->coverageData['lines'][$lineNumber]) > 0) {
                     if (isset($currentClass)) {
                         $currentClass['executedLines']++;
                     }

src/CodeCoverage/Report/XML.php

@@ -120,7 +120,9 @@ private function processFile(PHP_CodeCoverage_Report_Node_File $file, PHP_CodeCo
             $this->processFunction($function, $fileReport);
         }
 
-        foreach ($file->getCoverageData() as $line => $tests) {
+        $fileData = $file->getCoverageData();
+
+        foreach ($fileData['lines'] as $line => $tests) {
             if (!is_array($tests) || count($tests) == 0) {
                 continue;
             }