Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 6228da51460b · 2023-05-19T14:46:45.000+02:00
* 6.2:
  Fix merge
  [Translation] Fix handling of null messages in `ArrayLoader`
  [Console] Remove exec and replace it by shell_exec
  [Security] Skip clearing CSRF Token on stateless logout
diff --git a/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -92,6 +92,7 @@ public function testWorkflowDefaultMarkingStoreDefinition()
     {
         $container = $this->createContainerFromClosure(function ($container) {
             $container->loadFromExtension('framework', [
+                'http_method_override' => false,
                 'workflows' => [
                     'workflow_a' => [
                         'type' => 'state_machine',

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public function testWorkflowDefaultMarkingStoreDefinition()`
`92`	`92`	`{`
`93`	`93`	`$container = $this->createContainerFromClosure(function ($container) {`
`94`	`94`	`$container->loadFromExtension('framework', [`
	`95`	`+ 'http_method_override' => false,`
`95`	`96`	`'workflows' => [`
`96`	`97`	`'workflow_a' => [`
`97`	`98`	`'type' => 'state_machine',`