Throw exception before download query if entry is not valid

maelanleborgne · maelanleborgne · commit 47e334d85873 · 2023-10-12T14:57:00.000+02:00
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -162,7 +162,7 @@ public function downloadPackages(array $importMapEntries, callable $progressCall
         foreach ($importMapEntries as $package => $entry) {
             $pattern = ImportMapType::CSS === $entry->type ? $this->distUrlCssPattern : $this->distUrlPattern;
             if (null === $entry->packageName || null === $entry->version || null === $entry->filePath) {
-                throw new RuntimeException(sprintf('The package %s cannot be downloaded. "packageName", "version" or "filePath" must be defined.', $entry->importName));
+                throw new RuntimeException(sprintf('The package "%s" cannot be downloaded. "packageName", "version" and "filePath" must be defined.', $entry->importName));
             }
             $url = sprintf($pattern, $entry->packageName, $entry->version, $entry->filePath);
 
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -293,7 +293,7 @@ public function testDownloadPackages(array $importMapEntries, array $expectedReq
     public static function provideDownloadPackagesTests()
     {
         yield 'single package' => [
-            ['lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash')],
+            ['lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash', filePath: '')],
             [
                 [
                     'url' => '/lodash@1.2.3/+esm',
@@ -333,7 +333,7 @@ public static function provideDownloadPackagesTests()
 
         yield 'multiple files' => [
             [
-                'lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash'),
+                'lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash', filePath: ''),
                 'chart.js/auto' => new ImportMapEntry('chart.js/auto', version: '4.5.6', packageName: 'chart.js', filePath: '/auto'),
                 'bootstrap/dist/bootstrap.css' => new ImportMapEntry('bootstrap/dist/bootstrap.css', version: '5.0.6', type: ImportMapType::CSS, packageName: 'bootstrap', filePath: '/dist/bootstrap.css'),
             ],

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function downloadPackages(array $importMapEntries, callable $progressCall`
`162`	`162`	`foreach ($importMapEntries as $package => $entry) {`
`163`	`163`	`$pattern = ImportMapType::CSS === $entry->type ? $this->distUrlCssPattern : $this->distUrlPattern;`
`164`	`164`	`if (null === $entry->packageName \|\| null === $entry->version \|\| null === $entry->filePath) {`
`165`		`- throw new RuntimeException(sprintf('The package %s cannot be downloaded. "packageName", "version" or "filePath" must be defined.', $entry->importName));`
	`165`	`+ throw new RuntimeException(sprintf('The package "%s" cannot be downloaded. "packageName", "version" and "filePath" must be defined.', $entry->importName));`
`166`	`166`	`}`
`167`	`167`	`$url = sprintf($pattern, $entry->packageName, $entry->version, $entry->filePath);`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public function testDownloadPackages(array $importMapEntries, array $expectedReq`
`293`	`293`	`public static function provideDownloadPackagesTests()`
`294`	`294`	`{`
`295`	`295`	`yield 'single package' => [`
`296`		`- ['lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash')],`
	`296`	`+ ['lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash', filePath: '')],`
`297`	`297`	`[`
`298`	`298`	`[`
`299`	`299`	`'url' => '/lodash@1.2.3/+esm',`
`@@ -333,7 +333,7 @@ public static function provideDownloadPackagesTests()`
`333`	`333`
`334`	`334`	`yield 'multiple files' => [`
`335`	`335`	`[`
`336`		`- 'lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash'),`
	`336`	`+ 'lodash' => new ImportMapEntry('lodash', version: '1.2.3', packageName: 'lodash', filePath: ''),`
`337`	`337`	`'chart.js/auto' => new ImportMapEntry('chart.js/auto', version: '4.5.6', packageName: 'chart.js', filePath: '/auto'),`
`338`	`338`	`'bootstrap/dist/bootstrap.css' => new ImportMapEntry('bootstrap/dist/bootstrap.css', version: '5.0.6', type: ImportMapType::CSS, packageName: 'bootstrap', filePath: '/dist/bootstrap.css'),`
`339`	`339`	`],`