Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Phaseolies/Http/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ public function all(): ?array
public function merge(array $input): self
{
$this->request->replace(array_merge($this->request->all(), $input));
$this->input = [];

return $this;
}
Expand Down
1 change: 1 addition & 0 deletions src/Phaseolies/Http/Support/RequestHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ public function nullifyBlanks(
});

$this->request->replace($data);
$this->input = [];

return $this;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Phaseolies/Support/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ protected function matchesDomain(string $domain, $request): bool
$existing = $request->getRouteParams();
$existing[$m[1]] = $hostMatch[1];
$request->setRouteParams($existing);
$request->merge([$m[1] => $hostMatch[1]]);
$request->mergeIfMissing([$m[1] => $hostMatch[1]]);

return true;
}
Expand Down
Loading