Update ProcessedFunctionCoverageData.php

staabm · staabm · commit b5ed1f54fe2c · 2025-11-09T08:17:35.000+01:00
diff --git a/src/Data/ProcessedFunctionCoverageData.php b/src/Data/ProcessedFunctionCoverageData.php
@@ -48,18 +48,20 @@ public function merge(self $data): self
     {
         $branches = $this->branches;
         foreach($data->branches as $branchId => $branch) {
-            if (isset($branches[$branchId])) {
-                continue;
+            if (!isset($branches[$branchId])) {
+                $branches[$branchId] = $branch;
+            } else {
+                $branches[$branchId] = $branches[$branchId]->merge($branch);
             }
-            $branches[$branchId] = $branches[$branchId]->merge($branch);
         }
 
         $paths = $this->paths;
         foreach($data->paths as $pathId => $path) {
-            if (isset($paths[$pathId])) {
-                continue;
+            if (!isset($paths[$pathId])) {
+                $paths[$pathId] = $path;
+            } else {
+                $paths[$pathId] = $paths[$pathId]->merge($path);
             }
-            $paths[$pathId] = $paths[$pathId]->merge($path);
         }
 
         return new self(

Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,20 @@ public function merge(self $data): self`
`48`	`48`	`{`
`49`	`49`	`$branches = $this->branches;`
`50`	`50`	`foreach($data->branches as $branchId => $branch) {`
`51`		`- if (isset($branches[$branchId])) {`
`52`		`- continue;`
	`51`	`+ if (!isset($branches[$branchId])) {`
	`52`	`+ $branches[$branchId] = $branch;`
	`53`	`+ } else {`
	`54`	`+ $branches[$branchId] = $branches[$branchId]->merge($branch);`
`53`	`55`	`}`
`54`		`- $branches[$branchId] = $branches[$branchId]->merge($branch);`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`$paths = $this->paths;`
`58`	`59`	`foreach($data->paths as $pathId => $path) {`
`59`		`- if (isset($paths[$pathId])) {`
`60`		`- continue;`
	`60`	`+ if (!isset($paths[$pathId])) {`
	`61`	`+ $paths[$pathId] = $path;`
	`62`	`+ } else {`
	`63`	`+ $paths[$pathId] = $paths[$pathId]->merge($path);`
`61`	`64`	`}`
`62`		`- $paths[$pathId] = $paths[$pathId]->merge($path);`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`return new self(`