Skip to content

Commit 4ff0e58

Browse files
authored
fix: Simplify PHP framework suppression for Composer (#7693)
1 parent 991397c commit 4ff0e58

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

core/src/main/resources/dependencycheck-base-suppression.xml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -358,29 +358,13 @@
358358
<cpe>cpe:/a:openid:openid</cpe>
359359
<cpe>cpe:/a:openid:openid_connect</cpe>
360360
</suppress>
361-
<suppress base="true">
362-
<notes><![CDATA[
363-
FP per #2972
364-
hyphenated PHP library vendor names
365-
]]></notes>
366-
<packageUrl regex="true">^pkg:composer/php\-.*$</packageUrl>
367-
<cpe>cpe:/a:php:php</cpe>
368-
</suppress>
369-
<suppress base="true">
370-
<notes><![CDATA[
371-
FP per #2972 + #7444
372-
hyphenated PHP library product names (prefix)
373-
]]></notes>
374-
<packageUrl regex="true">^pkg:composer/[^/]+/php[\-_].*$</packageUrl>
375-
<cpe>cpe:/a:php:php</cpe>
376-
</suppress>
377361
<suppress base="true">
378362
<notes><![CDATA[
379363
FP per #2972 + #7444
380-
hyphenated PHP library product names (suffix)
381-
including number suffix, e.g., `symfony/polyfill-php80`
364+
hyphenated PHP library product names
365+
(PHP framework will not be loaded via Composer)
382366
]]></notes>
383-
<packageUrl regex="true">^pkg:composer/[^/]+/.*[\-_]php[0-9]*@.*$</packageUrl>
367+
<packageUrl regex="true">^pkg:composer/[^/]+/[^/]+@.*$</packageUrl>
384368
<cpe>cpe:/a:php:php</cpe>
385369
</suppress>
386370
<suppress base="true">

0 commit comments

Comments
 (0)