Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix xml ocs response for serializable objects #30417

Merged
merged 1 commit into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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)
);
}
}
Loading