Apply suggestions from code review

alexander-schranz · nicolas-grekas · web-flow · commit 9117f2ffbea8 · 2025-08-20T07:47:30.000+02:00
Co-authored-by: Nicolas Grekas &lt;nicolas.grekas@gmail.com&gt;
diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php
@@ -43,10 +43,7 @@ public function __construct(string $baseUrl = '', string $method = 'GET', string
         $this->setHttpsPort($httpsPort);
         $this->setPathInfo($path);
         $this->setQueryString($queryString);
-
-        if ($parameters) {
-            $this->parameters = $parameters;
-        }
+        $this->parameters = $parameters ?? $this->parameters;
     }
 
     public static function fromUri(string $uri, string $host = 'localhost', string $scheme = 'http', int $httpPort = 80, int $httpsPort = 443): self
diff --git a/src/Symfony/Component/Routing/Tests/RequestContextTest.php b/src/Symfony/Component/Routing/Tests/RequestContextTest.php
@@ -41,7 +41,7 @@ public function testConstruct()
         $this->assertSame(444, $requestContext->getHttpsPort());
         $this->assertEquals('/baz', $requestContext->getPathInfo());
         $this->assertEquals('bar=foobar', $requestContext->getQueryString());
-        $this->assertEquals(['foo' => 'bar'], $requestContext->getParameters());
+        $this->assertSame(['foo' => 'bar'], $requestContext->getParameters());
     }
 
     public function testConstructParametersBcLayer()
@@ -54,7 +54,7 @@ public function __construct()
             }
         };
 
-        $this->assertEquals(['foo' => 'bar'], $requestContext->getParameters());
+        $this->assertSame(['foo' => 'bar'], $requestContext->getParameters());
     }
 
     public function testFromUriWithBaseUrl()

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testConstruct()`
`41`	`41`	`$this->assertSame(444, $requestContext->getHttpsPort());`
`42`	`42`	`$this->assertEquals('/baz', $requestContext->getPathInfo());`
`43`	`43`	`$this->assertEquals('bar=foobar', $requestContext->getQueryString());`
`44`		`- $this->assertEquals(['foo' => 'bar'], $requestContext->getParameters());`
	`44`	`+ $this->assertSame(['foo' => 'bar'], $requestContext->getParameters());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function testConstructParametersBcLayer()`
`@@ -54,7 +54,7 @@ public function __construct()`
`54`	`54`	`}`
`55`	`55`	`};`
`56`	`56`
`57`		`- $this->assertEquals(['foo' => 'bar'], $requestContext->getParameters());`
	`57`	`+ $this->assertSame(['foo' => 'bar'], $requestContext->getParameters());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public function testFromUriWithBaseUrl()`