From 6d202bb1d93eb3b735df592afcb25ecb305350d6 Mon Sep 17 00:00:00 2001 From: Virgil Date: Mon, 30 Mar 2026 07:57:32 +0000 Subject: [PATCH] fix(qa): remove duplicated audit JSON helpers --- cmd/qa/cmd_php.go | 53 +---------------------------------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/cmd/qa/cmd_php.go b/cmd/qa/cmd_php.go index 6699aad..3956f81 100644 --- a/cmd/qa/cmd_php.go +++ b/cmd/qa/cmd_php.go @@ -406,58 +406,7 @@ func addPHPSecurityCommand(parent *cli.Command) { cmd.Flags().BoolVar(&phpSecuritySARIF, "sarif", false, "Output results in SARIF format") cmd.Flags().StringVar(&phpSecurityURL, "url", "", "URL to check HTTP security headers") - parent.AddCommand(cmd) -} - -type auditJSONOutput struct { - Results []AuditResultJSON `json:"results"` - HasVulnerabilities bool `json:"has_vulnerabilities"` - Vulnerabilities int `json:"vulnerabilities"` -} - -type AuditResultJSON struct { - Tool string `json:"tool"` - Vulnerabilities int `json:"vulnerabilities"` - Advisories []php.AuditAdvisory `json:"advisories"` - Error string `json:"error,omitempty"` -} - -func mapAuditResultsForJSON(results []php.AuditResult) auditJSONOutput { - output := auditJSONOutput{ - Results: make([]AuditResultJSON, 0, len(results)), - } - sort.Slice(results, func(i, j int) bool { - return results[i].Tool < results[j].Tool - }) - - for _, result := range results { - entry := AuditResultJSON{ - Tool: result.Tool, - Vulnerabilities: result.Vulnerabilities, - Advisories: append([]php.AuditAdvisory(nil), result.Advisories...), - } - if result.Error != nil { - entry.Error = result.Error.Error() - } - sort.Slice(entry.Advisories, func(i, j int) bool { - if entry.Advisories[i].Package == entry.Advisories[j].Package { - return entry.Advisories[i].Title < entry.Advisories[j].Title - } - return entry.Advisories[i].Package < entry.Advisories[j].Package - }) - output.Results = append(output.Results, entry) - output.Vulnerabilities += entry.Vulnerabilities - } - - output.HasVulnerabilities = output.Vulnerabilities > 0 - return output -} - -func sortSecurityChecks(checks []php.SecurityCheck) []php.SecurityCheck { - sort.Slice(checks, func(i, j int) bool { - return checks[i].ID < checks[j].ID - }) - return checks + parent.AddCommand(cmd) } type auditJSONOutput struct {