Adapt drivers to raw data format used by Xdebug when XDEBUG_CC_BRANCH_CHECK is set

Author: sebastianbergmann

src/CodeCoverage/Data/FileCollection.php

@@ -67,14 +67,14 @@ class PHP_CodeCoverage_Data_FileCollection implements Countable, IteratorAggrega
      */
     public function processData($id, array $data)
     {
-        foreach ($data as $file => $lines) {
+        foreach ($data as $file => $_data) {
             if (!isset($this->files[$file])) {
-                $this->createFile($file, $lines);
+                $this->createFile($file, $_data);
             }
 
             $_lines = array();
 
-            foreach ($lines as $lineNumber => $flag) {
+            foreach ($_data['lines'] as $lineNumber => $flag) {
                 if ($flag == 1) {
                     $_lines[] = $lineNumber;
                 }
@@ -93,15 +93,15 @@ public function merge(PHP_CodeCoverage_Data_FileCollection $other)
 
     /**
      * @param string $path
-     * @param array  $lines
+     * @param array  $data
      */
-    private function createFile($path, array $lines)
+    private function createFile($path, array $data)
     {
         $_lines    = new PHP_CodeCoverage_Data_LineCollection;
         $functions = new PHP_CodeCoverage_Data_FunctionCollection;
         // @todo Populate $functions
 
-        foreach ($lines as $lineNumber => $flag) {
+        foreach ($data['lines'] as $lineNumber => $flag) {
             $opcodes = new PHP_CodeCoverage_Data_OpcodeCollection;
             // @todo Populate $opcodes
 

src/CodeCoverage/Driver/HHVM.php

@@ -88,4 +88,15 @@ protected function doStop()
 
         return $data;
     }
+
+    /**
+     * @param array $data
+     */
+    protected function cleanup(array &$data)
+    {
+        foreach (array_keys($data) as $file) {
+            $data[$file] = array('lines' => $data[$file]);
+        }
+    }
 }
+

src/CodeCoverage/Driver/Xdebug.php

@@ -58,7 +58,12 @@
 class PHP_CodeCoverage_Driver_Xdebug extends PHP_CodeCoverage_Driver
 {
     /**
-     * @throws PHP_CodeCoverage_Exception
+     * @var integer
+     */
+    private $flags = false;
+
+    /**
+     * Constructor.
      */
     protected function ensureDriverCanWork()
     {
@@ -72,14 +77,20 @@ protected function ensureDriverCanWork()
                 'xdebug.coverage_enable=On has to be set in php.ini'
             );
         }
+
+        $this->flags = XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE;
+
+        if (defined('XDEBUG_CC_BRANCH_CHECK')) {
+            $this->flags |= XDEBUG_CC_BRANCH_CHECK;
+        }
     }
 
     /**
      * Start collection of code coverage information.
      */
     protected function doStart()
     {
-        xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+        xdebug_start_code_coverage($this->flags);
     }
 
     /**
@@ -102,16 +113,20 @@ protected function doStop()
     protected function cleanup(array &$data)
     {
         foreach (array_keys($data) as $file) {
-            if (isset($data[$file][0])) {
-                unset($data[$file][0]);
+            if (!isset($data[$file]['lines'])) {
+                $data[$file] = array('lines' => $data[$file]);
+            }
+
+            if (isset($data[$file]['lines'][0])) {
+                unset($data[$file]['lines'][0]);
             }
 
             if (file_exists($file)) {
                 $numLines = PHP_CodeCoverage_Util::numberOfLinesInFile($file);
 
-                foreach (array_keys($data[$file]) as $line) {
-                    if (isset($data[$file][$line]) && $line > $numLines) {
-                        unset($data[$file][$line]);
+                foreach (array_keys($data[$file]['lines']) as $line) {
+                    if (isset($data[$file]['lines'][$line]) && $line > $numLines) {
+                        unset($data[$file]['lines'][$line]);
                     }
                 }
             }