Merge pull request #41 from anne-gaelle123inkt/master

Fix metrics for empty methods

Author: frankdekker

src/Lib/IO/MetricsFactory.php

@@ -105,6 +105,10 @@ public static function getMethodMetrics(DOMXPath $xpath, DOMNode $fileNode): arr
 
         $metrics = [];
         foreach ($methodNodes as $methodNode) {
+            $complexity = (int)XMLUtil::getAttribute($methodNode, 'complexity');
+            if ($complexity === 0) {
+                continue;
+            }
             $methodName = XMLUtil::getAttribute($methodNode, 'name') ?? '';
             $lineNumber = (int)XMLUtil::getAttribute($methodNode, 'num');
             $count      = (int)XMLUtil::getAttribute($methodNode, 'count');
@@ -117,6 +121,7 @@ public static function getMethodMetrics(DOMXPath $xpath, DOMNode $fileNode): arr
 
     /**
      * @param DOMNodeList<DOMNode>|false $statementNodes
+     *
      * @return int[]
      */
     private static function getCoveredStatements(DOMNodeList|false $statementNodes): array

tests/Unit/Lib/IO/MetricsFactoryTest.php

@@ -74,6 +74,7 @@ public function testGetMethodMetrics(): void
                 <line num="33" type="stmt" count="1"/>
                 <line num="34" type="stmt" count="0"/>
                 <line num="35" type="stmt" count="0"/>
+                <line num="45" type="method" name="isEmpty" visibility="public" complexity="0" crap="0" count="0"/>
             </file>
         </project>
     </coverage>';
@@ -112,15 +113,15 @@ public static function multiFilesDataProvider(): array
         return [
             'second coverage is used' => [
                 '<file name="utTestFile.php">
-                <line num="1" type="method" name="methodName" count="2"/>
+                <line num="1" type="method" name="methodName" complexity="1" count="2"/>
                 <line num="2" type="stmt" count="2"/>
                 <line num="3" type="stmt" count="0"/>
                 <line num="4" type="stmt" count="0"/>
                 <line num="5" type="stmt" count="0"/>
                 <metrics loc="11" ncloc="11" statements="4" coveredstatements="1"/>
             </file>',
                 '<file name="utTestFile.php">
-                <line num="1" type="method" name="methodName" count="1"/>
+                <line num="1" type="method" name="methodName" complexity="1" count="1"/>
                 <line num="2" type="stmt" count="1"/>
                 <line num="3" type="stmt" count="0"/>
                 <line num="4" type="stmt" count="1"/>
@@ -133,15 +134,15 @@ public static function multiFilesDataProvider(): array
             ],
             'second count is higher'  => [
                 '<file name="utTestFile.php">
-                <line num="1" type="method" name="methodName" count="1"/>
+                <line num="1" type="method" name="methodName" complexity="1" count="1"/>
                 <line num="2" type="stmt" count="1"/>
                 <line num="3" type="stmt" count="1"/>
                 <line num="4" type="stmt" count="1"/>
                 <line num="5" type="stmt" count="1"/>
                 <metrics loc="11" ncloc="11" statements="4" coveredstatements="1"/>
             </file>',
                 '<file name="utTestFile.php">
-                <line num="1" type="method" name="methodName" count="2"/>
+                <line num="1" type="method" name="methodName" complexity="1" count="2"/>
                 <line num="2" type="stmt" count="1"/>
                 <line num="3" type="stmt" count="0"/>
                 <line num="4" type="stmt" count="1"/>
@@ -164,12 +165,12 @@ 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="1" type="method" name="methodName" complexity="1" 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"/>
+                <line num="1" type="method" name="methodName" complexity="1" count="1"/>
             </file>',
                 1,
                 100.0,
@@ -178,13 +179,13 @@ public static function multiFilesDataProvider(): array
             '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="1" type="method" name="methodName" complexity="1" 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="1" type="method" name="methodName" complexity="1" count="1"/>
                 <line num="2" type="stmt" count="1"/>
                 <line num="3" type="stmt" count="1"/>
             </file>',