Version 1.1.1 (#4)

* Use tap

* Laravel 7 & guzzle 7

* Immutable client (#1)

* Replace/mutate client

* Bug fixes and test

* Update changelog

* Defer service provider

* Revert "Defer service provider"

This reverts commit 8bce8a6.

* Fix version

* Merges config recursively (#3)

* Temporary fix for merging config

* Merge recursive distinct

* Correct json driver merging

* Rename helper method to avoid conflict

* Update changelog

* Update changelog

* Update changelog

Author: jenky

CHANGELOG.md

@@ -16,15 +16,23 @@ 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
+## [1.1.1](https://github.com/jenky/hermes/compare/1.1.0...1.1.1) - 2020-02-25
+
+### Fixed
+- Fixed merges config recursively
+
+### Changed
+- `ResponseHandler` interceptor constructor now accepts class name instead of `ResponseHandlerInterface` instance
+
+## [1.1.0](https://github.com/jenky/hermes/compare/1.0.2...1.1.0) - 2020-02-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
+## [1.0.2](https://github.com/jenky/hermes/compare/1.0.1...1.0.2) - 2020-02-13
 
 ### Fixed
 - Some bugs

src/GuzzleManager.php

@@ -112,7 +112,7 @@ protected function configurationFor($name)
      */
     protected function resolve($name, array $options = [])
     {
-        $config = array_merge_recursive(
+        $config = array_merge_recursive_unique(
             $this->configurationFor($name), $options
         );
 
@@ -199,14 +199,14 @@ protected function createGuzzleDriver(array $config)
     protected function createJsonDriver(array $config)
     {
         return new Client($this->makeClientOptions(
-            array_merge_recursive($config, [
+            array_merge_recursive_unique([
                 'options' => [
                     'response_handler' => JsonResponse::class,
                 ],
                 'interceptors' => [
                     Interceptors\ResponseHandler::class,
                 ],
-            ])
+            ], $config)
         ));
     }
 

src/Interceptors/ResponseHandler.php

@@ -12,17 +12,17 @@ class ResponseHandler
     /**
      * The default response handler class name.
      *
-     * @var \Jenky\Hermes\Contracts\ResponseHandler
+     * @var string
      */
     protected $response;
 
     /**
      * Create a new handler instance.
      *
-     * @param  \Jenky\Hermes\Contracts\ResponseHandler|null $response
+     * @param  string|null $response
      * @return void
      */
-    public function __construct(ResponseHandlerInterface $response = null)
+    public function __construct($response = null)
     {
         $this->response = $response;
     }
@@ -51,21 +51,21 @@ public function __invoke(callable $handler)
      */
     protected function createResponseHandler(ResponseInterface $response, array $options): ResponseInterface
     {
-        $handler = $this->getResponseHandler($options) ?: $this->response;
+        $handler = $this->getResponseHandler(
+            $options['response_handler'] ?? $this->response
+        );
 
         return $handler ? $handler::create($response) : $response;
     }
 
     /**
      * Get the response handler class name.
      *
-     * @param  array $options
+     * @param  string $handler
      * @return string|null
      */
-    protected function getResponseHandler(array $options)
+    protected function getResponseHandler($handler)
     {
-        $handler = $options['response_handler'] ?? null;
-
         if ($handler && ! is_a($handler, ResponseHandlerInterface::class, true)) {
             throw new InvalidArgumentException(
                 $handler.' must be an instance of '.ResponseHandlerInterface::class

src/helpers.php

@@ -15,3 +15,44 @@ function guzzle($channel = null, array $options = [])
         return $channel ? app(Hermes::class)->channel($channel, $options) : app(Hermes::class);
     }
 }
+
+if (! function_exists('array_merge_recursive_unique')) {
+    /**
+     * Merges any number of arrays / parameters recursively, using the left array as base, giving priority to the right array. Replacing entries with string keys with values from latter arrays.
+     *
+     * @return array
+     */
+    function array_merge_recursive_unique()
+    {
+        $arrays = func_get_args();
+
+        if (count($arrays) < 2) {
+            if ($arrays === []) {
+                return [];
+            } else {
+                return $arrays[0];
+            }
+        }
+
+        $merged = array_shift($arrays);
+
+        foreach ($arrays as $array) {
+            foreach ($array as $key => $value) {
+                if (is_array($value) && (isset($merged[$key]) && is_array($merged[$key]))) {
+                    $merged[$key] = array_merge_recursive_unique($merged[$key], $value);
+                } else {
+                    if (is_numeric($key)) {
+                        if (! in_array($value, $merged)) {
+                            $merged[] = $value;
+                        }
+                    } else {
+                        $merged[$key] = $value;
+                    }
+                }
+            }
+            unset($key, $value);
+        }
+
+        return $merged;
+    }
+}

tests/FeatureTest.php

@@ -8,9 +8,9 @@
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Jenky\Hermes\Contracts\Hermes;
-use Jenky\Hermes\Contracts\HttpResponseHandler;
 use Jenky\Hermes\Events\RequestHandled;
 use Jenky\Hermes\Interceptors\ResponseHandler;
+use Jenky\Hermes\JsonResponse;
 use Jenky\Hermes\Response;
 use Psr\Http\Message\RequestInterface;
 use SimpleXMLElement;
@@ -28,7 +28,7 @@ protected function setUp(): void
 
         $this->app[Hermes::class]->extend('rss', function ($app, array $config) {
             return new Client($this->makeClientOptions(
-                array_merge_recursive($config, [
+                array_merge_recursive_unique($config, [
                     'options' => [
                         'response_handler' => XmlResponse::class,
                     ],
@@ -58,6 +58,14 @@ protected function getEnvironmentSetUp($app)
             ],
         ]);
 
+        $app['config']->set('hermes.channels.reqres', [
+            'driver' => 'json',
+            'options' => [
+                'base_uri' => 'https://reqres.in',
+                'response_handler' => ReqresResponse::class,
+            ],
+        ]);
+
         $app['config']->set('hermes.channels.googlenews', [
             'driver' => 'rss',
             'options' => [
@@ -120,6 +128,14 @@ public function test_driver()
         $this->assertInstanceOf(SimpleXMLElement::class, $response->toXml());
     }
 
+    public function test_json_driver()
+    {
+        $response = guzzle('reqres')->get('api/users');
+
+        $this->assertInstanceOf(ReqresResponse::class, $response);
+        $this->assertTrue($response->isSuccessful());
+    }
+
     public function test_custom_driver()
     {
         $response = guzzle('custom')->get('https://example.com');
@@ -142,19 +158,39 @@ public function test_mutable_client()
         $this->assertEquals(401, $response->getStatusCode());
 
         // Mutate the client by creating new client instance
+        $apiKey = (string) Str::uuid();
+
         $this->httpClient([
             'options' => [
                 'headers' => [
                     'Authorization' => 'Bearer '.$token = Str::random(),
                 ],
             ],
+            'interceptors' => [
+                function (callable $handler) use ($apiKey) {
+                    return function (RequestInterface $request, array $options) use ($handler, $apiKey) {
+                        $request = $request->withHeader('X-Api-Key', $apiKey);
+
+                        return $handler($request, $options);
+                    };
+                },
+                Middleware::mapRequest(function (RequestInterface $request) {
+                    return $request->withHeader('Foo', 'Bar');
+                }),
+            ],
         ]);
 
         $response = $this->httpClient()->get('bearer');
 
         $this->assertTrue($response->isSuccessful());
         $this->assertTrue($response->authenticated);
         $this->assertEquals($token, $response->token);
+
+        $response = $this->httpClient()->get('anything');
+
+        $this->assertTrue($response->isSuccessful());
+        $this->assertEquals($response->get('headers.X-Api-Key'), $apiKey);
+        $this->assertEquals($response->get('headers.Foo'), 'Bar');
     }
 
     public function test_default_channel()
@@ -191,10 +227,18 @@ class InvalidResponseHandler
 {
 }
 
-class XmlResponse extends Response implements HttpResponseHandler
+class XmlResponse extends Response
 {
     public function toXml()
     {
         return new SimpleXMLElement((string) $this->getBody());
     }
 }
+
+class ReqresResponse extends JsonResponse
+{
+    public function isSuccessful(): bool
+    {
+        return parent::isSuccessful() && ! empty($this->get('data'));
+    }
+}