Merge branch '6.4' into 7.0

* 6.4:
  [AssetMapper] Allow simple, relative paths in importmap.php
  [PropertyInfo] Make isWriteable() more consistent with isReadable() when checking snake_case properties
  [AssetMapper] Add support for CSS files in the importmap
  [Messenger] Add `--all` option to the `messenger:failed:remove` command
  Fix merge
  fix #51235 - fix the order of merging of serializationContext and self::CONTEXT_DENORMALIZE
  [HttpClient] Fix Static Code Analyzer issue with JsonMockResponse
  [Messenger] Fix exiting `FailedMessagesRetryCommand`
  [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize()
  remove an unreachable code branch
  [Validator] Fix `File::$extensions`’ PHPDoc
  [Mime] Fix email (de)serialization issues
  [FrameworkBundle][WebProfilerBundle][Console][Form][HttpKernel][PropertyInfo][Validator] Remove optional before required param
  Replace usages of SkippedTestSuiteError with markTestSkipped() call
  Update InteractiveAuthenticatorInterface description wording to match documentation
  [Serializer] Fix parsing XML root node attributes
  fix parsing of payload timestamp to DateTimeImmutable
  Fix routing to multiple fallback transports
  Fix missing stamps in delayed message handling
  [DoctrineBridge] Ignore invalid stores in `LockStoreSchemaListener` raised by `StoreFactory`

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -1321,23 +1321,27 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
             ->setArgument(0, $config['missing_import_mode']);
 
         $container->getDefinition('asset_mapper.compiler.javascript_import_path_compiler')
-            ->setArgument(0, $config['missing_import_mode']);
+            ->setArgument(1, $config['missing_import_mode']);
 
         $container
             ->getDefinition('asset_mapper.importmap.manager')
-            ->replaceArgument(2, $config['importmap_path'])
             ->replaceArgument(3, $config['vendor_dir'])
         ;
 
+        $container
+            ->getDefinition('asset_mapper.importmap.config_reader')
+            ->replaceArgument(0, $config['importmap_path'])
+        ;
+
         $container
             ->getDefinition('asset_mapper.importmap.resolver')
             ->replaceArgument(0, $config['provider'])
         ;
 
         $container
             ->getDefinition('asset_mapper.importmap.renderer')
-            ->replaceArgument(2, $config['importmap_polyfill'] ?? ImportMapManager::POLYFILL_URL)
-            ->replaceArgument(3, $config['importmap_script_attributes'])
+            ->replaceArgument(3, $config['importmap_polyfill'] ?? ImportMapManager::POLYFILL_URL)
+            ->replaceArgument(4, $config['importmap_script_attributes'])
         ;
 
         $container->registerForAutoconfiguration(PackageResolverInterface::class)
@@ -2046,6 +2050,13 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->getDefinition('messenger.transport.beanstalkd.factory')->addTag('messenger.transport_factory');
         }
 
+        if ($config['stop_worker_on_signals'] && $this->hasConsole()) {
+            $container->getDefinition('console.command.messenger_consume_messages')
+                ->replaceArgument(8, $config['stop_worker_on_signals']);
+            $container->getDefinition('console.command.messenger_failed_messages_retry')
+                ->replaceArgument(6, $config['stop_worker_on_signals']);
+        }
+
         if (null === $config['default_bus'] && 1 === \count($config['buses'])) {
             $config['default_bus'] = key($config['buses']);
         }

Resources/config/asset_mapper.php

@@ -18,7 +18,6 @@
 use Symfony\Component\AssetMapper\AssetMapperRepository;
 use Symfony\Component\AssetMapper\Command\AssetMapperCompileCommand;
 use Symfony\Component\AssetMapper\Command\DebugAssetMapperCommand;
-use Symfony\Component\AssetMapper\Command\ImportMapExportCommand;
 use Symfony\Component\AssetMapper\Command\ImportMapInstallCommand;
 use Symfony\Component\AssetMapper\Command\ImportMapRemoveCommand;
 use Symfony\Component\AssetMapper\Command\ImportMapRequireCommand;
@@ -28,6 +27,7 @@
 use Symfony\Component\AssetMapper\Compiler\SourceMappingUrlsCompiler;
 use Symfony\Component\AssetMapper\Factory\CachedMappedAssetFactory;
 use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapConfigReader;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
 use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
@@ -100,6 +100,7 @@
                 param('kernel.project_dir'),
                 abstract_arg('public directory name'),
                 param('kernel.debug'),
+                service('event_dispatcher')->nullOnInvalid(),
             ])
             ->tag('console.command')
 
@@ -130,17 +131,23 @@
 
         ->set('asset_mapper.compiler.javascript_import_path_compiler', JavaScriptImportPathCompiler::class)
             ->args([
+                service('asset_mapper.importmap.manager'),
                 abstract_arg('missing import mode'),
                 service('logger'),
             ])
             ->tag('asset_mapper.compiler')
             ->tag('monolog.logger', ['channel' => 'asset_mapper'])
 
+        ->set('asset_mapper.importmap.config_reader', ImportMapConfigReader::class)
+            ->args([
+                abstract_arg('importmap.php path'),
+            ])
+
         ->set('asset_mapper.importmap.manager', ImportMapManager::class)
             ->args([
                 service('asset_mapper'),
                 service('asset_mapper.public_assets_path_resolver'),
-                abstract_arg('importmap.php path'),
+                service('asset_mapper.importmap.config_reader'),
                 abstract_arg('vendor directory'),
                 service('asset_mapper.importmap.resolver'),
                 service('http_client'),
@@ -180,6 +187,7 @@
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([
                 service('asset_mapper.importmap.manager'),
+                service('assets.packages')->nullOnInvalid(),
                 param('kernel.charset'),
                 abstract_arg('polyfill URL'),
                 abstract_arg('script HTML attributes'),
@@ -201,10 +209,6 @@
             ->args([service('asset_mapper.importmap.manager')])
             ->tag('console.command')
 
-        ->set('asset_mapper.importmap.command.export', ImportMapExportCommand::class)
-            ->args([service('asset_mapper.importmap.manager')])
-            ->tag('console.command')
-
         ->set('asset_mapper.importmap.command.install', ImportMapInstallCommand::class)
             ->args([service('asset_mapper.importmap.manager')])
             ->tag('console.command')

Resources/config/console.php

@@ -165,6 +165,7 @@
                 service('messenger.listener.reset_services')->nullOnInvalid(),
                 [], // Bus names
                 service('messenger.rate_limiter_locator')->nullOnInvalid(),
+                null,
             ])
             ->tag('console.command')
             ->tag('monolog.logger', ['channel' => 'messenger'])
@@ -196,6 +197,7 @@
                 service('event_dispatcher'),
                 service('logger')->nullOnInvalid(),
                 service('messenger.transport.native_php_serializer')->nullOnInvalid(),
+                null,
             ])
             ->tag('console.command')
             ->tag('monolog.logger', ['channel' => 'messenger'])

Tests/DependencyInjection/XmlFrameworkExtensionTest.php

@@ -51,7 +51,7 @@ public function testAssetMapper()
         $this->assertSame(['zip' => 'application/zip'], $definition->getArgument(2));
 
         $definition = $container->getDefinition('asset_mapper.importmap.renderer');
-        $this->assertSame(['data-turbo-track' => 'reload'], $definition->getArgument(3));
+        $this->assertSame(['data-turbo-track' => 'reload'], $definition->getArgument(4));
 
         $definition = $container->getDefinition('asset_mapper.repository');
         $this->assertSame(['assets/' => '', 'assets2/' => 'my_namespace'], $definition->getArgument(0));