Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit0053044

Browse files
committed
Using a service closure
1 parente1de183 commit0053044

File tree

5 files changed

+15
-20
lines changed

5 files changed

+15
-20
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@
108108
->set('asset_mapper_compiler', AssetMapperCompiler::class)
109109
->args([
110110
tagged_iterator('asset_mapper.compiler'),
111-
service_locator([
112-
'asset_mapper' =>service('asset_mapper'),
113-
]),
111+
service_closure('asset_mapper'),
114112
])
115113

116114
->set('asset_mapper.compiler.css_asset_url_compiler', CssAssetUrlCompiler::class)

‎src/Symfony/Component/AssetMapper/AssetMapperCompiler.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
*/
2424
class AssetMapperCompiler
2525
{
26+
privateAssetMapperInterface$assetMapper;
27+
2628
/**
2729
* @param iterable<AssetCompilerInterface> $assetCompilers
2830
*/
29-
publicfunction__construct(privateiterable$assetCompilers,privateContainerInterface$container)
31+
publicfunction__construct(privatereadonlyiterable$assetCompilers,privatereadonly\Closure$assetMapperFactory)
3032
{
3133
}
3234

@@ -45,6 +47,10 @@ public function compile(string $content, MappedAsset $mappedAsset): string
4547

4648
privatefunctiongetAssetMapper():AssetMapperInterface
4749
{
48-
return$this->container->get('asset_mapper');
50+
if (!isset($this->assetMapper)) {
51+
$this->assetMapper =$this->assetMapperFactory->__invoke();
52+
}
53+
54+
return$this->assetMapper;
4955
}
5056
}

‎src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespaceSymfony\Component\AssetMapper\Tests;
1313

1414
usePHPUnit\Framework\TestCase;
15-
usePsr\Container\ContainerInterface;
1615
useSymfony\Component\AssetMapper\AssetMapperCompiler;
1716
useSymfony\Component\AssetMapper\AssetMapperInterface;
1817
useSymfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
@@ -58,13 +57,9 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
5857
}
5958
};
6059

61-
$container =$this->createMock(ContainerInterface::class);
62-
$container->expects($this->any())
63-
->method('get')
64-
->willReturn($this->createMock(AssetMapperInterface::class));
6560
$compiler =newAssetMapperCompiler(
6661
[$compiler1,$compiler2,$compiler3],
67-
$container,
62+
fn() =>$this->createMock(AssetMapperInterface::class),
6863
);
6964
$asset =newMappedAsset('foo.js');
7065
$asset->setPublicPathWithoutDigest('/assets/foo.js');

‎src/Symfony/Component/AssetMapper/Tests/Factory/MappedAssetFactoryTest.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
useSymfony\Component\AssetMapper\Factory\MappedAssetFactory;
2222
useSymfony\Component\AssetMapper\MappedAsset;
2323
useSymfony\Component\AssetMapper\Path\PublicAssetsPathResolverInterface;
24-
useSymfony\Component\DependencyInjection\ServiceLocator;
2524

2625
class MappedAssetFactoryTestextends TestCase
2726
{
@@ -122,10 +121,10 @@ private function createFactory(AssetCompilerInterface $extraCompiler = null): Ma
122121
$compilers[] =$extraCompiler;
123122
}
124123

125-
$container =newServiceLocator([
126-
'asset_mapper' =>fn () =>$this->assetMapper,
127-
]);
128-
$compiler =newAssetMapperCompiler($compilers,$container);
124+
$compiler =newAssetMapperCompiler(
125+
$compilers,
126+
fn() =>$this->assetMapper,
127+
);
129128

130129
$pathResolver =$this->createMock(PublicAssetsPathResolverInterface::class);
131130
$pathResolver->expects($this->any())

‎src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
useSymfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
2323
useSymfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
2424
useSymfony\Component\AssetMapper\Path\PublicAssetsPathResolverInterface;
25-
useSymfony\Component\DependencyInjection\ServiceLocator;
2625
useSymfony\Component\Filesystem\Filesystem;
2726
useSymfony\Component\HttpClient\MockHttpClient;
2827
useSymfony\Component\HttpClient\Response\MockResponse;
@@ -489,9 +488,7 @@ private function createAssetMapper(PublicAssetsPathResolverInterface $pathResolv
489488

490489
$compiler =newAssetMapperCompiler(
491490
[newJavaScriptImportPathCompiler()],
492-
newServiceLocator([
493-
'asset_mapper' =>fn () =>$this->assetMapper,
494-
])
491+
fn() =>$this->assetMapper
495492
);
496493
$factory =newMappedAssetFactory($pathResolver,$compiler);
497494

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp