From 54af47e286d0fb601e2e60aeb19002f6b7937574 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Jun 2026 11:20:23 +0900 Subject: feat(shirabe): resolve advisory instanceof TODOs via AnySecurityAdvisory Add an Ignored variant to the advisory enum (renamed to AnySecurityAdvisory) so the PHP three-class hierarchy PartialSecurityAdvisory -> SecurityAdvisory -> IgnoredSecurityAdvisory maps one-to-one onto enum variants. Replace the hard-coded auditor downcasts with as_security_advisory() (PHP `instanceof SecurityAdvisory`, true for both full and ignored) and as_ignored(), implementing severity/cve/source ignore filtering, the toIgnoredAdvisory conversion, and the table/plain row output faithfully. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/advisory/partial_security_advisory.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/advisory/partial_security_advisory.rs') diff --git a/crates/shirabe/src/advisory/partial_security_advisory.rs b/crates/shirabe/src/advisory/partial_security_advisory.rs index 8815103..2062570 100644 --- a/crates/shirabe/src/advisory/partial_security_advisory.rs +++ b/crates/shirabe/src/advisory/partial_security_advisory.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Advisory/PartialSecurityAdvisory.php -use crate::advisory::PartialOrFullSecurityAdvisory; +use crate::advisory::AnySecurityAdvisory; use crate::advisory::SecurityAdvisory; use crate::package::version::VersionParser; use anyhow::Result; @@ -32,7 +32,7 @@ impl PartialSecurityAdvisory { package_name: &str, data: &IndexMap, parser: &VersionParser, - ) -> Result { + ) -> Result { let affected_versions_str = data["affectedVersions"].as_string().unwrap_or(""); let constraint: AnyConstraint = match parser.parse_constraints(affected_versions_str) { @@ -95,10 +95,10 @@ impl PartialSecurityAdvisory { .and_then(|v| v.as_string()) .map(|s| s.to_string()), ); - return Ok(PartialOrFullSecurityAdvisory::Full(advisory)); + return Ok(AnySecurityAdvisory::Full(advisory)); } - Ok(PartialOrFullSecurityAdvisory::Partial(Self { + Ok(AnySecurityAdvisory::Partial(Self { advisory_id: data["advisoryId"].as_string().unwrap_or("").to_string(), package_name: package_name.to_string(), affected_versions: constraint, -- cgit v1.3.1