1515use Psr \Http \Message \ServerRequestInterface ;
1616use Psr \Http \Message \StreamInterface ;
1717use Psr \Http \Message \UploadedFileInterface ;
18- use Psr \Http \Message \UriInterface ;
1918use Symfony \Bridge \PsrHttpMessage \HttpFoundationFactoryInterface ;
2019use Symfony \Component \HttpFoundation \Cookie ;
2120use 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