Support branch coverage for anonymous functions

At this moment XDebug only tracks anonymous functions inside of methods or functions (not global)

Author: Maks3w

src/CodeCoverage/Report/Node/File.php

@@ -694,7 +694,18 @@ function ($carry, $value) {
     protected function calcAndApplyClassAggregate(&$classOrTrait, $classOrTraitName)
     {
         foreach ($classOrTrait['methods'] as &$method) {
-            $methodCoveragePath = $classOrTraitName . '->' . $method['methodName'];
+            if ($method['methodName'] === 'anonymous function') {
+                // Locate index
+                $methodCoveragePath = $method['methodName'];
+                foreach ($this->coverageData['branches'] as $index => $branch) {
+                    if ($method['startLine'] === $branch[0]['line_start']) {
+                        $methodCoveragePath = $index;
+                    }
+                }
+
+            } else {
+                $methodCoveragePath = $classOrTraitName . '->' . $method['methodName'];
+            }
             if (isset($this->coverageData['paths'][$methodCoveragePath])) {
                 $methodPaths = $this->coverageData['paths'][$methodCoveragePath];
                 $this->calcPathsAggregate($methodPaths, $numExecutablePaths, $numExecutedPaths);

tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/index.html

@@ -58,7 +58,7 @@
        </div>
 </td>
       <td class="danger small"><div align="right">0.00%</div></td>
-      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+      <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
       <td class="danger big">       <div class="progress">
          <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="50.00" aria-valuemin="0" aria-valuemax="100" style="width: 50.00%">
            <span class="sr-only">50.00% covered (danger)</span>
@@ -94,7 +94,7 @@
        </div>
 </td>
       <td class="danger small"><div align="right">0.00%</div></td>
-      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+      <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
       <td class="danger big">       <div class="progress">
          <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="50.00" aria-valuemin="0" aria-valuemax="100" style="width: 50.00%">
            <span class="sr-only">50.00% covered (danger)</span>

tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html

@@ -67,7 +67,7 @@
        </div>
 </td>
       <td class="danger small"><div align="right">0.00%</div></td>
-      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+      <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
       <td class="warning big">       <div class="progress">
          <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="87.50" aria-valuemin="0" aria-valuemax="100" style="width: 87.50%">
            <span class="sr-only">87.50% covered (warning)</span>
@@ -104,7 +104,7 @@
        </div>
 </td>
       <td class="danger small"><div align="right">0.00%</div></td>
-      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+      <td class="danger small"><div align="right">0&nbsp;/&nbsp;2</div></td>
       <td class="warning big">       <div class="progress">
          <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="87.50" aria-valuemin="0" aria-valuemax="100" style="width: 87.50%">
            <span class="sr-only">87.50% covered (warning)</span>
@@ -155,14 +155,14 @@
       <td class="success small"><div align="right">100.00%</div></td>
       <td class="success small"><div align="right">1&nbsp;/&nbsp;1</div></td>
       <td class="success small">1</td>
-      <td class="success big">       <div class="progress">
-         <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
-           <span class="sr-only">100.00% covered (success)</span>
+      <td class="danger big">       <div class="progress">
+         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
          </div>
        </div>
 </td>
-      <td class="success small"><div align="right">100.00%</div></td>
-      <td class="success small"><div align="right">0&nbsp;/&nbsp;0</div></td>
+      <td class="danger small"><div align="right">0.00%</div></td>
+      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
       <td class="success big">       <div class="progress">
          <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="100.00" aria-valuemin="0" aria-valuemax="100" style="width: 100.00%">
            <span class="sr-only">100.00% covered (success)</span>

tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/index.xml

@@ -7,7 +7,7 @@
     <directory name="%s">
       <totals>
         <lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50%"/>
-        <paths count="1" tested="0" percent="0.00%"/>
+        <paths count="2" tested="0" percent="0.00%"/>
         <methods count="2" tested="1" percent="50.00%"/>
         <functions count="0" tested="0" percent=""/>
         <classes count="1" tested="0" percent="0.00%"/>
@@ -16,7 +16,7 @@
       <file name="source_with_class_and_anonymous_function.php" href="source_with_class_and_anonymous_function.php.xml">
         <totals>
           <lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50%"/>
-          <paths count="1" tested="0" percent="0.00%"/>
+          <paths count="2" tested="0" percent="0.00%"/>
           <methods count="2" tested="1" percent="50.00%"/>
           <functions count="0" tested="0" percent=""/>
           <classes count="1" tested="0" percent="0.00%"/>

tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml

@@ -3,7 +3,7 @@
   <file name="source_with_class_and_anonymous_function.php">
     <totals>
       <lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50%"/>
-      <paths count="1" tested="0" percent="0.00%"/>
+      <paths count="2" tested="0" percent="0.00%"/>
       <methods count="2" tested="1" percent="50.00%"/>
       <functions count="0" tested="0" percent=""/>
       <classes count="1" tested="0" percent="0.00%"/>
@@ -13,7 +13,7 @@
       <package full="" name="" sub="" category=""/>
       <namespace name=""/>
       <method name="runAnonymous" signature="runAnonymous()" start="5" end="18" crap="1.04" executable="3" executed="2" coverage="66.666666666667" executablePaths="1" executedPaths="0"/>
-      <method name="anonymous function" signature="anonymous function (&amp;$val, $key)" start="11" end="13" crap="1" executable="2" executed="2" coverage="100" executablePaths="0" executedPaths="0"/>
+      <method name="anonymous function" signature="anonymous function (&amp;$val, $key)" start="11" end="13" crap="1" executable="2" executed="2" coverage="100" executablePaths="1" executedPaths="0"/>
     </class>
     <coverage>
       <line nr="7">

tests/_files/class-with-anonymous-function-clover.xml

@@ -3,7 +3,7 @@
   <project timestamp="%i">
     <file name="%s/source_with_class_and_anonymous_function.php">
       <class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
-        <metrics complexity="2" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
+        <metrics complexity="2" methods="2" coveredmethods="1" conditionals="2" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
       </class>
       <line num="5" type="method" name="runAnonymous" visibility="public" complexity="1" crap="1.04" count="1"/>
       <line num="7" type="stmt" count="1"/>
@@ -15,8 +15,8 @@
       <line num="14" type="stmt" count="1"/>
       <line num="17" type="stmt" count="1"/>
       <line num="18" type="stmt" count="1"/>
-      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="2" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="1" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="2" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
   </project>
 </coverage>

tests/_files/class-with-anonymous-function-text.txt

@@ -7,7 +7,7 @@ Code Coverage Report:
   Classes:  0.00% (0/1)
   Methods: 50.00% (1/2)
   Lines:   87.50% (7/8)
-  Paths:    0.00% (0/1)
+  Paths:    0.00% (0/2)
 
 CoveredClassWithAnonymousFunctionInStaticMethod
-  Methods:  50.00% ( 1/ 2)   Lines:  80.00% (  4/  5)   Paths:   0.00% ( 0/ 1)
+  Methods:  50.00% ( 1/ 2)   Lines:  80.00% (  4/  5)   Paths:   0.00% ( 0/ 2)