hotfix

Author: kierwils

spec/HttpClientSpec.php

@@ -27,7 +27,7 @@ public function it_should_send_requests()
 
         $this->beConstructedWith($psr17Factory, $psr17Factory);
 
-        $request = $psr17Factory->createRequest('GET', $url);
+        $request = $psr17Factory->createRequest('GET', $url.'/');
         $response = $this->sendRequest($request);
         $response->getStatusCode()->shouldReturn(200);
 
@@ -37,7 +37,7 @@ public function it_should_send_requests()
         $request = $psr17Factory->createRequest('GET', $url.'/get/404');
         $this->shouldThrow(Exceptions\ClientError::class)->duringSendRequest($request);
 
-        $request = $psr17Factory->createRequest('GET', 'http://localhost:3001');
+        $request = $psr17Factory->createRequest('GET', 'http://localhost:3001/');
         $this->shouldThrow(Exceptions\TransportError::class)->duringSendRequest($request);
 
         $request = $psr17Factory->createRequest('HEAD', $url);

src/HttpClient.php

@@ -112,7 +112,7 @@ protected function buildOptions(RequestInterface $request): array
             };
         }
 
-        return array_merge($options, $this->options);
+        return $this->options + $options;
     }
 
     protected function parseHeaders(ResponseInterface $response, StreamInterface $headers): ResponseInterface