Commit66095a5

committed

Fix populating server params from URI in HttpFoundationFactory

1 parentcffb3a8 commit66095a5Copy full SHA for 66095a5

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,18 @@ public function createRequest(ServerRequestInterface $psrRequest, bool $streamed`
`53`	`53`	`$server['REQUEST_URI'] =$uri->getPath();`
`54`	`54`	`$server['QUERY_STRING'] =$uri->getQuery();`
`55`	`55`
	`56`	`+if ('' !==$server['QUERY_STRING']) {`
	`57`	`+$server['REQUEST_URI'] .='?'.$server['QUERY_STRING'];`
	`58`	`+ }`
	`59`	`+`
`56`	`60`	`if ('https' ===$uri->getScheme()) {`
`57`	`61`	`$server['HTTPS'] ='on';`
`58`	`62`	`}`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`$server['REQUEST_METHOD'] =$psrRequest->getMethod();`
`62`	`66`
`63`		`-$server =array_replace($server,$psrRequest->getServerParams());`
	`67`	`+$server =array_replace($psrRequest->getServerParams(),$server);`
`64`	`68`
`65`	`69`	`$parsedBody =$psrRequest->getParsedBody();`
`66`	`70`	`$parsedBody =\is_array($parsedBody) ?$parsedBody : [];`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,8 @@ public function requestProvider()`
`133`	`133`	`'SERVER_NAME' =>'dunglas.fr',`
`134`	`134`	`'SERVER_PORT' =>null,`
`135`	`135`	`'HTTP_X_SYMFONY' =>'2.8',`
`136`		`-'REQUEST_URI' =>'/testCreateRequest?bar[baz]=42&foo=1',`
`137`		`-'QUERY_STRING' =>'foo=1&bar[baz]=42',`
	`136`	`+'REQUEST_URI' =>'/testCreateRequest?foo=1&bar%5Bbaz%5D=42',`
	`137`	`+'QUERY_STRING' =>'foo=1&bar%5Bbaz%5D=42',`
`138`	`138`	`],`
`139`	`139`	`'Content'`
`140`	`140`	`);`

Comments

(0)