diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpFoundation] small fixes in Request

Browse Source
This commit is contained in:
Tobias Schultze 2012-07-04 04:13:21 +02:00
parent 3ee1b383af
commit d37003ec56
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -232,7 +232,7 @@ class Request
* *
* @param string $uri The URI * @param string $uri The URI
* @param string $method The HTTP method * @param string $method The HTTP method
* @param array $parameters The request (GET) or query (POST) parameters * @param array $parameters The query (GET) or request (POST) parameters
* @param array $cookies The request cookies ($_COOKIE) * @param array $cookies The request cookies ($_COOKIE)
* @param array $files The request files ($_FILES) * @param array $files The request files ($_FILES)
* @param array $server The server parameters ($_SERVER) * @param array $server The server parameters ($_SERVER)
@ -305,15 +305,12 @@ class Request
} }
if (isset($components['query'])) { if (isset($components['query'])) {
$queryString = html_entity_decode($components['query']); parse_str(html_entity_decode($components['query']), $qs);
parse_str($queryString, $qs); $query = array_replace($qs, $query);
if (is_array($qs)) {
$query = array_replace($qs, $query);
}
} }
$queryString = http_build_query($query); $queryString = http_build_query($query, '', '&');
$uri = $components['path'].($queryString ? '?'.$queryString : ''); $uri = $components['path'].('' !== $queryString ? '?'.$queryString : '');
$server = array_replace($defaults, $server, array( $server = array_replace($defaults, $server, array(
'REQUEST_METHOD' => strtoupper($method), 'REQUEST_METHOD' => strtoupper($method),
@ -791,7 +788,7 @@ class Request
/** /**
* Gets the scheme and HTTP host. * Gets the scheme and HTTP host.
* *
* @return string The schem and HTTP host * @return string The scheme and HTTP host
*/ */
public function getSchemeAndHttpHost() public function getSchemeAndHttpHost()
{ {
@ -949,7 +946,7 @@ class Request
* *
* @param string $mimeType The associated mime type * @param string $mimeType The associated mime type
* *
* @return string The format (null if not found) * @return string|null The format (null if not found)
* *
* @api * @api
*/ */
@ -1028,7 +1025,7 @@ class Request
/** /**
* Gets the format associated with the request. * Gets the format associated with the request.
* *
* @return string The format (null if no content type is present) * @return string|null The format (null if no content type is present)
* *
* @api * @api
*/ */