Merge remote-tracking branch 'upstream/v2' into global-middleware-fix

src/HttpSender.php

@@ -155,7 +155,10 @@ protected function createRequestOptions(PendingRequest $pendingRequest, RequestI
         // deal with PSR requests. We'll add the headers from the PSR
         // request to ensure the lowest-level values possible.
 
-        $config->add(RequestOptions::HEADERS, $psrRequest->getHeaders());
+        $config->add(RequestOptions::HEADERS, array_merge(
+            $psrRequest->getHeaders(),
+            $config->get(RequestOptions::HEADERS, [])
+        ));
 
         return $config->all();
     }

tests/Feature/ConfigTest.php

@@ -51,3 +51,29 @@
 
     $connector->send($request);
 });
+
+test('you can pass additional headers that will be merged with the default headers from the psr request', function () {
+    $connector = new HttpSenderConnector();
+
+    $connector->config()->add('debug', true);
+
+    $connector->sender()->addMiddleware(function (callable $handler) use ($connector) {
+        return function (RequestInterface $guzzleRequest, array $options) use ($connector) {
+            expect($guzzleRequest->getHeaders())->toBe([
+                'Host' => ['tests.saloon.dev'],
+                'Accept' => ['application/json'],
+                'User-Agent' => ['Saloon'],
+            ]);
+
+            $factoryCollection = $connector->sender()->getFactoryCollection();
+
+            return new FulfilledPromise(MockResponse::make()->createPsrResponse($factoryCollection->responseFactory, $factoryCollection->streamFactory));
+        };
+    });
+
+    $request = new UserRequest;
+
+    $request->config()->add('headers', ['User-Agent' => 'Saloon']);
+
+    $connector->send($request);
+});