Skip to content

Commit 8e7e208

Browse files
committed
Remove redundant check
1 parent 4a48cfe commit 8e7e208

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

src/Symfony/Bridge/PsrHttpMessage/Factory/HttpFoundationFactory.php

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Psr\Http\Message\ServerRequestInterface;
1616
use Psr\Http\Message\StreamInterface;
1717
use Psr\Http\Message\UploadedFileInterface;
18-
use Psr\Http\Message\UriInterface;
1918
use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
2019
use Symfony\Component\HttpFoundation\Cookie;
2120
use Symfony\Component\HttpFoundation\Request;
@@ -40,19 +39,17 @@ public function createRequest(ServerRequestInterface $psrRequest, bool $streamed
4039
$server = [];
4140
$uri = $psrRequest->getUri();
4241

43-
if ($uri instanceof UriInterface) {
44-
$server['SERVER_NAME'] = $uri->getHost();
45-
$server['SERVER_PORT'] = $uri->getPort() ?: ('https' === $uri->getScheme() ? 443 : 80);
46-
$server['REQUEST_URI'] = $uri->getPath();
47-
$server['QUERY_STRING'] = $uri->getQuery();
42+
$server['SERVER_NAME'] = $uri->getHost();
43+
$server['SERVER_PORT'] = $uri->getPort() ?: ('https' === $uri->getScheme() ? 443 : 80);
44+
$server['REQUEST_URI'] = $uri->getPath();
45+
$server['QUERY_STRING'] = $uri->getQuery();
4846

49-
if ('' !== $server['QUERY_STRING']) {
50-
$server['REQUEST_URI'] .= '?'.$server['QUERY_STRING'];
51-
}
47+
if ('' !== $server['QUERY_STRING']) {
48+
$server['REQUEST_URI'] .= '?'.$server['QUERY_STRING'];
49+
}
5250

53-
if ('https' === $uri->getScheme()) {
54-
$server['HTTPS'] = 'on';
55-
}
51+
if ('https' === $uri->getScheme()) {
52+
$server['HTTPS'] = 'on';
5653
}
5754

5855
$server['REQUEST_METHOD'] = $psrRequest->getMethod();

0 commit comments

Comments
 (0)