Fix the count of statements

Author: anne-gaelle123inkt

src/Lib/IO/MetricsFactory.php

@@ -8,6 +8,7 @@
 use DigitalRevolution\CodeCoverageInspection\Model\Metric\MethodMetric;
 use DOMDocument;
 use DOMNode;
+use DOMNodeList;
 use DOMXPath;
 
 class MetricsFactory
@@ -75,14 +76,15 @@ public static function getFileMetrics(DOMDocument $document): array
             $filename   = str_replace('\\', '/', (string)XMLUtil::getAttribute($parentNode, 'name'));
 
             // calculate coverage
-            $statements         = count($xpath->query('line[@type="stmt"]', $parentNode));
+            $statementsNodes    = $xpath->query('line[@type="stmt"]', $parentNode);
+            $statements         = $statementsNodes === false ? 0 : count($statementsNodes);
             $coveredStatements  = (int)XMLUtil::getAttribute($domMetric, 'coveredstatements');
             $coveragePercentage = $statements === 0 ? 100 : round($coveredStatements / $statements * 100, self::COVERAGE_PERCENTAGE_PRECISION);
 
             // gather metrics per method
             $methodMetrics = self::getMethodMetrics($xpath, $parentNode);
 
-            $coveredStatements = self::getCoveredStatements($xpath, $parentNode);
+            $coveredStatements = self::getCoveredStatements($statementsNodes);
 
             $metrics[$filename] = new FileMetric($filename, $statements, $coveragePercentage, $methodMetrics, $coveredStatements);
         }
@@ -116,9 +118,8 @@ public static function getMethodMetrics(DOMXPath $xpath, DOMNode $fileNode): arr
     /**
      * @return int[]
      */
-    private static function getCoveredStatements(DOMXPath $xpath, DOMNode $fileNode): array
+    private static function getCoveredStatements(DOMNodeList|false $statementNodes): array
     {
-        $statementNodes = $xpath->query('line[@type="stmt"]', $fileNode);
         if ($statementNodes === false || count($statementNodes) === 0) {
             return [];
         }

tests/Unit/Lib/IO/MetricsFactoryTest.php

@@ -66,7 +66,7 @@ public function testGetMethodMetrics(): void
                 <metrics loc="11" ncloc="11" classes="0"
                     methods="0" coveredmethods="0"
                     conditionals="0" coveredconditionals="0"
-                    statements="50" coveredstatements="1"
+                    statements="5" coveredstatements="1"
                     elements="0" coveredelements="0"/>
                 <line num="29" type="method" name="isFoobar" visibility="public" complexity="1" crap="1" count="1"/>
                 <line num="31" type="stmt" count="0"/>
@@ -164,24 +164,33 @@ public static function multiFilesDataProvider(): array
             'first 100 %'             => [
                 '<file name="utTestFile.php">
                 <metrics loc="11" ncloc="11" statements="1" coveredstatements="1"/>
+                <line num="1" type="method" name="methodName" count="1"/>
+                <line num="2" type="stmt" count="1"/>
             </file>',
                 ' <file name="utTestFile.php">
                 <metrics loc="11" ncloc="11" statements="0" coveredstatements="0"/>
+                <line num="1" type="method" name="methodName" count="1"/>
             </file>',
-                0,
+                1,
                 100.0,
-                []
+                [2]
             ],
             'second 100%'             => [
                 '<file name="utTestFile.php">
                 <metrics loc="11" ncloc="11" statements="2" coveredstatements="0"/>
+                <line num="1" type="method" name="methodName" count="1"/>
+                <line num="2" type="stmt" count="0"/>
+                <line num="3" type="stmt" count="0"/>
             </file>',
                 '<file name="utTestFile.php">
                 <metrics loc="11" ncloc="11" statements="2" coveredstatements="2"/>
+                <line num="1" type="method" name="methodName" count="1"/>
+                <line num="2" type="stmt" count="1"/>
+                <line num="3" type="stmt" count="1"/>
             </file>',
-                0,
+                1,
                 100.0,
-                []
+                [2, 3]
             ]
         ];
     }