8000 [Framework] Add tag assets.package to register asset packages by GromNaN · Pull Request #38473 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Framework] Add tag assets.package to register asset packages #38473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2021
Merged

[Framework] Add tag assets.package to register asset packages #38473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CHANGELOG
* Added the `event_dispatcher.dispatcher` tag
* Added `assertResponseFormatSame()` in `BrowserKitAssertionsTrait`
* Add support for configuring UUID factory services
* Add tag `assets.package` to register asset packages

5.2.0
-----
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class UnusedTagsPass implements CompilerPassInterface
{
private $knownTags = [
'annotations.cached_reader',
'assets.package',
'auto_alias',
'cache.pool',
'cache.pool.clearer',
Expand Down
13 changes: 5 additions & 8 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,8 @@ public function load(array $configs, ContainerBuilder $container)
$loader->load('mime_type.php');
}

$container->registerForAutoconfiguration(PackageInterface::class)
->addTag('assets.package');
$container->registerForAutoconfiguration(Command::class)
->addTag('console.command');
$container->registerForAutoconfiguration(ResourceCheckerInterface::class)
Expand Down 8000 Expand Up @@ -1095,7 +1097,6 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
$defaultPackage = $this->createPackageDefinition($config['base_path'], $config['base_urls'], $defaultVersion);
$container->setDefinition('assets._default_package', $defaultPackage);

$namedPackages = [];
foreach ($config['packages'] as $name => $package) {
if (null !== $package['version_strategy']) {
$version = new Reference($package['version_strategy']);
Expand All @@ -1109,15 +1110,11 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
$version = $this->createVersion($container, $version, $format, $package['json_manifest_path'], $name);
}

$container->setDefinition('assets._package_'.$name, $this->createPackageDefinition($package['base_path'], $package['base_urls'], $version));
$packageDefinition = $this->createPackageDefinition($package['base_path'], $package['base_urls'], $version)
->addTag('assets.package', ['package' => $name]);
$container->setDefinition('assets._package_'.$name, $packageDefinition);
$container->registerAliasForArgument('assets._package_'.$name, PackageInterface::class, $name.'.package');
$namedPackages[$name] = new Reference('assets._package_'.$name);
}

$container->getDefinition('assets.packages')
->replaceArgument(0, new Reference('assets._default_package'))
->replaceArgument(1, $namedPackages)
;
}

/**
Expand Down
6 changes: 4 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
$container->services()
->set('assets.packages', Packages::class)
->args([
service('assets.empty_package'),
[],
service('assets._default_package'),
tagged_iterator('assets.package', 'package'),
])

->alias(Packages::class, 'assets.packages')
Expand All @@ -41,6 +41,8 @@
service('assets.empty_version_strategy'),
])

->alias('assets._default_package', 'assets.empty_package')

->set('assets.context', RequestStackContext::class)
->args([
service('request_stack'),
Expand Down
9 changes: 7 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,13 @@ public function testAssets()
$this->assertUrlPackage($container, $defaultPackage, ['http://cdn.example.com'], 'SomeVersionScheme', '%%s?version=%%s');

// packages
$packages = $packages->getArgument(1);
$this->assertCount(9, $packages);
$packageTags = $container->findTaggedServiceIds('assets.package');
$this->assertCount(9, $packageTags);

$packages = [];
foreach ($packageTags as $serviceId => $tagAttributes) {
$packages[$tagAttributes[0]['package']] = $serviceId;
}

$package = $container->getDefinition((string) $packages['images_path']);
$this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s');
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Asset/Packages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Packages
/**
* @param PackageInterface[] $packages Additional packages indexed by name
*/
public function __construct(PackageInterface $defaultPackage = null, array $packages = [])
public function __construct(PackageInterface $defaultPackage = null, iterable $packages = [])
{
$this->defaultPackage = $defaultPackage;

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Asset/Tests/PackagesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function testGetUrl()
{
$packages = new Packages(
new Package(new StaticVersionStrategy('default')),
['a' => new Package(new StaticVersionStrategy('a'))]
new \ArrayIterator(['a' => new Package(new StaticVersionStrategy('a'))])
);

$this->assertSame('/foo?default', $packages->getUrl('/foo'));
Expand Down
0