Merge branch '6.4' into 7.0

* 6.4:
  DX: PHP CS Fixer - update excluded paths and apply some minor CS
  [AssetMapper] Optimize memory usage (load only "compilable" assets)
  [AssetMapper] Split ImportmapManager into 2
  Rename fixtures paths to be consistent
  Add WorflowGuardListenerPass only if it exists
  [AssetMapper] Using ?specifier=* does not match unstable packages on jsdelivr
  [Worflow] Add a TraceableWorkflow

Author: fabpot

FrameworkBundle.php

@@ -69,6 +69,7 @@
 use Symfony\Component\Validator\DependencyInjection\AddValidatorInitializersPass;
 use Symfony\Component\VarExporter\Internal\Hydrator;
 use Symfony\Component\VarExporter\Internal\Registry;
+use Symfony\Component\Workflow\DependencyInjection\WorkflowDebugPass;
 use Symfony\Component\Workflow\DependencyInjection\WorkflowGuardListenerPass;
 
 // Help opcache.preload discover always-needed symbols
@@ -155,7 +156,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new CachePoolClearerPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new CachePoolPrunerPass(), PassConfig::TYPE_AFTER_REMOVING);
         $this->addCompilerPassIfExists($container, FormPass::class);
-        $container->addCompilerPass(new WorkflowGuardListenerPass());
+        $this->addCompilerPassIfExists($container, WorkflowGuardListenerPass::class);
         $container->addCompilerPass(new ResettableServicePass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
         $container->addCompilerPass(new RegisterLocaleAwareServicesPass());
         $container->addCompilerPass(new TestServiceContainerWeakRefPass(), PassConfig::TYPE_BEFORE_REMOVING, -32);
@@ -176,6 +177,7 @@ public function build(ContainerBuilder $container): void
             $container->addCompilerPass(new UnusedTagsPass(), PassConfig::TYPE_AFTER_REMOVING);
             $container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_BEFORE_REMOVING, -255);
             $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);
+            $this->addCompilerPassIfExists($container, WorkflowDebugPass::class);
         }
     }
 

Resources/config/asset_mapper.php

@@ -31,6 +31,7 @@
 use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapAuditor;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapConfigReader;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapGenerator;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapUpdateChecker;
@@ -101,7 +102,7 @@
             ->args([
                 service('asset_mapper.public_assets_path_resolver'),
                 service('asset_mapper'),
-                service('asset_mapper.importmap.manager'),
+                service('asset_mapper.importmap.generator'),
                 service('filesystem'),
                 param('kernel.project_dir'),
                 abstract_arg('public directory name'),
@@ -137,7 +138,7 @@
 
         ->set('asset_mapper.compiler.javascript_import_path_compiler', JavaScriptImportPathCompiler::class)
             ->args([
-                service('asset_mapper.importmap.manager'),
+                service('asset_mapper.importmap.config_reader'),
                 abstract_arg('missing import mode'),
                 service('logger'),
             ])
@@ -153,13 +154,19 @@
         ->set('asset_mapper.importmap.manager', ImportMapManager::class)
             ->args([
                 service('asset_mapper'),
-                service('asset_mapper.public_assets_path_resolver'),
                 service('asset_mapper.importmap.config_reader'),
                 service('asset_mapper.importmap.remote_package_downloader'),
                 service('asset_mapper.importmap.resolver'),
             ])
         ->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
 
+        ->set('asset_mapper.importmap.generator', ImportMapGenerator::class)
+            ->args([
+                service('asset_mapper'),
+                service('asset_mapper.public_assets_path_resolver'),
+                service('asset_mapper.importmap.config_reader'),
+            ])
+
         ->set('asset_mapper.importmap.remote_package_storage', RemotePackageStorage::class)
             ->args([
                 abstract_arg('vendor directory'),
@@ -183,7 +190,7 @@
 
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([
-                service('asset_mapper.importmap.manager'),
+                service('asset_mapper.importmap.generator'),
                 service('assets.packages')->nullOnInvalid(),
                 param('kernel.charset'),
                 abstract_arg('polyfill URL'),
@@ -205,7 +212,6 @@
         ->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)
             ->args([
                 service('asset_mapper.importmap.manager'),
-                param('kernel.project_dir'),
                 service('asset_mapper.importmap.version_checker'),
             ])
             ->tag('console.command')