Semi working XML middleware

Author: WyriHaximus

composer.json

@@ -11,7 +11,9 @@
     "require": {
         "php": "^7.0",
         "api-clients/middleware": "^4.0",
-        "ringcentral/psr7": "^1.2"
+        "fillup/array2xml": "^0.5.1",
+        "ringcentral/psr7": "^1.2",
+        "verdant/xml2array": "dev-master#b518d755a305fb4249027d20f8e9042bb733b857"
     },
     "require-dev": {
         "api-clients/test-utilities": "^4.1"

composer.lock

@@ -6,11 +6,11 @@
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PreTrait;
-use ApiClients\Tools\Json\JsonDecodeService;
 use GuzzleHttp\Psr7\BufferStream;
 use Psr\Http\Message\ResponseInterface;
 use React\Promise\CancellablePromiseInterface;
 use React\Stream\ReadableStreamInterface;
+use Verdant\XML2Array;
 use function React\Promise\resolve;
 
 class XmlDecodeMiddleware implements MiddlewareInterface
@@ -35,12 +35,12 @@ public function post(
         }
 
         if (!isset($options[self::class]) &&
-            strpos($response->getHeaderLine('Content-Type'), 'application/json') !== 0) {
+        strpos($response->getHeaderLine('Content-Type'), 'text/xml') !== 0) {
             return resolve($response);
         }
 
         if (isset($options[self::class][Options::CONTENT_TYPE]) &&
-            $response->getHeaderLine('Content-Type') !== $options[self::class][Options::CONTENT_TYPE]) {
+        $response->getHeaderLine('Content-Type') !== $options[self::class][Options::CONTENT_TYPE]) {
             return resolve($response);
         }
 
@@ -51,9 +51,8 @@ public function post(
             return resolve($response->withBody($stream));
         }
 
-        return $this->decodeService->decode($body)->then(function ($json) use ($response) {
-            $body = new XmlStream($json);
-            return resolve($response->withBody($body));
-        });
+        $xml = XML2Array::createArray($body);
+        $body = new XmlStream($xml);
+        return resolve($response->withBody($body));
     }
 }

src/XmlDecodeMiddleware.php

@@ -6,7 +6,7 @@
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
-use ApiClients\Tools\Json\JsonEncodeService;
+use fillup\A2X;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\CancellablePromiseInterface;
 use RingCentral\Psr7\BufferStream;
@@ -29,14 +29,13 @@ public function pre(
         string $transactionId,
         array $options = []
     ): CancellablePromiseInterface {
-        if (!($request->getBody() instanceof JsonStream)) {
+        if (!($request->getBody() instanceof XmlStream)) {
             return resolve($request);
         }
 
-        return $this->encodeService->encode($request->getBody()->getJson())->then(function ($json) use ($request) {
-            $body = new BufferStream(strlen($json));
-            $body->write($json);
-            return resolve($request->withBody($body)->withAddedHeader('Content-Type', 'application/json'));
-        });
+        $xml = (new A2X($request->getBody()->getXml()))->asXml();
+        $body = new BufferStream(strlen($xml));
+        $body->write($xml);
+        return resolve($request->withBody($body)->withAddedHeader('Content-Type', 'text/xml'));
     }
 }