Develop (#2)

* Use tap

* Laravel 7 & guzzle 7

* Immutable client (#1)

* Replace/mutate client

* Bug fixes and test

* Update changelog

Author: jenky

CHANGELOG.md

@@ -16,6 +16,14 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ### Fixed -->
 
+## [1.0.2](https://github.com/jenky/hermes/compare/1.0.2...1.1.0) - 2020-03-17
+
+### Added
+- Prepare for Laravel 7 and Guzzle 7
+
+### Changed
+- Mutable client by passing `$options` argument
+
 ## [1.0.2](https://github.com/jenky/hermes/compare/1.0.1...1.0.2) - 2020-03-13
 
 ### Fixed

composer.json

@@ -23,9 +23,9 @@
     ],
     "require": {
         "php" : "^7.1.3",
-        "illuminate/container": "^5.7|^6.0",
-        "illuminate/config": "^5.7|^6.0",
-        "guzzlehttp/guzzle": "^6.3"
+        "illuminate/container": "^5.7|^6.0|^7.0",
+        "illuminate/config": "^5.7|^6.0|^7.0",
+        "guzzlehttp/guzzle": "^6.3|^7.0"
     },
     "require-dev": {
         "orchestra/testbench": "^3.5|^4.0",

src/GuzzleManager.php

@@ -80,7 +80,13 @@ public function channel($channel = null, array $options = [])
      */
     protected function client($name, array $options = [])
     {
-        return $this->channels[$name] ?? with($this->resolve($name, $options), function ($client) use ($name) {
+        // Remove the cached channel and create new client
+        // to mutate the config
+        if (! empty($options) && ! empty($this->channels[$name])) {
+            unset($this->channels[$name]);
+        }
+
+        return $this->channels[$name] ?? tap($this->resolve($name, $options), function ($client) use ($name) {
             return $this->channels[$name] = $client;
         });
     }
@@ -106,7 +112,7 @@ protected function configurationFor($name)
      */
     protected function resolve($name, array $options = [])
     {
-        $config = array_merge(
+        $config = array_merge_recursive(
             $this->configurationFor($name), $options
         );
 

tests/FeatureTest.php

@@ -6,6 +6,7 @@
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Str;
 use Jenky\Hermes\Contracts\Hermes;
 use Jenky\Hermes\Contracts\HttpResponseHandler;
 use Jenky\Hermes\Events\RequestHandled;
@@ -133,6 +134,29 @@ public function test_driver_not_supported()
         guzzle('foo')->get('https://example.com');
     }
 
+    public function test_mutable_client()
+    {
+        $response = $this->httpClient()->get('bearer');
+
+        $this->assertTrue($response->isClientError());
+        $this->assertEquals(401, $response->getStatusCode());
+
+        // Mutate the client by creating new client instance
+        $this->httpClient([
+            'options' => [
+                'headers' => [
+                    'Authorization' => 'Bearer '.$token = Str::random(),
+                ],
+            ],
+        ]);
+
+        $response = $this->httpClient()->get('bearer');
+
+        $this->assertTrue($response->isSuccessful());
+        $this->assertTrue($response->authenticated);
+        $this->assertEquals($token, $response->token);
+    }
+
     public function test_default_channel()
     {
         guzzle()->setDefaultChannel('jsonplaceholder');