Skip to content

Commit d8ad0b0

Browse files
authored
Merge pull request #1 from fdreamsu/master
Fix getRequestTarget() to make it support queryParams
2 parents c6a789f + 64627fd commit d8ad0b0

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Diff for: src/Request.php

+8-9
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,14 @@ public function getRequestTarget(): string
3939
if ($this->requestTarget !== null) {
4040
return $this->requestTarget;
4141
}
42-
43-
$target = $this->uri->getPath();
44-
if ($target == '') {
45-
$target = '/';
46-
}
47-
if ($this->uri->getQuery() != '') {
48-
$target .= '?' . $this->uri->getQuery();
49-
}
50-
42+
43+
parse_str($this->uri->getQuery(), $query);
44+
$query = $this->getQueryParams() + $query; //attribute value first
45+
$query = http_build_query($query);
46+
47+
$target = $this->uri->getPath() ?: '/';
48+
$target = empty($query) ? $target : $target . '?' . $query;
49+
5150
return $target;
5251
}
5352

0 commit comments

Comments
 (0)