bug #57533 [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 7bdfccfa6fca · 2024-06-28T09:38:56.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT Replaces #57219 and #57073 Commits ------- df133a9 [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -349,7 +349,7 @@ public function load(array $configs, ContainerBuilder $container)
                 throw new LogicException('AssetMapper support cannot be enabled as the AssetMapper component is not installed. Try running "composer require symfony/asset-mapper".');
             }
 
-            $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']));
+            $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']), $this->readConfigEnabled('http_client', $container, $config['http_client']));
         } else {
             $container->removeDefinition('cache.asset_mapper');
         }
@@ -1330,12 +1330,14 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
         }
     }
 
-    private function registerAssetMapperConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $assetEnabled): void
+    private function registerAssetMapperConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $assetEnabled, bool $httpClientEnabled): void
     {
         $loader->load('asset_mapper.php');
 
-        if (!$assetEnabled) {
-            $container->removeDefinition('asset_mapper.asset_package');
+        if (!$httpClientEnabled) {
+            $container->register('asset_mapper.http_client', HttpClientInterface::class)
+                ->addTag('container.error')
+                ->addError('You cannot use the AssetMapper integration since the HttpClient component is not enabled. Try enabling the "framework.http_client" config option.');
         }
 
         $paths = $config['paths'];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
@@ -54,6 +54,8 @@
             ])
         ->alias(AssetMapperInterface::class, 'asset_mapper')
 
+        ->alias('asset_mapper.http_client', 'http_client')
+
         ->set('asset_mapper.mapped_asset_factory', MappedAssetFactory::class)
             ->args([
                 service('asset_mapper.public_assets_path_resolver'),
@@ -197,7 +199,7 @@
             ])
 
         ->set('asset_mapper.importmap.resolver', JsDelivrEsmResolver::class)
-            ->args([service('http_client')])
+            ->args([service('asset_mapper.http_client')])
 
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([
@@ -212,12 +214,12 @@
         ->set('asset_mapper.importmap.auditor', ImportMapAuditor::class)
         ->args([
             service('asset_mapper.importmap.config_reader'),
-            service('http_client'),
+            service('asset_mapper.http_client'),
         ])
         ->set('asset_mapper.importmap.update_checker', ImportMapUpdateChecker::class)
         ->args([
             service('asset_mapper.importmap.config_reader'),
-            service('http_client'),
+            service('asset_mapper.http_client'),
         ])
 
         ->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ public function load(array $configs, ContainerBuilder $container)`
`349`	`349`	`throw new LogicException('AssetMapper support cannot be enabled as the AssetMapper component is not installed. Try running "composer require symfony/asset-mapper".');`
`350`	`350`	`}`
`351`	`351`
`352`		`- $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']));`
	`352`	`+ $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']), $this->readConfigEnabled('http_client', $container, $config['http_client']));`
`353`	`353`	`} else {`
`354`	`354`	`$container->removeDefinition('cache.asset_mapper');`
`355`	`355`	`}`
`@@ -1330,12 +1330,14 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co`
`1330`	`1330`	`}`
`1331`	`1331`	`}`
`1332`	`1332`
`1333`		`- private function registerAssetMapperConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $assetEnabled): void`
	`1333`	`+ private function registerAssetMapperConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $assetEnabled, bool $httpClientEnabled): void`
`1334`	`1334`	`{`
`1335`	`1335`	`$loader->load('asset_mapper.php');`
`1336`	`1336`
`1337`		`- if (!$assetEnabled) {`
`1338`		`- $container->removeDefinition('asset_mapper.asset_package');`
	`1337`	`+ if (!$httpClientEnabled) {`
	`1338`	`+ $container->register('asset_mapper.http_client', HttpClientInterface::class)`
	`1339`	`+ ->addTag('container.error')`
	`1340`	`+ ->addError('You cannot use the AssetMapper integration since the HttpClient component is not enabled. Try enabling the "framework.http_client" config option.');`
`1339`	`1341`	`}`
`1340`	`1342`
`1341`	`1343`	`$paths = $config['paths'];`