diff --git a/src/Http/ServerRequestFactory.php b/src/Http/ServerRequestFactory.php index d187e386221..9543d5f7861 100644 --- a/src/Http/ServerRequestFactory.php +++ b/src/Http/ServerRequestFactory.php @@ -65,6 +65,7 @@ public static function createUri(array $server = []) $server += $_SERVER; $server = static::normalizeServer($server); $headers = static::marshalHeaders($server); + return static::marshalUriFromServer($server, $headers); } @@ -96,6 +97,7 @@ public static function marshalUriFromServer(array $server, array $headers) // some method calls. $uri->base = $base; $uri->webroot = $webroot; + return $uri; } @@ -125,6 +127,7 @@ protected static function updatePath($base, $uri) ) { $path = '/'; } + return $uri->withPath($path); } diff --git a/src/Network/Request.php b/src/Network/Request.php index 0a6e1db8cd9..e0ede25bdd1 100644 --- a/src/Network/Request.php +++ b/src/Network/Request.php @@ -381,8 +381,8 @@ protected function _processPost($data) /** * Process the GET parameters and move things into the object. * - * @param string $queryString A query string from the URL if provided * @param array $query The array to which the parsed keys/values are being added. + * @param string $queryString A query string from the URL if provided * @return array An array containing the parsed querystring keys/values. */ protected function _processGet($query, $queryString = '')