Merge branch '4.4' into 5.1

* 4.4:
  fix merge
  drop logger mock in favor of using the BufferingLogger
  catch ValueError thrown on PHP 8
  [Yaml Parser] Fix edge cases when parsing multiple documents
  fix parsing comments not prefixed by a space
  [Translator] Make sure a null locale is handled properly
  deal with errors being thrown on PHP 8
  [Cache] Allow cache tags to be objects implementing __toString()
  [HttpKernel] Do not override max_redirects option in HttpClientKernel
  remove superfluous cast
  [HttpClient] Support for CURLOPT_LOCALPORT.
  Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).
  Fixed exception message formatting
  [FrameworkBundle] Fix error in xsd which prevent to register more than one metadata
  [Console] work around disabled putenv()
  [PhpUnitBridge] Fix error with ReflectionClass
  [HttpClient][HttpClientTrait] don't calculate alternatives if option is auth_ntlm
  Change 'cache_key' to AbstractRendererEngine::CACHE_KEY_VAR
  Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).

Author: xabbuh

DependencyInjection/Configuration.php

@@ -1197,7 +1197,7 @@ function ($a) {
                                                         return $middleware;
                                                     }
                                                     if (1 < \count($middleware)) {
-                                                        throw new \InvalidArgumentException(sprintf('Invalid middleware at path "framework.messenger": a map with a single factory id as key and its arguments as value was expected, %s given.', json_encode($middleware)));
+                                                        throw new \InvalidArgumentException('Invalid middleware at path "framework.messenger": a map with a single factory id as key and its arguments as value was expected, '.json_encode($middleware).' given.');
                                                     }
 
                                                     return [

Resources/config/schema/symfony-1.0.xsd

@@ -331,7 +331,7 @@
 
     <xsd:complexType name="metadata">
         <xsd:sequence>
-            <xsd:any minOccurs="0" processContents="lax"/>
+            <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
         </xsd:sequence>
     </xsd:complexType>
 

Tests/DependencyInjection/Fixtures/php/workflows.php

@@ -10,6 +10,10 @@
                 FrameworkExtensionTest::class,
             ],
             'initial_marking' => ['draft'],
+            'metadata' => [
+                'title' => 'article workflow',
+                'description' => 'workflow for articles'
+            ],
             'places' => [
                 'draft',
                 'wait_for_journalist',

Tests/DependencyInjection/Fixtures/xml/workflows.xml

@@ -35,6 +35,10 @@
                 <framework:from>approved_by_spellchecker</framework:from>
                 <framework:to>published</framework:to>
             </framework:transition>
+            <framework:metadata>
+                <framework:title>article workflow</framework:title>
+                <framework:description>workflow for articles</framework:description>
+            </framework:metadata>
         </framework:workflow>
 
         <framework:workflow name="pull_request">

Tests/DependencyInjection/Fixtures/yml/workflows.yml

@@ -5,6 +5,9 @@ framework:
             supports:
                 - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
             initial_marking: [draft]
+            metadata:
+                title: article workflow
+                description: workflow for articles
             places:
                 # simple format
                 - draft

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -54,6 +54,7 @@
 use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
 use Symfony\Component\Validator\Mapping\Loader\PropertyInfoLoader;
 use Symfony\Component\Workflow;
+use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
 
 abstract class FrameworkExtensionTest extends TestCase
 {
@@ -231,6 +232,12 @@ public function testWorkflows()
         );
         $this->assertCount(4, $workflowDefinition->getArgument(1));
         $this->assertSame(['draft'], $workflowDefinition->getArgument(2));
+        $metadataStoreDefinition = $workflowDefinition->getArgument(3);
+        $this->assertSame(InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
+        $this->assertSame([
+            'title' => 'article workflow',
+            'description' => 'workflow for articles',
+        ], $metadataStoreDefinition->getArgument(0));
 
         $this->assertTrue($container->hasDefinition('state_machine.pull_request'), 'State machine is registered as a service');
         $this->assertSame('state_machine.abstract', $container->getDefinition('state_machine.pull_request')->getParent());
@@ -255,7 +262,7 @@ public function testWorkflows()
 
         $metadataStoreDefinition = $stateMachineDefinition->getArgument(3);
         $this->assertInstanceOf(Definition::class, $metadataStoreDefinition);
-        $this->assertSame(Workflow\Metadata\InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
+        $this->assertSame(InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
 
         $workflowMetadata = $metadataStoreDefinition->getArgument(0);
         $this->assertSame(['title' => 'workflow title'], $workflowMetadata);