Merge pull request #500 from matthewmincher/bugfix/track-parent-calls

Author: glensc

src/Profile.php

@@ -72,6 +72,11 @@ private function process(): void
             } else {
                 $result[$func] = $values;
                 $result[$func]['parents'] = [$parent];
+                $result[$func]['parents_calls'] = [];
+            }
+
+            if ($parent) {
+                $result[$func]['parents_calls'][$parent] = ($result[$func]['parents_calls'][$parent] ?? 0) + $values['ct'];
             }
 
             // Build the indexed data.
@@ -622,7 +627,7 @@ private function callgraphData($parentName, $main, $metric, $threshold, $parentI
                 $this->links[] = [
                     'source' => $parentName,
                     'target' => $childName,
-                    'callCount' => $metrics['ct'],
+                    'callCount' => $metrics['parents_calls'][$parentName] ?? $metrics['ct'],
                 ];
             }
 

tests/Profile/ProfileTest.php

@@ -189,7 +189,7 @@ public function testGet(): void
 
         $expected = $fixture['profile']['main()'];
         $result = $profile->get('main()');
-        unset($result['parents']);
+        unset($result['parents'], $result['parents_calls']);
         $this->assertEquals($expected, $result);
 
         $this->assertNull($profile->get('main()', 'derp'));
@@ -396,7 +396,7 @@ public function testGetCallgraph(): void
                 [
                     'source' => 'eat_burger()',
                     'target' => 'strlen()',
-                    'callCount' => 2,
+                    'callCount' => 1,
                 ],
                 [
                     'source' => 'main()',
@@ -411,11 +411,12 @@ public function testGetCallgraph(): void
                 [
                     'source' => 'drink_beer()',
                     'target' => 'strlen()',
-                    'callCount' => 2,
+                    'callCount' => 1,
                 ],
             ],
         ];
         $result = $profile->getCallgraph();
+
         $this->assertEquals($expected, $result);
     }
 
@@ -462,7 +463,7 @@ public function testGetCallgraphNoDuplicates(): void
                 [
                     'source' => 'load_file()',
                     'target' => 'open()',
-                    'callCount' => 2,
+                    'callCount' => 1,
                 ],
                 [
                     'source' => 'open()',
@@ -477,7 +478,7 @@ public function testGetCallgraphNoDuplicates(): void
                 [
                     'source' => 'parse_string()',
                     'target' => 'open()',
-                    'callCount' => 2,
+                    'callCount' => 1,
                 ],
             ],
         ];