Merge branch '7.4' into 8.0

* 7.4: (40 commits)
  [PropertyInfo] treat mixed[] the same as array when getting types from docblocks
  treat `mixed[]` the same as `array` when getting types from docblocks
  install ext-zstd on PHP 8.5 as well
  fix merge
  [Console] Fix profile invokable command
  sync ControllerHelper docblock with latest AbstractController changes
  fix: Typehint for `createForm` in abstractController
  [Notifier][Mercure] Add support for Mercure 0.7
  register attribute loader arguments in a forward-compatible way
  ensure compatibility with RelayCluster 0.20.0
  mark test using a Redis connection as an integration test
  ensure compatibility with Relay extension 0.20.0
  [FrameworkBundle] Allow backed enum to be used in initial_marking workflow configuration
  [DependencyInjection] Fix `query_string` env processor for URLs without query string
  [HttpFoundation] Fix Expires response header for EventStream
  Bump Symfony version to 7.4.1
  Update VERSION for 7.4.0
  Update CHANGELOG for 7.4.0
  -
  [DependencyInjection] Fix state corruption in PhpFileLoader during recursive imports
  ...

Author: xabbuh

Command/ConfigDebugCommand.php

@@ -161,7 +161,7 @@ private function getConfigForPath(array $config, string $path, string $alias): m
         $steps = explode('.', $path);
 
         foreach ($steps as $step) {
-            if (!\array_key_exists($step, $config)) {
+            if (!\is_array($config) || !\array_key_exists($step, $config)) {
                 throw new LogicException(\sprintf('Unable to find configuration for "%s.%s".', $alias, $path));
             }
 

Controller/AbstractController.php

@@ -17,6 +17,8 @@
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Flow\FormFlowInterface;
+use Symfony\Component\Form\Flow\FormFlowTypeInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
@@ -344,6 +346,8 @@ protected function createAccessDeniedException(string $message = 'Access Denied.
 
     /**
      * Creates and returns a Form instance from the type of the form.
+     *
+     * @return ($type is class-string<FormFlowTypeInterface> ? FormFlowInterface : FormInterface)
      */
     protected function createForm(string $type, mixed $data = null, array $options = []): FormInterface
     {

Controller/ControllerHelper.php

@@ -17,6 +17,8 @@
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Flow\FormFlowInterface;
+use Symfony\Component\Form\Flow\FormFlowTypeInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
@@ -337,6 +339,8 @@ public function createAccessDeniedException(string $message = 'Access Denied.',
 
     /**
      * Creates and returns a Form instance from the type of the form.
+     *
+     * @return ($type is class-string<FormFlowTypeInterface> ? FormFlowInterface : FormInterface)
      */
     public function createForm(string $type, mixed $data = null, array $options = []): FormInterface
     {

DependencyInjection/Configuration.php

@@ -462,8 +462,19 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                         ->cannotBeEmpty()
                                     ->end()
                                     ->arrayNode('initial_marking')
-                                        ->acceptAndWrap(['string'])
+                                        ->acceptAndWrap(['backed-enum', 'string'])
                                         ->defaultValue([])
+                                        ->beforeNormalization()
+                                            ->ifArray()
+                                            ->then(static function ($markings) {
+                                                $normalizedMarkings = [];
+                                                foreach ($markings as $marking) {
+                                                    $normalizedMarkings[] = $marking instanceof \BackedEnum ? $marking->value : $marking;
+                                                }
+
+                                                return $normalizedMarkings;
+                                            })
+                                        ->end()
                                         ->prototype('scalar')->end()
                                     ->end()
                                     ->arrayNode('events_to_dispatch', 'event_to_dispatch')
@@ -1936,6 +1947,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                 ->end()
                                 ->arrayNode('vars', 'var')
                                     ->info('Associative array: the default vars used to expand the templated URI.')
+                                    ->useAttributeAsKey('name')
                                     ->normalizeKeys(false)
                                     ->variablePrototype()->end()
                                 ->end()
@@ -2014,6 +2026,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                 ->end()
                                 ->arrayNode('extra')
                                     ->info('Extra options for specific HTTP client.')
+                                    ->useAttributeAsKey('name')
                                     ->normalizeKeys(false)
                                     ->variablePrototype()->end()
                                 ->end()
@@ -2160,6 +2173,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                     ->end()
                                     ->arrayNode('extra')
                                         ->info('Extra options for specific HTTP client.')
+                                        ->useAttributeAsKey('name')
                                         ->normalizeKeys(false)
                                         ->variablePrototype()->end()
                                     ->end()

DependencyInjection/FrameworkExtension.php

@@ -1692,11 +1692,11 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
         foreach ($config['providers'] as $provider) {
             if ($provider['locales']) {
-                $locales += $provider['locales'];
+                $locales = array_merge($locales, $provider['locales']);
             }
         }
 
-        $locales = array_unique($locales);
+        $locales = array_values(array_unique($locales));
 
         $container->getDefinition('console.command.translation_pull')
             ->replaceArgument(4, array_merge($transPaths, [$config['default_path']]))

Tests/DependencyInjection/ConfigurationTest.php

@@ -632,6 +632,7 @@ public function testWorkflowEnumArcsNormalization()
                     'enum' => [
                         'supports' => [self::class],
                         'places' => Places::cases(),
+                        'initial_marking' => Places::A,
                         'transitions' => [
                             [
                                 'name' => 'one',
@@ -649,6 +650,8 @@ public function testWorkflowEnumArcsNormalization()
             ],
         ]]);
 
+        $this->assertSame(['a'], $config['workflows']['workflows']['enum']['initial_marking']);
+
         $transitions = $config['workflows']['workflows']['enum']['transitions'];
 
         $this->assertSame('one', $transitions[0]['name']);

Tests/DependencyInjection/Fixtures/php/translator_providers.php

@@ -0,0 +1,19 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'annotations' => false,
+    'http_method_override' => false,
+    'handle_all_throwables' => true,
+    'php_errors' => ['log' => true],
+    'enabled_locales' => ['es'],
+    'translator' => [
+        'providers' => [
+            'foo_provider' => [
+                'locales' => ['en', 'fr'],
+            ],
+            'bar_provider' => [
+                'locales' => ['de', 'pl'],
+            ]
+        ]
+    ],
+]);

Tests/DependencyInjection/Fixtures/xml/translator_providers.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config secret="s3cr3t" http-method-override="false" handle-all-throwables="true">
+        <framework:annotations enabled="false" />
+        <framework:php-errors log="true" />
+        <framework:enabled-locale>es</framework:enabled-locale>
+        <framework:translator enabled="true">
+            <framework:provider name="foo_provider">
+                <framework:locale>en</framework:locale>
+                <framework:locale>fr</framework:locale>
+            </framework:provider>
+            <framework:provider name="bar_provider">
+                <framework:locale>de</framework:locale>
+                <framework:locale>pl</framework:locale>
+            </framework:provider>
+        </framework:translator>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/translator_providers.yml

@@ -0,0 +1,13 @@
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    enabled_locales: [ 'es' ]
+    php_errors:
+        log: true
+    translator:
+        providers:
+            foo_provider:
+                locales: [ 'en', 'fr' ]
+            bar_provider:
+                locales: [ 'de', 'pl' ]

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -1394,6 +1394,13 @@ public function testTranslator()
         $this->assertSame('Fixtures/translations', $options['cache_vary']['scanned_directories'][3]);
     }
 
+    public function testTranslatorProvidersMergedEnabledLocales()
+    {
+        $container = $this->createContainerFromFile('translator_providers');
+        self::assertSame(['es', 'en', 'fr', 'de', 'pl'], $container->getDefinition('console.command.translation_pull')->getArgument(5));
+        self::assertSame(['es', 'en', 'fr', 'de', 'pl'], $container->getDefinition('console.command.translation_push')->getArgument(3));
+    }
+
     public function testTranslatorMultipleFallbacks()
     {
         $container = $this->createContainerFromFile('translator_fallbacks');