Fixed undefined index when merging code coverage

dekker-m · dekker-m · commit 58834dabae6a · 2018-05-21T12:56:22.000+02:00
diff --git a/src/CodeCoverage.php b/src/CodeCoverage.php
@@ -403,7 +403,7 @@ function ($value, $key) use ($lines) {
             }
 
             foreach ($lines as $line => $data) {
-                if ($data === null || $this->data[$file][$line] === null) {
+                if ($data === null || (array_key_exists($line, $this->data[$file]) && $this->data[$file][$line] === null)) {
                     // if the line is marked as "dead code" in either, mark it as dead code in the merged result
                     $this->data[$file][$line] = null;
                 } else if (!isset($this->data[$file][$line])) {

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ function ($value, $key) use ($lines) {`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`foreach ($lines as $line => $data) {`
`406`		`- if ($data === null \|\| $this->data[$file][$line] === null) {`
	`406`	`+ if ($data === null \|\| (array_key_exists($line, $this->data[$file]) && $this->data[$file][$line] === null)) {`
`407`	`407`	`// if the line is marked as "dead code" in either, mark it as dead code in the merged result`
`408`	`408`	`$this->data[$file][$line] = null;`
`409`	`409`	`} else if (!isset($this->data[$file][$line])) {`