Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 73d53a0

Browse filesBrowse files
xabbuhxabbuh
committed
don't register some AssetMapper services with no configured HTTP clients
1 parent 6eea7da commit 73d53a0
Copy full SHA for 73d53a0

File tree

3 files changed

+69
-47
lines changed
Filter options

3 files changed

+69
-47
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ public function load(array $configs, ContainerBuilder $container)
349349
throw new LogicException('AssetMapper support cannot be enabled as the AssetMapper component is not installed. Try running "composer require symfony/asset-mapper".');
350350
}
351351

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']));
353353
} else {
354354
$container->removeDefinition('cache.asset_mapper');
355355
}
@@ -1330,7 +1330,7 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
13301330
}
13311331
}
13321332

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
13341334
{
13351335
$loader->load('asset_mapper.php');
13361336

@@ -1399,6 +1399,10 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
13991399
->replaceArgument(3, $config['importmap_polyfill'])
14001400
->replaceArgument(4, $config['importmap_script_attributes'])
14011401
;
1402+
1403+
if ($httpClientEnabled) {
1404+
$loader->load('asset_mapper_http_client.php');
1405+
}
14021406
}
14031407

14041408
/**

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
-45Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
use Symfony\Component\AssetMapper\AssetMapperRepository;
1919
use Symfony\Component\AssetMapper\Command\AssetMapperCompileCommand;
2020
use Symfony\Component\AssetMapper\Command\DebugAssetMapperCommand;
21-
use Symfony\Component\AssetMapper\Command\ImportMapAuditCommand;
2221
use Symfony\Component\AssetMapper\Command\ImportMapInstallCommand;
23-
use Symfony\Component\AssetMapper\Command\ImportMapOutdatedCommand;
2422
use Symfony\Component\AssetMapper\Command\ImportMapRemoveCommand;
2523
use Symfony\Component\AssetMapper\Command\ImportMapRequireCommand;
2624
use Symfony\Component\AssetMapper\Command\ImportMapUpdateCommand;
@@ -30,16 +28,11 @@
3028
use Symfony\Component\AssetMapper\Compiler\SourceMappingUrlsCompiler;
3129
use Symfony\Component\AssetMapper\Factory\CachedMappedAssetFactory;
3230
use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
33-
use Symfony\Component\AssetMapper\ImportMap\ImportMapAuditor;
3431
use Symfony\Component\AssetMapper\ImportMap\ImportMapConfigReader;
3532
use Symfony\Component\AssetMapper\ImportMap\ImportMapGenerator;
36-
use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
3733
use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
38-
use Symfony\Component\AssetMapper\ImportMap\ImportMapUpdateChecker;
3934
use Symfony\Component\AssetMapper\ImportMap\ImportMapVersionChecker;
40-
use Symfony\Component\AssetMapper\ImportMap\RemotePackageDownloader;
4135
use Symfony\Component\AssetMapper\ImportMap\RemotePackageStorage;
42-
use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
4336
use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
4437
use Symfony\Component\AssetMapper\Path\LocalPublicAssetsFilesystem;
4538
use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
@@ -162,15 +155,6 @@
162155
service('asset_mapper.importmap.remote_package_storage'),
163156
])
164157

165-
->set('asset_mapper.importmap.manager', ImportMapManager::class)
166-
->args([
167-
service('asset_mapper'),
168-
service('asset_mapper.importmap.config_reader'),
169-
service('asset_mapper.importmap.remote_package_downloader'),
170-
service('asset_mapper.importmap.resolver'),
171-
])
172-
->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
173-
174158
->set('asset_mapper.importmap.generator', ImportMapGenerator::class)
175159
->args([
176160
service('asset_mapper'),
@@ -183,22 +167,12 @@
183167
abstract_arg('vendor directory'),
184168
])
185169

186-
->set('asset_mapper.importmap.remote_package_downloader', RemotePackageDownloader::class)
187-
->args([
188-
service('asset_mapper.importmap.remote_package_storage'),
189-
service('asset_mapper.importmap.config_reader'),
190-
service('asset_mapper.importmap.resolver'),
191-
])
192-
193170
->set('asset_mapper.importmap.version_checker', ImportMapVersionChecker::class)
194171
->args([
195172
service('asset_mapper.importmap.config_reader'),
196173
service('asset_mapper.importmap.remote_package_downloader'),
197174
])
198175

199-
->set('asset_mapper.importmap.resolver', JsDelivrEsmResolver::class)
200-
->args([service('http_client')])
201-
202176
->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
203177
->args([
204178
service('asset_mapper.importmap.generator'),
@@ -209,17 +183,6 @@
209183
service('request_stack'),
210184
])
211185

212-
->set('asset_mapper.importmap.auditor', ImportMapAuditor::class)
213-
->args([
214-
service('asset_mapper.importmap.config_reader'),
215-
service('http_client'),
216-
])
217-
->set('asset_mapper.importmap.update_checker', ImportMapUpdateChecker::class)
218-
->args([
219-
service('asset_mapper.importmap.config_reader'),
220-
service('http_client'),
221-
])
222-
223186
->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)
224187
->args([
225188
service('asset_mapper.importmap.manager'),
@@ -244,13 +207,5 @@
244207
param('kernel.project_dir'),
245208
])
246209
->tag('console.command')
247-
248-
->set('asset_mapper.importmap.command.audit', ImportMapAuditCommand::class)
249-
->args([service('asset_mapper.importmap.auditor')])
250-
->tag('console.command')
251-
252-
->set('asset_mapper.importmap.command.outdated', ImportMapOutdatedCommand::class)
253-
->args([service('asset_mapper.importmap.update_checker')])
254-
->tag('console.command')
255210
;
256211
};

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper_http_client.php

Copy file name to clipboard
+63Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
13+
14+
use Symfony\Component\AssetMapper\Command\ImportMapAuditCommand;
15+
use Symfony\Component\AssetMapper\Command\ImportMapOutdatedCommand;
16+
use Symfony\Component\AssetMapper\ImportMap\ImportMapAuditor;
17+
use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
18+
use Symfony\Component\AssetMapper\ImportMap\ImportMapUpdateChecker;
19+
use Symfony\Component\AssetMapper\ImportMap\RemotePackageDownloader;
20+
use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
21+
22+
return static function (ContainerConfigurator $container) {
23+
$container->services()
24+
->set('asset_mapper.importmap.auditor', ImportMapAuditor::class)
25+
->args([
26+
service('asset_mapper.importmap.config_reader'),
27+
service('http_client'),
28+
])
29+
30+
->set('asset_mapper.importmap.command.audit', ImportMapAuditCommand::class)
31+
->args([service('asset_mapper.importmap.auditor')])
32+
->tag('console.command')
33+
34+
->set('asset_mapper.importmap.command.outdated', ImportMapOutdatedCommand::class)
35+
->args([service('asset_mapper.importmap.update_checker')])
36+
->tag('console.command')
37+
38+
->set('asset_mapper.importmap.manager', ImportMapManager::class)
39+
->args([
40+
service('asset_mapper'),
41+
service('asset_mapper.importmap.config_reader'),
42+
service('asset_mapper.importmap.remote_package_downloader'),
43+
service('asset_mapper.importmap.resolver'),
44+
])
45+
->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
46+
47+
->set('asset_mapper.importmap.remote_package_downloader', RemotePackageDownloader::class)
48+
->args([
49+
service('asset_mapper.importmap.remote_package_storage'),
50+
service('asset_mapper.importmap.config_reader'),
51+
service('asset_mapper.importmap.resolver'),
52+
])
53+
54+
->set('asset_mapper.importmap.resolver', JsDelivrEsmResolver::class)
55+
->args([service('http_client')])
56+
57+
->set('asset_mapper.importmap.update_checker', ImportMapUpdateChecker::class)
58+
->args([
59+
service('asset_mapper.importmap.config_reader'),
60+
service('http_client'),
61+
])
62+
;
63+
};

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.