upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix xml ocs response for serializable objects

Browse source 
Signed-off-by: sualko <klaus@jsxc.org>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
This commit is contained in:
Klaus 2021-12-27 15:17:07 +01:00 committed by backportbot[bot]
parent 7ef67b82c9
commit 354387b135
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/AppFramework/OCS/BaseResponse.php
View file

@ -159,6 +159,10 @@ abstract class BaseResponse extends Response {
$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);
}

39
tests/lib/AppFramework/OCS/BaseResponseTest.php
View file

@ -28,6 +28,17 @@ namespace Test\AppFramework\Middleware;
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 */
@ -56,4 +67,32 @@ class BaseResponseTest extends \Test\TestCase {
$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)
);
}
}