Skip to content

Commit 4c3a002

Browse files
committed
Swapped out XML <-> Array depdencies
1 parent 03aeb5a commit 4c3a002

File tree

5 files changed

+78
-93
lines changed

5 files changed

+78
-93
lines changed

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
"php": "^7.0",
1313
"api-clients/middleware": "^4.0",
1414
"api-clients/transport": "^3.1",
15-
"fillup/array2xml": "^0.5.1",
16-
"ringcentral/psr7": "^1.2",
17-
"verdant/xml2array": "dev-master#b518d755a305fb4249027d20f8e9042bb733b857"
15+
"openlss/lib-array2xml": "^0.5.1",
16+
"ringcentral/psr7": "^1.2"
1817
},
1918
"require-dev": {
2019
"api-clients/test-utilities": "^4.1"

composer.lock

Lines changed: 71 additions & 86 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/XmlDecodeMiddleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
use ApiClients\Foundation\Middleware\MiddlewareInterface;
88
use ApiClients\Foundation\Middleware\PreTrait;
99
use GuzzleHttp\Psr7\BufferStream;
10+
use LSS\XML2Array;
1011
use Psr\Http\Message\ResponseInterface;
1112
use React\Promise\CancellablePromiseInterface;
1213
use React\Stream\ReadableStreamInterface;
13-
use Verdant\XML2Array;
1414
use function React\Promise\resolve;
1515

1616
class XmlDecodeMiddleware implements MiddlewareInterface

src/XmlEncodeMiddleware.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use ApiClients\Foundation\Middleware\MiddlewareInterface;
88
use ApiClients\Foundation\Middleware\PostTrait;
99
use ApiClients\Foundation\Transport\ParsedContentsInterface;
10-
use fillup\A2X;
10+
use LSS\Array2XML;
1111
use Psr\Http\Message\RequestInterface;
1212
use React\Promise\CancellablePromiseInterface;
1313
use RingCentral\Psr7\BufferStream;
@@ -35,7 +35,8 @@ public function pre(
3535
return resolve($request);
3636
}
3737

38-
$xml = (new A2X($body->getParsedContents()))->asXml();
38+
$key = key($body->getParsedContents());
39+
$xml = Array2XML::createXML($key, $body->getParsedContents()[$key])->saveXML();
3940
$body = new BufferStream(strlen($xml));
4041
$body->write($xml);
4142

tests/XmlEncodeMiddlewareTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function testPre()
2222
$modifiedRequest = await($middleware->pre($request, 'abc'), $loop);
2323
self::assertSame(
2424
Constant::XML,
25-
(string) $modifiedRequest->getBody()
25+
str_replace(["\r", "\n", ' '], '', (string) $modifiedRequest->getBody())
2626
);
2727
self::assertTrue($modifiedRequest->hasHeader('Content-Type'));
2828
self::assertSame('text/xml', $modifiedRequest->getHeaderLine('Content-Type'));

0 commit comments

Comments
 (0)