Use api-clients/xml for XML en/decoding

Author: WyriHaximus

composer.json

@@ -12,7 +12,7 @@
         "php": "^7.0",
         "api-clients/middleware": "^4.0",
         "api-clients/transport": "^3.1",
-        "openlss/lib-array2xml": "^0.5.1",
+        "api-clients/xml": "dev-master",
         "ringcentral/psr7": "^1.2"
     },
     "require-dev": {

composer.lock

@@ -6,8 +6,8 @@
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PreTrait;
+use ApiClients\Tools\Xml\XmlDecodeService;
 use GuzzleHttp\Psr7\BufferStream;
-use LSS\XML2Array;
 use Psr\Http\Message\ResponseInterface;
 use React\Promise\CancellablePromiseInterface;
 use React\Stream\ReadableStreamInterface;
@@ -18,6 +18,19 @@ class XmlDecodeMiddleware implements MiddlewareInterface
     use PreTrait;
     use ErrorTrait;
 
+    /**
+     * @var XmlDecodeService
+     */
+    private $xmlDecodeService;
+
+    /**
+     * @param XmlDecodeService $xmlDecodeService
+     */
+    public function __construct(XmlDecodeService $xmlDecodeService)
+    {
+        $this->xmlDecodeService = $xmlDecodeService;
+    }
+
     /**
      * @param  ResponseInterface           $response
      * @param  array                       $options
@@ -52,9 +65,8 @@ public function post(
             return resolve($response->withBody($stream));
         }
 
-        $xml = XML2Array::createArray($body);
-        $body = new XmlStream($xml);
-
-        return resolve($response->withBody($body));
+        return $this->xmlDecodeService->decode($body)->then(function (array $xml) use ($response) {
+            return resolve($response->withBody(new XmlStream($xml)));
+        });
     }
 }

src/XmlDecodeMiddleware.php

@@ -7,7 +7,7 @@
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
 use ApiClients\Foundation\Transport\ParsedContentsInterface;
-use LSS\Array2XML;
+use ApiClients\Tools\Xml\XmlEncodeService;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\CancellablePromiseInterface;
 use RingCentral\Psr7\BufferStream;
@@ -18,6 +18,19 @@ class XmlEncodeMiddleware implements MiddlewareInterface
     use PostTrait;
     use ErrorTrait;
 
+    /**
+     * @var XmlEncodeService
+     */
+    private $xmlEncodeService;
+
+    /**
+     * @param XmlEncodeService $xmlEncodeService
+     */
+    public function __construct(XmlEncodeService $xmlEncodeService)
+    {
+        $this->xmlEncodeService = $xmlEncodeService;
+    }
+
     /**
      * @param  RequestInterface            $request
      * @param  array                       $options
@@ -35,11 +48,11 @@ public function pre(
             return resolve($request);
         }
 
-        $key = key($body->getParsedContents());
-        $xml = Array2XML::createXML($key, $body->getParsedContents()[$key])->saveXML();
-        $body = new BufferStream(strlen($xml));
-        $body->write($xml);
+        return $this->xmlEncodeService->encode($body->getParsedContents())->then(function (string $xml) use ($request) {
+            $body = new BufferStream(strlen($xml));
+            $body->write($xml);
 
-        return resolve($request->withBody($body)->withAddedHeader('Content-Type', 'text/xml'));
+            return resolve($request->withBody($body)->withAddedHeader('Content-Type', 'text/xml'));
+        });
     }
 }

src/XmlEncodeMiddleware.php

@@ -6,6 +6,7 @@
 use ApiClients\Middleware\Xml\XmlDecodeMiddleware;
 use ApiClients\Middleware\Xml\XmlStream;
 use ApiClients\Tools\TestUtilities\TestCase;
+use ApiClients\Tools\Xml\XmlDecodeService;
 use React\EventLoop\Factory;
 use RingCentral\Psr7\Response;
 use function Clue\React\Block\await;
@@ -24,7 +25,7 @@ public function provideValidJsonContentTypes()
     public function testPost(string $contentType)
     {
         $loop = Factory::create();
-        $middleware = new XmlDecodeMiddleware();
+        $middleware = new XmlDecodeMiddleware(new XmlDecodeService($loop));
         $response = new Response(200, ['Content-Type' => $contentType], Constant::XML);
 
         $body = await(
@@ -43,7 +44,7 @@ public function testPost(string $contentType)
     public function testPostNoContentType()
     {
         $loop = Factory::create();
-        $middleware = new XmlDecodeMiddleware();
+        $middleware = new XmlDecodeMiddleware(new XmlDecodeService($loop));
         $response = new Response(200, [], '[]');
 
         self::assertSame(
@@ -58,7 +59,7 @@ public function testPostNoContentType()
     public function testPostNoContentTypeCheck()
     {
         $loop = Factory::create();
-        $middleware = new XmlDecodeMiddleware();
+        $middleware = new XmlDecodeMiddleware(new XmlDecodeService($loop));
         $response = new Response(200, [], Constant::XML);
 
         $body = await(
@@ -85,7 +86,7 @@ public function testPostNoContentTypeCheck()
     public function testPostCustomTYpe()
     {
         $loop = Factory::create();
-        $middleware = new XmlDecodeMiddleware();
+        $middleware = new XmlDecodeMiddleware(new XmlDecodeService($loop));
         $response = new Response(200, ['Content-Type' => 'custom/type'], Constant::XML);
 
         $body = await(
@@ -112,7 +113,7 @@ public function testPostCustomTYpe()
     public function testPostNoJson()
     {
         $loop = Factory::create();
-        $middleware = new XmlDecodeMiddleware();
+        $middleware = new XmlDecodeMiddleware(new XmlDecodeService($loop));
         $response = new Response(200, []);
 
         self::assertSame(
@@ -127,7 +128,7 @@ public function testPostNoJson()
     public function testPostEmpty()
     {
         $loop = Factory::create();
-        $middleware = new XmlDecodeMiddleware();
+        $middleware = new XmlDecodeMiddleware(new XmlDecodeService($loop));
         $response = new Response(200, [], '');
 
         self::assertSame(

tests/XmlDecodeMiddlewareTest.php

@@ -5,6 +5,7 @@
 use ApiClients\Middleware\Xml\XmlEncodeMiddleware;
 use ApiClients\Middleware\Xml\XmlStream;
 use ApiClients\Tools\TestUtilities\TestCase;
+use ApiClients\Tools\Xml\XmlEncodeService;
 use React\EventLoop\Factory;
 use RingCentral\Psr7\BufferStream;
 use RingCentral\Psr7\Request;
@@ -15,7 +16,7 @@ class XmlEncodeMiddlewareTest extends TestCase
     public function testPre()
     {
         $loop = Factory::create();
-        $middleware = new XmlEncodeMiddleware();
+        $middleware = new XmlEncodeMiddleware(new XmlEncodeService($loop));
         $stream = new XmlStream(Constant::TREE);
         $request = new Request('GET', 'https://example.com', [], $stream);
 
@@ -31,7 +32,7 @@ public function testPre()
     public function testPreNoXml()
     {
         $loop = Factory::create();
-        $middleware = new XmlEncodeMiddleware();
+        $middleware = new XmlEncodeMiddleware(new XmlEncodeService($loop));
         $stream = new BufferStream(2);
         $stream->write('yo');
         $request = new Request('GET', 'https://example.com', [], $stream);