Fixes on merging handler stack already passed from constructor params

Author: sudiptochoudhury

CHANGELOG.md

@@ -89,4 +89,4 @@
 
 ### 0.3.1 - Logger Handler fix
 
-### 0.3.2 - Response and Request handler can now be defined as a class member
+### 0.3.2 - Response and Request handler can now be defined as a class member

composer.json

@@ -15,6 +15,7 @@
     ],
     "require": {
         "php": ">=7.0.0",
+        "ext-json": "*",
         "guzzlehttp/guzzle-services": "^1.1",
         "doctrine/inflector": "^1.3",
         "monolog/monolog": "^2.0"

src/support/forge/api/Client.php

@@ -78,6 +78,15 @@ protected function setOptions($options = [])
         $defaults['description']['jsonPath'] = realpath($this->rootPath . $this->DEFAULT_API_JSON_PATH);
         $mergedOptions = array_replace_recursive($defaults, $options);
         $parsedOptions = $this->parseOptions($mergedOptions, $options);
+
+        $handlers = $this->getStacks($parsedOptions);
+        if (!empty($handlers)) {
+            if (empty($parsedOptions['client'])) {
+                $parsedOptions['client'] = [];
+            }
+            $parsedOptions['client']['handler'] = $handlers;
+        }
+
         $this->options = $parsedOptions;
 
         return $this;
@@ -136,7 +145,7 @@ protected function setDescription($descriptionOptions = [])
                 $description = [];
 
                 if (!empty($jsonPath)) {
-                    $description = json_decode(file_get_contents($jsonPath), true);
+                    $description = \GuzzleHttp\json_decode(file_get_contents($jsonPath), true);
                 }
                 if (empty($description)) {
                     $description = [];
@@ -173,7 +182,6 @@ protected function createClient($clientOptions = [])
      */
     protected function setClient($clientOptions = [])
     {
-
         $this->createClient($clientOptions);
         $this->consumer = new GuzzleClient($this->client, $this->description);
 

src/support/forge/api/Traits/Client/Stackables.php

@@ -19,7 +19,7 @@ trait Stackables
     protected function getStacks($config)
     {
 
-        $stack = HandlerStack::create();
+        $stack = $config['client']['handler'] ?? HandlerStack::create();
 
         if (!empty($config['settings']['requestHandler'])) {
             $request = $this->getRequestStack($config['settings']['requestHandler']);

src/support/forge/api/Traits/Import/Parsers.php

@@ -111,7 +111,7 @@ protected function parseParams($url = [], $bodyRaw = '', $meta = [])
             }
         }
 
-        $rawParams = json_decode($bodyRaw, true);
+        $rawParams = \GuzzleHttp\json_decode($bodyRaw, true);
         if (!empty($rawParams)) {
             foreach ($rawParams as $paramName => $paramItem) {
                 $params[$paramName] = [