Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 17a88cf407cf · 2023-03-20T17:10:52.000+01:00
* 6.2:
  Fix merge
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/TraceableArgumentResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/TraceableArgumentResolverTest.php
@@ -29,7 +29,7 @@ public function testStopwatchEventIsStoppedWhenResolverThrows()
         $stopwatch->method('start')->willReturn($stopwatchEvent);
 
         $resolver = new class() implements ArgumentResolverInterface {
-            public function getArguments(Request $request, callable $controller)
+            public function getArguments(Request $request, callable $controller): array
             {
                 throw new \Exception();
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/TraceableControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/TraceableControllerResolverTest.php
@@ -29,7 +29,7 @@ public function testStopwatchEventIsStoppedWhenResolverThrows()
         $stopwatch->method('start')->willReturn($stopwatchEvent);
 
         $resolver = new class() implements ControllerResolverInterface {
-            public function getController(Request $request)
+            public function getController(Request $request): callable|false
             {
                 throw new \Exception();
             }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function testStopwatchEventIsStoppedWhenResolverThrows()`
`29`	`29`	`$stopwatch->method('start')->willReturn($stopwatchEvent);`
`30`	`30`
`31`	`31`	`$resolver = new class() implements ArgumentResolverInterface {`
`32`		`- public function getArguments(Request $request, callable $controller)`
	`32`	`+ public function getArguments(Request $request, callable $controller): array`
`33`	`33`	`{`
`34`	`34`	`throw new \Exception();`
`35`	`35`	`}`