From f2cdc4f47d9136b54159557136dad892dcd31ec2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Tue, 13 Dec 2022 09:29:07 +0100 Subject: [PATCH] Fix crash in OCS when getting info about an application MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/AppFramework/OCS/BaseResponse.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php index dbff1b846c1..f9577a7a5f2 100644 --- a/lib/private/AppFramework/OCS/BaseResponse.php +++ b/lib/private/AppFramework/OCS/BaseResponse.php @@ -37,13 +37,13 @@ abstract class BaseResponse extends Response { /** @var string */ protected $format; - /** @var string */ + /** @var ?string */ protected $statusMessage; - /** @var int */ + /** @var ?int */ protected $itemsCount; - /** @var int */ + /** @var ?int */ protected $itemsPerPage; /** @@ -125,12 +125,15 @@ abstract class BaseResponse extends Response { return $writer->outputMemory(true); } - /** - * @param array $array - * @param \XMLWriter $writer - */ - protected function toXML(array $array, \XMLWriter $writer) { + protected function toXML(array $array, \XMLWriter $writer): void { foreach ($array as $k => $v) { + if ($k === '@attributes' && is_array($v)) { + foreach ($v as $k2 => $v2) { + $writer->writeAttribute($k2, $v2); + } + continue; + } + if (\is_string($k) && strpos($k, '@') === 0) { $writer->writeAttribute(substr($k, 1), $v); continue; -- 2.39.5