Fix merge

Author: nicolas-grekas

Tests/UrlHelperTest.php

@@ -82,19 +82,17 @@ public function testGenerateAbsoluteUrlWithRequestContextAwareInterface($path, $
 
         $requestContext = new RequestContext($baseUrl, 'GET', $host, $scheme, $httpPort, $httpsPort, $path);
         $contextAware = new class($requestContext) implements RequestContextAwareInterface {
-            private $requestContext;
-
-            public function __construct($requestContext)
-            {
-                $this->requestContext = $requestContext;
+            public function __construct(
+                private RequestContext $requestContext,
+            ) {
             }
 
-            public function setContext(RequestContext $context)
+            public function setContext(RequestContext $context): void
             {
                 $this->requestContext = $context;
             }
 
-            public function getContext()
+            public function getContext(): RequestContext
             {
                 return $this->requestContext;
             }