Merge branch '5.4' into 6.0

* 5.4: (27 commits)
  feat: add completion for DebugAutowiring search argument
  [Routing] Add support for aliasing routes
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS
  [Console] Open CompleteCommand for custom outputs
  [Intl] Update the ICU data to 70.1
  [Messenger] Add completion for failed messages commands.
  Fix tests
  Fixing missing full_stack variable that's needed by toolbar.html.twig
  [PropertyInfo] Bump phpstan/phpdoc-parser
  [Security] Backport type fixes
  [VarExporter] escape unicode chars involved in directionality
  [Framework] Add completion to debug:container
  [Messenger] Add completion to command messenger:consume
  [Intl] Update the ICU data to 70.1
  Fix more generic types
  Default access_decision_manager.strategy option with merge.
  Fix typos
  Update validators.ca.xlf
  Add missing Validator translations for Estonian
  ...

Signed-off-by: Alexander M. Turek <me@derrabus.de>

Author: derrabus

DependencyInjection/MainConfiguration.php

@@ -40,7 +40,7 @@ class MainConfiguration implements ConfigurationInterface
     private array $userProviderFactories;
 
     /**
-     * @param array<int, AuthenticatorFactoryInterface> $factories
+     * @param array<array-key, AuthenticatorFactoryInterface> $factories
      */
     public function __construct(array $factories, array $userProviderFactories)
     {
@@ -57,28 +57,6 @@ public function getConfigTreeBuilder(): TreeBuilder
         $rootNode = $tb->getRootNode();
 
         $rootNode
-            ->beforeNormalization()
-                ->ifTrue(function ($v) {
-                    if (!isset($v['access_decision_manager'])) {
-                        return true;
-                    }
-
-                    if (!isset($v['access_decision_manager']['strategy'])
-                        && !isset($v['access_decision_manager']['service'])
-                        && !isset($v['access_decision_manager']['strategy_service'])
-                        && !isset($v['access_decision_manager']['strategy-service'])
-                    ) {
-                        return true;
-                    }
-
-                    return false;
-                })
-                ->then(function ($v) {
-                    $v['access_decision_manager']['strategy'] = self::STRATEGY_AFFIRMATIVE;
-
-                    return $v;
-                })
-            ->end()
             ->children()
                 ->scalarNode('access_denied_url')->defaultNull()->example('/foo/error403')->end()
                 ->enumNode('session_fixation_strategy')
@@ -188,7 +166,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
     }
 
     /**
-     * @param array<int, AuthenticatorFactoryInterface> $factories
+     * @param array<array-key, AuthenticatorFactoryInterface> $factories
      */
     private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories)
     {

DependencyInjection/SecurityExtension.php

@@ -58,7 +58,7 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
     private array $requestMatchers = [];
     private array $expressions = [];
     private array $contextListeners = [];
-    /** @var list<array{0: int, 1: AuthenticatorFactoryInterface}> */
+    /** @var list<array{int, AuthenticatorFactoryInterface}> */
     private array $factories = [];
     /** @var AuthenticatorFactoryInterface[] */
     private array $sortedFactories = [];
@@ -126,7 +126,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container
                 ->getDefinition('security.access.decision_manager')
                 ->addArgument($this->createStrategyDefinition(
-                    $config['access_decision_manager']['strategy'],
+                    $config['access_decision_manager']['strategy'] ?? MainConfiguration::STRATEGY_AFFIRMATIVE,
                     $config['access_decision_manager']['allow_if_all_abstain'],
                     $config['access_decision_manager']['allow_if_equal_granted_denied']
                 ));

Security/FirewallContext.php

@@ -27,6 +27,9 @@ class FirewallContext
     private ?LogoutListener $logoutListener;
     private ?FirewallConfig $config;
 
+    /**
+     * @param iterable<mixed, callable> $listeners
+     */
     public function __construct(iterable $listeners, ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null, FirewallConfig $config = null)
     {
         $this->listeners = $listeners;
@@ -40,6 +43,9 @@ public function getConfig()
         return $this->config;
     }
 
+    /**
+     * @return iterable<mixed, callable>
+     */
     public function getListeners(): iterable
     {
         return $this->listeners;

Tests/DependencyInjection/MainConfigurationTest.php

@@ -115,6 +115,24 @@ public function testUserCheckers()
         $this->assertEquals('app.henk_checker', $processedConfig['firewalls']['stub']['user_checker']);
     }
 
+    public function testConfigMergeWithAccessDecisionManager()
+    {
+        $config = [
+            'access_decision_manager' => [
+                'strategy' => MainConfiguration::STRATEGY_UNANIMOUS,
+            ],
+        ];
+        $config = array_merge(static::$minimalConfig, $config);
+
+        $config2 = [];
+
+        $processor = new Processor();
+        $configuration = new MainConfiguration([], []);
+        $processedConfig = $processor->processConfiguration($configuration, [$config, $config2]);
+
+        $this->assertSame(MainConfiguration::STRATEGY_UNANIMOUS, $processedConfig['access_decision_manager']['strategy']);
+    }
+
     public function testFirewalls()
     {
         $factory = $this->createMock(AuthenticatorFactoryInterface::class);