From efa3e7f05b4b3bf7e4d65ffd9a8dbcf944db8fbb Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 26 Jun 2024 10:34:44 +0200 Subject: [PATCH] Revert "feature #57073 [AssetMapper][FrameworkBundle] Do not require `http_client` service (ruudk)" This reverts commit 66b57c90d4e5aca5f131b2946411e3a286253219, reversing changes made to 3bdbb070cfbbb1d78fae1d60de2ffedc66998562. --- .../FrameworkBundle/Resources/config/asset_mapper.php | 6 +++--- .../AssetMapper/ImportMap/ImportMapUpdateChecker.php | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php index ae7039db2b8f7..b7ce65f030345 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php @@ -197,7 +197,7 @@ ]) ->set('asset_mapper.importmap.resolver', JsDelivrEsmResolver::class) - ->args([service('http_client')->nullOnInvalid()]) + ->args([service('http_client')]) ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class) ->args([ @@ -212,12 +212,12 @@ ->set('asset_mapper.importmap.auditor', ImportMapAuditor::class) ->args([ service('asset_mapper.importmap.config_reader'), - service('http_client')->nullOnInvalid(), + service('http_client'), ]) ->set('asset_mapper.importmap.update_checker', ImportMapUpdateChecker::class) ->args([ service('asset_mapper.importmap.config_reader'), - service('http_client')->nullOnInvalid(), + service('http_client'), ]) ->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class) diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapUpdateChecker.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapUpdateChecker.php index d085e021ab666..d081059d5f637 100644 --- a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapUpdateChecker.php +++ b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapUpdateChecker.php @@ -11,20 +11,16 @@ namespace Symfony\Component\AssetMapper\ImportMap; -use Symfony\Component\HttpClient\HttpClient; use Symfony\Contracts\HttpClient\HttpClientInterface; class ImportMapUpdateChecker { private const URL_PACKAGE_METADATA = 'https://registry.npmjs.org/%s'; - private readonly HttpClientInterface $httpClient; - public function __construct( private readonly ImportMapConfigReader $importMapConfigReader, - ?HttpClientInterface $httpClient = null, + private readonly HttpClientInterface $httpClient, ) { - $this->httpClient = $httpClient ?? HttpClient::create(); } /**