Skip to content

Commit

Permalink
fix xml ocs response for serializable objects
Browse files Browse the repository at this point in the history
Signed-off-by: sualko <klaus@jsxc.org>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
  • Loading branch information
sualko authored and backportbot[bot] committed Mar 18, 2024
1 parent 7ef67b8 commit 354387b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/private/AppFramework/OCS/BaseResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ protected function toXML(array $array, \XMLWriter $writer): void {
$writer->startElement($k);
$this->toXML($v, $writer);
$writer->endElement();
} elseif ($v instanceof \JsonSerializable) {
$writer->startElement($k);
$this->toXML($v->jsonSerialize(), $writer);
$writer->endElement();
} else {
$writer->writeElement($k, $v);
}
Expand Down
39 changes: 39 additions & 0 deletions tests/lib/AppFramework/OCS/BaseResponseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@

use OC\AppFramework\OCS\BaseResponse;

class ArrayValue implements \JsonSerializable {
private $array;
public function __construct(array $array) {
$this->array = $array;
}

public function jsonSerialize(): mixed {
return $this->array;
}
}

class BaseResponseTest extends \Test\TestCase {
public function testToXml(): void {
/** @var BaseResponse $response */
Expand Down Expand Up @@ -56,4 +67,32 @@ public function testToXml(): void {
$writer->outputMemory(true)
);
}

public function testToXmlJsonSerializable(): void {
/** @var BaseResponse $response */
$response = $this->createMock(BaseResponse::class);

$writer = new \XMLWriter();
$writer->openMemory();
$writer->setIndent(false);
$writer->startDocument();

$data = [
'hello' => 'hello',
'information' => new ArrayValue([
'@test' => 'some data',
'someElement' => 'withAttribute',
]),
'value without key',
'object' => new \stdClass(),
];

$this->invokePrivate($response, 'toXml', [$data, $writer]);
$writer->endDocument();

$this->assertEquals(
"<?xml version=\"1.0\"?>\n<hello>hello</hello><information test=\"some data\"><someElement>withAttribute</someElement></information><element>value without key</element><object/>\n",
$writer->outputMemory(true)
);
}
}

0 comments on commit 354387b

Please sign in to comment.