diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-12-13 08:54:49 +0100 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-01-20 11:22:09 +0100 |
| commit | 0c466b7ff59c08e796437fc666a5307cb1dc969f (patch) | |
| tree | 3c08cdac0840384671315c046b1a23070bb93107 /lib/private | |
| parent | e91457d9cd68182591038636155d415b5dee0ec4 (diff) | |
| download | nextcloud-server-0c466b7ff59c08e796437fc666a5307cb1dc969f.tar.gz nextcloud-server-0c466b7ff59c08e796437fc666a5307cb1dc969f.zip | |
Attempt at reducing psalm errors
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/AppFramework/OCS/V1Response.php | 9 | ||||
| -rw-r--r-- | lib/private/legacy/OC_API.php | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php index f4f19832fa8..8c402809cc4 100644 --- a/lib/private/AppFramework/OCS/V1Response.php +++ b/lib/private/AppFramework/OCS/V1Response.php @@ -68,13 +68,12 @@ class V1Response extends BaseResponse { public function render() { $meta = [ 'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure', - 'statuscode' => $this->getOCSStatus(), - 'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage, + 'statuscode' => (string)$this->getOCSStatus(), + 'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage ?? '', + 'totalitems' => (string)($this->itemsCount ?? ''), + 'itemsperpage' => (string)($this->itemsPerPage ?? ''), ]; - $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : ''; - $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: ''; - return $this->renderResult($meta); } } diff --git a/lib/private/legacy/OC_API.php b/lib/private/legacy/OC_API.php index 46ee3495572..0da546f3263 100644 --- a/lib/private/legacy/OC_API.php +++ b/lib/private/legacy/OC_API.php @@ -101,7 +101,7 @@ class OC_API { public static function requestedFormat(): string { $formats = ['json', 'xml']; - $format = (isset($_GET['format']) && in_array($_GET['format'], $formats)) ? $_GET['format'] : 'xml'; + $format = (isset($_GET['format']) && is_string($_GET['format']) && in_array($_GET['format'], $formats)) ? $_GET['format'] : 'xml'; return $format; } |