Skip to content

Merge OData query params at boot time instead of via middleware #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
isama92 wants to merge 1 commit into from
Closed

Merge OData query params at boot time instead of via middleware #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions src/Concerns/HasODataQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace SimpleSquid\SaloonOData\Concerns;

use Saloon\Enums\PipeOrder;
use Saloon\Http\PendingRequest;
use SimpleSquid\SaloonOData\Enums\ODataVersion;
use SimpleSquid\SaloonOData\ODataQueryBuilder;
Expand All @@ -23,8 +22,9 @@
* applied consistently to all chained calls. (Pre-encoded `filterRaw()`
* fragments are version-baked by the caller.)
*
* Registers a request middleware that merges the builder's rendered params
* into the PendingRequest's query bag immediately before send.
* The rendered query params are merged directly into the PendingRequest's
* query bag at boot time, ensuring they are available before Saloon's
* mock-resolution middleware runs.
*/
trait HasODataQuery
{
Expand Down Expand Up @@ -77,12 +77,6 @@ public function bootHasODataQuery(PendingRequest $pendingRequest): void
}
}

$pendingRequest->middleware()->onRequest(
static function (PendingRequest $request) use ($builder): void {
$request->query()->merge($builder->toArray());
},
'odata-merge-query',
PipeOrder::LAST,
);
$pendingRequest->query()->merge($builder->toArray());
}
}