#578: Improved support for Clover files generated by PhpUnit

Author: danielpalme

src/AngularComponents/src/app/components/coverageinfo/coverage-info.component.ts

@@ -233,7 +233,7 @@ export class CoverageInfoComponent {
         for (let j: number = 0; j < assemblies[i].classes.length; j++) {
           groupingMaximum = Math.max(
             groupingMaximum,
-            (assemblies[i].classes[j].name.match(/\./g) || []).length);
+            (assemblies[i].classes[j].name.match(/\.|\\/g) || []).length);
         }
       }
 
@@ -244,7 +244,7 @@ export class CoverageInfoComponent {
     const startOfQueryString: number = window.location.href.indexOf("?");
 
     if (startOfQueryString > -1) {
-      this.queryString = window.location.href.substr(startOfQueryString);
+      this.queryString = window.location.href.substring(startOfQueryString);
     }
 
     this.updateCoverageInfo();

src/AngularComponents/src/app/components/coverageinfo/viewmodels/codelement-viewmodel.class.ts

@@ -55,7 +55,12 @@ export class CodeElementViewModel extends ElementBase {
         }
 
         let groupingDotIndex: number = Helper.getNthOrLastIndexOf(clazz.name, ".", grouping);
-        let groupedNamespace: string = groupingDotIndex === -1 ? "-" : clazz.name.substr(0, groupingDotIndex);
+
+        if (groupingDotIndex === -1) {
+            groupingDotIndex = Helper.getNthOrLastIndexOf(clazz.name, "\\", grouping);
+        }
+
+        let groupedNamespace: string = groupingDotIndex === -1 ? "-" : clazz.name.substring(0, groupingDotIndex);
 
         for (let i: number = 0; i < this.subElements.length; i++) {
             if (this.subElements[i].name === groupedNamespace) {

src/AngularComponents/src/app/components/riskhotspots/riskhotspots.component.ts

@@ -117,7 +117,7 @@ export class RiskHotspotsComponent implements OnInit {
     const startOfQueryString: number = window.location.href.indexOf("?");
 
     if (startOfQueryString > -1) {
-      this.queryString = window.location.href.substr(startOfQueryString);
+      this.queryString = window.location.href.substring(startOfQueryString);
     }
 
     this.updateRiskHotpots();

src/Readme.txt

@@ -67,6 +67,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+5.1.14.0
+
+    * New: #578: Improved support for Clover files generated by PhpUnit
+
 5.1.13.0
 
     * New: #567: Added report type: MarkdownSummaryGithub

src/ReportGenerator.Core/Parser/Preprocessing/CloverReportPreprocessor.cs

@@ -89,6 +89,13 @@ internal void Execute(XContainer report)
                 {
                     file.Add(new XAttribute("path", nameAttribute.Value));
                 }
+
+                var @class = file.Element("class");
+
+                if (@class != null && @class.Attribute("namespace")?.Value == "global")
+                {
+                    file.Attribute("name").Value = @class.Attribute("name").Value;
+                }
             }
 
             if (this.sourceDirectories.Count == 0)