diff options
Diffstat (limited to 'crates/shirabe')
| -rw-r--r-- | crates/shirabe/src/advisory/audit_config.rs | 10 | ||||
| -rw-r--r-- | crates/shirabe/tests/advisory/audit_config_test.rs | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/crates/shirabe/src/advisory/audit_config.rs b/crates/shirabe/src/advisory/audit_config.rs index 458ebefe..e5bf6985 100644 --- a/crates/shirabe/src/advisory/audit_config.rs +++ b/crates/shirabe/src/advisory/audit_config.rs @@ -3,7 +3,7 @@ use crate::advisory::Auditor; use crate::config::Config; use indexmap::IndexMap; -use shirabe_php_shim::{InvalidArgumentException, PhpMixed}; +use shirabe_php_shim::{InvalidArgumentException, PhpMixed, canonical_int_key}; #[derive(Debug, Clone)] pub struct AuditConfig { @@ -83,7 +83,13 @@ impl AuditConfig { for (key, value) in entries { let (id, apply, reason) = match value { PhpMixed::String(reason_str) => { - (key.clone(), "all".to_string(), Some(reason_str.clone())) + // TODO(phase-e): PHP's `array` type must be modeled more precisely. This is + // escape hatch. + if canonical_int_key(key).is_some() { + (reason_str.clone(), "all".to_string(), None) + } else { + (key.clone(), "all".to_string(), Some(reason_str.clone())) + } } PhpMixed::Array(detail) => { let apply = detail diff --git a/crates/shirabe/tests/advisory/audit_config_test.rs b/crates/shirabe/tests/advisory/audit_config_test.rs index 85337a44..28d436bb 100644 --- a/crates/shirabe/tests/advisory/audit_config_test.rs +++ b/crates/shirabe/tests/advisory/audit_config_test.rs @@ -95,7 +95,6 @@ fn test_detailed_format_block_only() { } #[test] -#[ignore] fn test_mixed_formats() { let audit_config = audit_config_from(arr(vec![( "ignore", |