Tweaks thanks to @smnandre

weaverryan · weaverryan · commit 98e9cd6af695 · 2023-10-05T16:27:58.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
@@ -177,14 +177,12 @@
         ->set('asset_mapper.importmap.auditor', ImportMapAuditor::class)
         ->args([
             service('asset_mapper.importmap.config_reader'),
-            service('asset_mapper.importmap.resolver'),
             service('http_client'),
         ])
 
         ->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)
             ->args([
                 service('asset_mapper.importmap.manager'),
-                service('asset_mapper'),
                 param('kernel.project_dir'),
             ])
             ->tag('console.command')
diff --git a/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php b/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\AssetMapper\Command;
 
-use Symfony\Component\AssetMapper\AssetMapperInterface;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapEntry;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
@@ -31,7 +30,6 @@ final class ImportMapRequireCommand extends Command
 {
     public function __construct(
         private readonly ImportMapManager $importMapManager,
-        private readonly AssetMapperInterface $assetMapper,
         private readonly string $projectDir,
     ) {
         parent::__construct();
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapAuditor.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapAuditor.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\AssetMapper\ImportMap;
 
 use Symfony\Component\AssetMapper\Exception\RuntimeException;
-use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -24,7 +23,6 @@ class ImportMapAuditor
 
     public function __construct(
         private readonly ImportMapConfigReader $configReader,
-        private readonly PackageResolverInterface $packageResolver,
         HttpClientInterface $httpClient = null,
     ) {
         $this->httpClient = $httpClient ?? HttpClient::create();
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/RemotePackageDownloader.php b/src/Symfony/Component/AssetMapper/ImportMap/RemotePackageDownloader.php
@@ -66,18 +66,23 @@ public function downloadPackages(callable $progressCallback = null): array
 
         $contents = $this->packageResolver->downloadPackages($remoteEntriesToDownload, $progressCallback);
         $downloadedPackages = [];
-        foreach ($contents as $package => $content) {
-            if (!isset($remoteEntriesToDownload[$package])) {
-                throw new \LogicException(sprintf('The package "%s" was not in the requested packages.', $package));
+        foreach ($remoteEntriesToDownload as $package => $entry) {
+            if (!isset($contents[$package])) {
+                throw new \LogicException(sprintf('The package "%s" was not downloaded.', $package));
             }
 
-            $filename = $this->savePackage($package, $content, $remoteEntriesToDownload[$package]->type);
+            $filename = $this->savePackage($package, $contents[$package], $entry->type);
             $newInstalled[$package] = [
                 'path' => $filename,
-                'version' => $remoteEntriesToDownload[$package]->version,
+                'version' => $entry->version,
             ];
 
             $downloadedPackages[] = $package;
+            unset($contents[$package]);
+        }
+
+        if ($contents) {
+            throw new \LogicException(sprintf('The following packages were unexpectedly downloaded: "%s".', implode('", "', array_keys($contents))));
         }
 
         $this->saveInstalled($newInstalled);
@@ -124,10 +129,6 @@ private function loadInstalled(): array
         }
 
         $installedPath = $this->vendorDir.'/installed.php';
-        if (!is_file($installedPath)) {
-            return [];
-        }
-
         $installed = is_file($installedPath) ? (static fn () => include $installedPath)() : [];
 
         foreach ($installed as $package => $data) {
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapAuditorTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapAuditorTest.php
@@ -19,24 +19,21 @@
 use Symfony\Component\AssetMapper\ImportMap\ImportMapEntry;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapPackageAudit;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapPackageAuditVulnerability;
-use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 class ImportMapAuditorTest extends TestCase
 {
     private ImportMapConfigReader $importMapConfigReader;
-    private PackageResolverInterface $packageResolver;
     private HttpClientInterface $httpClient;
     private ImportMapAuditor $importMapAuditor;
 
     protected function setUp(): void
     {
         $this->importMapConfigReader = $this->createMock(ImportMapConfigReader::class);
-        $this->packageResolver = $this->createMock(PackageResolverInterface::class);
         $this->httpClient = new MockHttpClient();
-        $this->importMapAuditor = new ImportMapAuditor($this->importMapConfigReader, $this->packageResolver, $this->httpClient);
+        $this->importMapAuditor = new ImportMapAuditor($this->importMapConfigReader, $this->httpClient);
     }
 
     public function testAudit()
