F#78299 US#190650 T#207172 add the support of multi coverage file for the baseline command + raises an error when the custom coverage can be increased

Author: anne-gaelle123inkt

src/Lib/Metrics/Inspection/CustomCoverageAboveGlobalInspection.php

@@ -21,9 +21,8 @@ public function inspect(?PathInspectionConfig $fileConfig, FileMetric $metric):
         }
 
         $globalCoverage = $this->config->getMinimumCoverage();
-        $customCoverage = $fileConfig->getMinimumCoverage();
 
-        if ($customCoverage >= $globalCoverage || $metric->getCoverage() >= $globalCoverage) {
+        if ($metric->getCoverage() >= $globalCoverage) {
             return new Failure($metric, $fileConfig->getMinimumCoverage(), Failure::UNNECESSARY_CUSTOM_COVERAGE);
         }
 

src/Lib/Metrics/MetricsAnalyzer.php

@@ -31,10 +31,10 @@ public function __construct(array $metrics, InspectionConfig $config)
         $this->config  = $config;
 
         $this->inspections = [
+            new CustomCoverageAboveGlobalInspection($config),
             new DifferentCustomCoverageInspection($config),
             new BelowGlobalCoverageInspection($config),
-            new UncoveredMethodsInspection($config),
-            new CustomCoverageAboveGlobalInspection($config)
+            new UncoveredMethodsInspection($config)
         ];
     }
 

tests/Functional/Command/InspectCommand/Data/checkstyle.xml

@@ -4,7 +4,10 @@
   <error line="1" column="0" severity="error" message="Project per file coverage is configured at 80%. Current coverage is at 70%. Improve coverage for this class." source="phpunit-file-coverage-inspection"/>
  </file>
  <file name="/home/workspace/test/directory/standard-below-threshold.php">
-  <error line="1" column="0" severity="error" message="Custom file coverage is configured at 90%. Current coverage is at 80%. Improve coverage for this class." source="phpunit-file-coverage-inspection"/>
+  <error line="1" column="0" severity="error" message="Custom file coverage is configured at 90%. Current coverage is at 60%. Improve coverage for this class." source="phpunit-file-coverage-inspection"/>
+ </file>
+ <file name="/home/workspace/test/directory/standard-above-threshold.php">
+  <error line="1" column="0" severity="error" message="A custom file coverage is configured at 90%, but the current file coverage 90% exceeds the project coverage 80%. Remove `/home/workspace/test/directory/standard-above-threshold.php` from phpfci.xml custom-coverage rules." source="phpunit-file-coverage-inspection"/>
  </file>
  <file name="/home/workspace/test/case/below-threshold.php">
   <error line="1" column="0" severity="error" message="Custom file coverage is configured at 55%. Current coverage is at 50%. Improve coverage for this class." source="phpunit-file-coverage-inspection"/>

tests/Functional/Command/InspectCommand/Data/coverage.xml

@@ -62,13 +62,13 @@
                      conditionals="0"
                      coveredconditionals="0"
                      statements="10"
-                     coveredstatements="8"
+                     coveredstatements="6"
                      elements="0"
                      coveredelements="0"/>
             <line num="1" type="method" name="methodName" count="1"/>
-            <line num="2" type="stmt" count="1"/>
+            <line num="2" type="stmt" count="0"/>
             <line num="3" type="stmt" count="1"/>
-            <line num="4" type="stmt" count="1"/>
+            <line num="4" type="stmt" count="0"/>
             <line num="5" type="stmt" count="1"/>
             <line num="6" type="stmt" count="1"/>
             <line num="7" type="stmt" count="1"/>

tests/Unit/Lib/Metrics/Inspection/CustomCoverageAboveGlobalInspectionTest.php

@@ -47,13 +47,4 @@ public function testInspectCoverageAboveGlobalCoverageShouldFail(): void
         static::assertSame(Failure::UNNECESSARY_CUSTOM_COVERAGE, $failure->getReason());
         static::assertSame(40, $failure->getMinimumCoverage());
     }
-
-    public function testInspectCoverageCustomCoverageAboveGlobalCoverageShouldPass(): void
-    {
-        // global is 80
-        $fileConfig = new PathInspectionConfig(PathInspectionConfig::TYPE_FILE, '/tmp/b', 85);
-        $metric     = new FileMetric('/tmp/b/', 0, 83, [], []);
-
-        static::assertNull($this->inspection->inspect($fileConfig, $metric));
-    }
 }