Merge branch '5.4' into 6.3

xabbuh · xabbuh · commit 4cd192354a41 · 2024-01-23T16:48:51.000+01:00
* 5.4:
  fix method signatures
diff --git a/Controller/RouterController.php b/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;

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class RouterController`
`40`	`40`	`*/`
`41`	`41`	`private $expressionLanguageProviders = [];`
`42`	`42`
`43`		`- public function __construct(?Profiler $profiler = null, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = [])`
	`43`	`+ public function __construct(?Profiler $profiler, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = [])`
`44`	`44`	`{`
`45`	`45`	`$this->profiler = $profiler;`
`46`	`46`	`$this->twig = $twig;`