Merge branch '5.4' into 6.3

* 5.4:
  fix method signatures

Author: xabbuh

src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php

@@ -40,7 +40,7 @@ class RouterController
      */
     private $expressionLanguageProviders = [];
 
-    public function __construct(?Profiler $profiler = null, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
+    public function __construct(?Profiler $profiler, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
     {
         $this->profiler = $profiler;
         $this->twig = $twig;

src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php

@@ -39,7 +39,7 @@ protected function setUp(): void
     /**
      * @dataProvider typesProvider
      */
-    public function testExtract($property, ?array $type = null, $shortDescription, $longDescription)
+    public function testExtract($property, ?array $type, $shortDescription, $longDescription)
     {
         $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property));
         $this->assertSame($shortDescription, $this->extractor->getShortDescription('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property));