WIP

Author: sebastianbergmann

src/CodeCoverage.php

@@ -363,15 +363,15 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
 
         $this->tests[$id] = ['size' => $size, 'status' => $status];
 
-        foreach ($data as $file => $lines) {
+        foreach ($data as $file => $fileCoverage) {
             if (!$this->filter->isFile($file)) {
                 continue;
             }
 
-            foreach ($lines as $k => $v) {
+            foreach ($fileCoverage['lines'] as $k => $v) {
                 if ($v == Driver::LINE_EXECUTED) {
-                    if (empty($this->data[$file][$k]) || !in_array($id, $this->data[$file][$k])) {
-                        $this->data[$file][$k][] = $id;
+                    if (empty($this->data[$file]['lines'][$k]) || !in_array($id, $this->data[$file]['lines'][$k])) {
+                        $this->data[$file]['lines'][$k][] = $id;
                     }
                 }
             }
@@ -389,22 +389,22 @@ public function merge(CodeCoverage $that)
             array_merge($this->filter->getWhitelistedFiles(), $that->filter()->getWhitelistedFiles())
         );
 
-        foreach ($that->data as $file => $lines) {
+        foreach ($that->data as $file => $fileCoverage) {
             if (!isset($this->data[$file])) {
                 if (!$this->filter->isFiltered($file)) {
-                    $this->data[$file] = $lines;
+                    $this->data[$file] = $fileCoverage;
                 }
 
                 continue;
             }
 
-            foreach ($lines as $line => $data) {
+            foreach ($fileCoverage['lines'] as $line => $data) {
                 if ($data !== null) {
-                    if (!isset($this->data[$file][$line])) {
-                        $this->data[$file][$line] = $data;
+                    if (!isset($this->data[$file]['lines'][$line])) {
+                        $this->data[$file]['lines'][$line] = $data;
                     } else {
-                        $this->data[$file][$line] = array_unique(
-                            array_merge($this->data[$file][$line], $data)
+                        $this->data[$file]['lines'][$line] = array_unique(
+                            array_merge($this->data[$file]['lines'][$line], $data)
                         );
                     }
                 }
@@ -640,8 +640,8 @@ private function applyCoversAnnotationFilter(array &$data, $linesToBeCovered, ar
         foreach (array_keys($data) as $filename) {
             $_linesToBeCovered = array_flip($linesToBeCovered[$filename]);
 
-            $data[$filename] = array_intersect_key(
-                $data[$filename],
+            $data[$filename]['lines'] = array_intersect_key(
+                $data[$filename]['lines'],
                 $_linesToBeCovered
             );
         }
@@ -674,7 +674,7 @@ private function applyIgnoredLinesFilter(array &$data)
             }
 
             foreach ($this->getLinesToBeIgnored($filename) as $line) {
-                unset($data[$filename][$line]);
+                unset($data[$filename]['lines'][$line]);
             }
         }
     }
@@ -684,12 +684,12 @@ private function applyIgnoredLinesFilter(array &$data)
      */
     private function initializeFilesThatAreSeenTheFirstTime(array $data)
     {
-        foreach ($data as $file => $lines) {
+        foreach ($data as $file => $fileCoverage) {
             if ($this->filter->isFile($file) && !isset($this->data[$file])) {
-                $this->data[$file] = [];
+                $this->data[$file] = ['lines' => [], 'functions' => $fileCoverage['functions']];
 
-                foreach ($lines as $k => $v) {
-                    $this->data[$file][$k] = $v == -2 ? null : [];
+                foreach ($fileCoverage['lines'] as $k => $v) {
+                    $this->data[$file]['lines'][$k] = $v == -2 ? null : [];
                 }
             }
         }
@@ -922,7 +922,7 @@ private function performUnintentionallyCoveredCodeCheck(array &$data, array $lin
         $unintentionallyCoveredUnits = [];
 
         foreach ($data as $file => $_data) {
-            foreach ($_data as $line => $flag) {
+            foreach ($_data['lines'] as $line => $flag) {
                 if ($flag == 1 && !isset($allowedLines[$file][$line])) {
                     $unintentionallyCoveredUnits[] = $this->wizard->lookup($file, $line);
                 }
@@ -953,7 +953,7 @@ private function performUnexecutedCoveredCodeCheck(array &$data, array $linesToB
         );
 
         foreach ($data as $file => $_data) {
-            foreach (array_keys($_data) as $line) {
+            foreach (array_keys($_data['lines']) as $line) {
                 if (!isset($expectedLines[$file][$line])) {
                     continue;
                 }
@@ -1101,9 +1101,9 @@ protected function initializeData()
                     continue;
                 }
 
-                foreach (array_keys($fileCoverage) as $key) {
-                    if ($fileCoverage[$key] == Driver::LINE_EXECUTED) {
-                        $fileCoverage[$key] = Driver::LINE_NOT_EXECUTED;
+                foreach (array_keys($fileCoverage['lines']) as $line) {
+                    if ($fileCoverage['lines'][$line] == Driver::LINE_EXECUTED) {
+                        $fileCoverage['lines'][$line] = Driver::LINE_NOT_EXECUTED;
                     }
                 }
 

src/Driver/Xdebug.php

@@ -94,14 +94,39 @@ public function stop()
     private function cleanup(array $data)
     {
         foreach (array_keys($data) as $file) {
-            unset($data[$file][0]);
+            if (!$this->branchCoverage) {
+                $data[$file]['lines']     = [];
+                $data[$file]['functions'] = [];
+
+                foreach (array_keys($data[$file]) as $line) {
+                    if (!is_int($line)) {
+                        continue;
+                    }
+
+                    $data[$file]['lines'][$line] = $data[$file][$line];
+
+                    unset($data[$file][$line]);
+                }
+            }
+
+            unset($data[$file]['lines'][0]);
 
             if (strpos($file, 'xdebug://debug-eval') !== 0 && file_exists($file)) {
                 $numLines = $this->getNumberOfLinesInFile($file);
 
-                foreach (array_keys($data[$file]) as $line) {
+                if (!isset($data[$file]['lines'])) {
+                    // TODO: Figure out why how this can happen
+                    $data[$file]['lines'] = [];
+                }
+
+                if (!isset($data[$file]['functions'])) {
+                    // TODO: Figure out why how this can happen
+                    $data[$file]['functions'] = [];
+                }
+
+                foreach (array_keys($data[$file]['lines']) as $line) {
                     if ($line > $numLines) {
-                        unset($data[$file][$line]);
+                        unset($data[$file]['lines'][$line]);
                     }
                 }
             }

src/Node/File.php

@@ -431,7 +431,7 @@ protected function calculateStatistics()
                 }
             }
 
-            if (isset($this->coverageData[$lineNumber])) {
+            if (isset($this->coverageData['lines'][$lineNumber])) {
                 if (isset($currentClass)) {
                     $currentClass['executableLines']++;
                 }
@@ -450,7 +450,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/Report/Clover.php

@@ -58,7 +58,7 @@ public function process(CodeCoverage $coverage, $target = null, $name = null)
             $xmlFile->setAttribute('name', $item->getPath());
 
             $classes   = $item->getClassesAndTraits();
-            $coverage  = $item->getCoverageData();
+            $coverage  = $item->getCoverageData()['lines'];
             $lines     = [];
             $namespace = 'global';
 

src/Report/Html/Renderer/File.php

@@ -292,7 +292,7 @@ protected function renderFunctionOrMethodItem(\Text_Template $template, array $i
      */
     protected function renderSource(FileNode $node)
     {
-        $coverageData = $node->getCoverageData();
+        $coverageData = $node->getCoverageData()['lines'];
         $testData     = $node->getTestData();
         $codeLines    = $this->loadFile($node->getPath());
         $lines        = '';

src/Report/Xml/Facade.php

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