Merge branch '4.3' into 4.4

* 4.3:
  [OptionsResolve] Revert change in tests for a not-merged change in code
  [HttpClient] fix handling of 3xx with no Location header - ignore Content-Length when no body is expected
  [Workflow] Made the configuration more robust for the 'property' key
  [Security/Core] make NativePasswordEncoder use sodium to validate passwords when possible
  #30432 fix an error message
  fix paths to detect code owners
  [HttpClient] ignore the body of responses to HEAD requests
  [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4
  [SecurityBundle] Fix wrong assertion
  Remove unused local variables in tests
  [Yaml][Parser] Remove the getLastLineNumberBeforeDeprecation() internal unused method
  Make sure to collect child forms created on *_SET_DATA events
  [WebProfilerBundle] Improve display in Email panel for dark theme
  do not render errors for checkboxes twice

Author: nicolas-grekas

Console/Descriptor/TextDescriptor.php

@@ -510,7 +510,6 @@ private function renderEventListenerTable(EventDispatcherInterface $eventDispatc
         $tableHeaders = ['Order', 'Callable', 'Priority'];
         $tableRows = [];
 
-        $order = 1;
         foreach ($eventListeners as $order => $listener) {
             $tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
         }

DependencyInjection/Configuration.php

@@ -322,7 +322,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                                 ->end()
                                             ->end()
                                             ->scalarNode('property')
-                                                ->defaultValue('marking')
+                                                ->defaultNull() // In Symfony 5.0, set "marking" as default property
                                             ->end()
                                             ->scalarNode('service')
                                                 ->cannotBeEmpty()
@@ -500,6 +500,14 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                         return $v;
                                     })
                                 ->end()
+                                ->validate()
+                                    ->ifTrue(function ($v) {
+                                        return isset($v['marking_store']['property'])
+                                            && (!isset($v['marking_store']['type']) || 'method' !== $v['marking_store']['type'])
+                                        ;
+                                    })
+                                    ->thenInvalid('"property" option is only supported by the "method" marking store.')
+                                ->end()
                             ->end()
                         ->end()
                     ->end()

DependencyInjection/FrameworkExtension.php

@@ -697,7 +697,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 if ('method' === $workflow['marking_store']['type']) {
                     $markingStoreDefinition->setArguments([
                         'state_machine' === $type, //single state
-                        $workflow['marking_store']['property'],
+                        $workflow['marking_store']['property'] ?? 'marking',
                     ]);
                 } else {
                     foreach ($workflow['marking_store']['arguments'] as $argument) {

Tests/Controller/ControllerTraitTest.php

@@ -272,8 +272,7 @@ public function testFileWhichDoesNotExist()
         $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
         $controller = $this->createController();
 
-        /* @var BinaryFileResponse $response */
-        $response = $controller->file('some-file.txt', 'test.php');
+        $controller->file('some-file.txt', 'test.php');
     }
 
     public function testIsGranted()

Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php

@@ -27,7 +27,7 @@ class TestExtension extends Extension implements PrependExtensionInterface
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = $this->getConfiguration($configs, $container);
-        $config = $this->processConfiguration($configuration, $configs);
+        $this->processConfiguration($configuration, $configs);
 
         $container->setAlias('test.annotation_reader', new Alias('annotation_reader', true));
     }

Tests/Functional/SessionTest.php

@@ -59,7 +59,7 @@ public function testFlash($config, $insulate)
         }
 
         // set flash
-        $crawler = $client->request('GET', '/session_setflash/Hello%20world.');
+        $client->request('GET', '/session_setflash/Hello%20world.');
 
         // check flash displays on redirect
         $this->assertStringContainsString('Hello world.', $client->followRedirect()->text());