Update security audit after change audit.ignore behavior

Ref: composer/composer#11605
vtsykun · Sep 5, 2023 · 5e739c5 · 5e739c5
1 parent 39c3a1e
commit 5e739c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Package/Updater.php b/src/Package/Updater.php
@@ -131,7 +131,7 @@ public function update(IOInterface $io, Config $config, Package $package, Reposi
         /** @var VersionRepository $versionRepository */
         $versionRepository = $this->doctrine->getRepository(Version::class);
         if (null === $rootIdentifier && ($probe = end($versions))) {
-            $rootIdentifier = preg_replace('{dev-|-dev}', '', $probe->getVersion());
+            $rootIdentifier = preg_replace('{dev-|-dev}', '', $probe->getPrettyVersion());
         }
 
         if ($flags & self::DELETE_BEFORE) {
@@ -634,7 +634,8 @@ private function securityAuditCheck(Package $package, VcsRepository $repository,
             $versionParser = new VersionParser();
             $driver = $repository->getDriver();
             $root = $driver->getComposerInformation($driver->getRootIdentifier());
-            $ignored = (array)($root['config']['audit']['ignored'] ?? []);
+
+            $ignored = (array)($root['config']['audit']['ignore'] ?? ($root['config']['audit']['ignored'] ?? []));
 
             try {
                 $lockInfo = $driver->getFileContent('composer.lock', $driver->getRootIdentifier());
@@ -684,6 +685,8 @@ private function securityAuditCheck(Package $package, VcsRepository $repository,
                 if (!$advisory instanceof SecurityAdvisory
                     || in_array($advisory->advisoryId, $ignored, true)
                     || in_array($advisory->cve, $ignored, true)
+                    || isset($ignored[$advisory->advisoryId])
+                    || isset($ignored[$advisory->cve])
                 ) {
                     continue;
                 }

diff --git a/src/Util/PacketonUtils.php b/src/Util/PacketonUtils.php
@@ -13,6 +13,11 @@
 
 class PacketonUtils
 {
+
+    /**
+     * @param array $packages
+     * @return PackageInterface[]
+     */
     public static function sort(array $packages): array
     {
         usort($packages, function (PackageInterface $a, PackageInterface $b) {