Support advisories from multiple repositories for the same package (#…

…11436)
composer · May 7, 2023 · 57a48df · 57a48df
1 parent 3bb191a
commit 57a48df
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/Composer/Repository/RepositorySet.php b/src/Composer/Repository/RepositorySet.php
@@ -257,20 +257,18 @@ public function getMatchingSecurityAdvisories(array $packages, bool $allowPartia
      */
     private function getSecurityAdvisoriesForConstraints(array $packageConstraintMap, bool $allowPartialAdvisories): array
     {
-        $advisories = [];
+        $repoAdvisories = [];
         foreach ($this->repositories as $repository) {
             if (!$repository instanceof AdvisoryProviderInterface || !$repository->hasSecurityAdvisories()) {
                 continue;
             }
 
-            $result = $repository->getSecurityAdvisories($packageConstraintMap, $allowPartialAdvisories);
-            foreach ($result['namesFound'] as $nameFound) {
-                unset($packageConstraintMap[$nameFound]);
-            }
-
-            $advisories = array_merge($advisories, $result['advisories']);
+            $repoAdvisories[] = $repository->getSecurityAdvisories($packageConstraintMap, $allowPartialAdvisories)['advisories'];
         }
 
+        $advisories = array_merge_recursive([], ...$repoAdvisories);
+        ksort($advisories);
+
         return $advisories;
     }