Skip to content

Commit 7a9635d

Browse files
committed
Merge branch 'master' into 3.0-merge
# Conflicts: # src/amqp/src/AMQPConnection.php # src/crontab/src/Strategy/Executor.php
2 parents c209cdf + b279d33 commit 7a9635d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/Client.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,14 @@ protected function init(string $method, string $path, array $options = []): Serv
196196
$headers = $options['headers'] ?? [];
197197
$multipart = $options['multipart'] ?? [];
198198

199+
$parsePath = parse_url($path);
200+
$path = $parsePath['path'];
201+
$uriPathQuery = $parsePath['query'] ?? [];
202+
if (! empty($uriPathQuery)) {
203+
parse_str($uriPathQuery, $pathQuery);
204+
$query = array_merge($pathQuery, $query);
205+
}
206+
199207
$data = $params;
200208

201209
// Initialize PSR-7 Request and Response objects.

0 commit comments

Comments
 (0)