Skip to content

Commit 3ba5990

Browse files
dbunicolas-grekas
authored andcommitted
more robust initialization from request
Request::getPort is declared as int|string but can actually return null.
1 parent afc10b9 commit 3ba5990

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

RequestContext.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public function fromRequest(Request $request)
6767
$this->setMethod($request->getMethod());
6868
$this->setHost($request->getHost());
6969
$this->setScheme($request->getScheme());
70-
$this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
71-
$this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
70+
$this->setHttpPort($request->isSecure() || null === $request->getPort() ? $this->httpPort : $request->getPort());
71+
$this->setHttpsPort($request->isSecure() && null !== $request->getPort() ? $request->getPort() : $this->httpsPort);
7272
$this->setQueryString($request->server->get('QUERY_STRING', ''));
7373

7474
return $this;

0 commit comments

Comments
 (0)