Skip to content

Commit d741f38

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.0
* 6.4: Fix AssetMapper tests (+ dependencies) [FrameworkBundle] Fix requiring moved translation compiler passes
2 parents 8c810b0 + 7f58a4d commit d741f38

File tree

6 files changed

+22
-25
lines changed

6 files changed

+22
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function build(ContainerBuilder $container): void
132132
$container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
133133
$container->addCompilerPass(new RemoveEmptyControllerArgumentLocatorsPass(), PassConfig::TYPE_BEFORE_REMOVING);
134134
$container->addCompilerPass(new RoutingResolverPass());
135-
$container->addCompilerPass(new DataCollectorTranslatorPass());
135+
$this->addCompilerPassIfExists($container, DataCollectorTranslatorPass::class);
136136
$container->addCompilerPass(new ProfilerPass());
137137
// must be registered before removing private services as some might be listeners/subscribers
138138
// but as late as possible to get resolved parameters
@@ -144,7 +144,7 @@ public function build(ContainerBuilder $container): void
144144
// twig.template_iterator definition
145145
$this->addCompilerPassIfExists($container, TranslatorPass::class, PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
146146
$this->addCompilerPassIfExists($container, TranslatorPathsPass::class, PassConfig::TYPE_AFTER_REMOVING);
147-
$container->addCompilerPass(new LoggingTranslatorPass());
147+
$this->addCompilerPassIfExists($container, LoggingTranslatorPass::class);
148148
$container->addCompilerPass(new AddExpressionLanguageProvidersPass());
149149
$this->addCompilerPassIfExists($container, TranslationExtractorPass::class);
150150
$this->addCompilerPassIfExists($container, TranslationDumperPass::class);

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ class ImportMapConfigReaderTest extends TestCase
2626
protected function setUp(): void
2727
{
2828
$this->filesystem = new Filesystem();
29-
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing')) {
30-
$this->filesystem->mkdir(__DIR__ . '/../Fixtures/importmaps_for_writing');
29+
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing')) {
30+
$this->filesystem->mkdir(__DIR__.'/../Fixtures/importmaps_for_writing');
3131
}
32-
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing/assets')) {
33-
$this->filesystem->mkdir(__DIR__ . '/../Fixtures/importmaps_for_writing/assets');
32+
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing/assets')) {
33+
$this->filesystem->mkdir(__DIR__.'/../Fixtures/importmaps_for_writing/assets');
3434
}
3535
}
3636

3737
protected function tearDown(): void
3838
{
39-
$this->filesystem->remove(__DIR__ . '/../Fixtures/importmaps_for_writing');
39+
$this->filesystem->remove(__DIR__.'/../Fixtures/importmaps_for_writing');
4040
}
4141

4242
public function testGetEntriesAndWriteEntries()
@@ -63,7 +63,7 @@ public function testGetEntriesAndWriteEntries()
6363
],
6464
];
6565
EOF;
66-
file_put_contents(__DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php', $importMap);
66+
file_put_contents(__DIR__.'/../Fixtures/importmaps_for_writing/importmap.php', $importMap);
6767

6868
$remotePackageStorage = $this->createMock(RemotePackageStorage::class);
6969
$remotePackageStorage->expects($this->any())
@@ -72,7 +72,7 @@ public function testGetEntriesAndWriteEntries()
7272
return '/path/to/vendor/'.$packageModuleSpecifier.'.'.$type->value;
7373
});
7474
$reader = new ImportMapConfigReader(
75-
__DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php',
75+
__DIR__.'/../Fixtures/importmaps_for_writing/importmap.php',
7676
$remotePackageStorage,
7777
);
7878
$entries = $reader->getEntries();
@@ -100,24 +100,24 @@ public function testGetEntriesAndWriteEntries()
100100
$this->assertSame('package/with_file.js', $packageWithFileEntry->packageModuleSpecifier);
101101

102102
// now save the original raw data from importmap.php and delete the file
103-
$originalImportMapData = (static fn () => include __DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php')();
104-
unlink(__DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php');
103+
$originalImportMapData = (static fn () => include __DIR__.'/../Fixtures/importmaps_for_writing/importmap.php')();
104+
unlink(__DIR__.'/../Fixtures/importmaps_for_writing/importmap.php');
105105
// dump the entries back to the file
106106
$reader->writeEntries($entries);
107-
$newImportMapData = (static fn () => include __DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php')();
107+
$newImportMapData = (static fn () => include __DIR__.'/../Fixtures/importmaps_for_writing/importmap.php')();
108108

109109
$this->assertSame($originalImportMapData, $newImportMapData);
110110
}
111111

112112
public function testGetRootDirectory()
113113
{
114-
$configReader = new ImportMapConfigReader(__DIR__ . '/../Fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
115-
$this->assertSame(__DIR__ . '/../Fixtures', $configReader->getRootDirectory());
114+
$configReader = new ImportMapConfigReader(__DIR__.'/../Fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
115+
$this->assertSame(__DIR__.'/../Fixtures', $configReader->getRootDirectory());
116116
}
117117

118118
public function testFindRootImportMapEntry()
119119
{
120-
$configReader = new ImportMapConfigReader(__DIR__.'/../fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
120+
$configReader = new ImportMapConfigReader(__DIR__.'/../Fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
121121
$entry = $configReader->findRootImportMapEntry('file2');
122122
$this->assertSame('file2', $entry->importName);
123123
$this->assertSame('file2.js', $entry->path);

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,12 @@ class ImportMapGeneratorTest extends TestCase
3232
private ImportMapGenerator $importMapGenerator;
3333

3434
private Filesystem $filesystem;
35-
private static string $writableRoot = __DIR__.'/../fixtures/importmaps_for_writing';
35+
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';
3636

3737
protected function setUp(): void
3838
{
3939
$this->filesystem = new Filesystem();
40-
if (!file_exists(__DIR__.'/../fixtures/importmaps_for_writing')) {
41-
$this->filesystem->mkdir(self::$writableRoot);
42-
}
43-
if (!file_exists(__DIR__.'/../fixtures/importmaps_for_writing/assets')) {
40+
if (!file_exists(self::$writableRoot.'/assets')) {
4441
$this->filesystem->mkdir(self::$writableRoot.'/assets');
4542
}
4643
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class ImportMapManagerTest extends TestCase
3535
private ImportMapManager $importMapManager;
3636

3737
private Filesystem $filesystem;
38-
private static string $writableRoot = __DIR__ . '/../Fixtures/importmaps_for_writing';
38+
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';
3939

4040
protected function setUp(): void
4141
{
4242
$this->filesystem = new Filesystem();
43-
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing')) {
43+
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing')) {
4444
$this->filesystem->mkdir(self::$writableRoot);
4545
}
46-
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing/assets')) {
46+
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing/assets')) {
4747
$this->filesystem->mkdir(self::$writableRoot.'/assets');
4848
}
4949
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
class RemotePackageDownloaderTest extends TestCase
2525
{
2626
private Filesystem $filesystem;
27-
private static string $writableRoot = __DIR__ . '/../Fixtures/importmaps_for_writing';
27+
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';
2828

2929
protected function setUp(): void
3030
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class RemotePackageStorageTest extends TestCase
2121
{
2222
private Filesystem $filesystem;
23-
private static string $writableRoot = __DIR__ . '/../Fixtures/importmaps_for_writing';
23+
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';
2424

2525
protected function setUp(): void
2626
{

0 commit comments

Comments
 (0)