Skip to content

Commit ad32489

Browse files
committed
formatting
1 parent 5828d6c commit ad32489

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,10 @@
164164
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
165165
},
166166
"config": {
167-
"sort-packages": true
167+
"sort-packages": true,
168+
"allow-plugins": {
169+
"composer/package-versions-deprecated": true
170+
}
168171
},
169172
"minimum-stability": "dev",
170173
"prefer-stable": true

src/Illuminate/Http/Client/PendingRequest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,10 @@ public function pool(callable $callback)
661661
*/
662662
public function send(string $method, string $url, array $options = [])
663663
{
664-
$options = $this->parseHttpOptions($options);
665-
666664
$url = ltrim(rtrim($this->baseUrl, '/').'/'.ltrim($url, '/'), '/');
667665

666+
$options = $this->parseHttpOptions($options);
667+
668668
[$this->pendingBody, $this->pendingFiles] = [null, []];
669669

670670
if ($this->async) {
@@ -691,10 +691,10 @@ public function send(string $method, string $url, array $options = [])
691691
}
692692

693693
/**
694-
* Parse the HTTP options.
694+
* Parse the given HTTP options and set the appropriate additional options.
695695
*
696696
* @param array $options
697-
* @return array|array[]
697+
* @return array
698698
*/
699699
protected function parseHttpOptions(array $options)
700700
{

0 commit comments

Comments
 (0)