Fix types in OCS json answer (status code is an int)

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php
index f9577a7a5f2770163204e677b12d3618ac9dadff..d3904065102d572f657d01d07e85ed5b356e4099 100644 (file)
--- a/lib/private/AppFramework/OCS/BaseResponse.php
+++ b/lib/private/AppFramework/OCS/BaseResponse.php
@@ -92,7 +92,7 @@ abstract class BaseResponse extends Response {
        }
 
        /**
-        * @param string[] $meta
+        * @param array<string,string|int> $meta
         * @return string
         */
        protected function renderResult(array $meta): string {

diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php
index 8c402809cc41ad847256eb058c7cfe1104e5d560..cca3c267ec48348a9f3fcca3ff7f47a915c305cb 100644 (file)
--- a/lib/private/AppFramework/OCS/V1Response.php
+++ b/lib/private/AppFramework/OCS/V1Response.php
@@ -28,7 +28,6 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\OCSController;
 
 class V1Response extends BaseResponse {
-
        /**
         * The V1 endpoint has very limited http status codes basically everything
         * is status 200 except 401
@@ -68,7 +67,7 @@ class V1Response extends BaseResponse {
        public function render() {
                $meta = [
                        'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
-                       'statuscode' => (string)$this->getOCSStatus(),
+                       'statuscode' => $this->getOCSStatus(),
                        'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage ?? '',
                        'totalitems' => (string)($this->itemsCount ?? ''),
                        'itemsperpage' => (string)($this->itemsPerPage ?? ''),

diff --git a/lib/private/AppFramework/OCS/V2Response.php b/lib/private/AppFramework/OCS/V2Response.php
index 6c302698bc9900f80c373da3ebabfd29bc923046..8bf4c37a5787b03ff97235927d00757d85ebf97d 100644 (file)
--- a/lib/private/AppFramework/OCS/V2Response.php
+++ b/lib/private/AppFramework/OCS/V2Response.php
@@ -27,7 +27,6 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\OCSController;
 
 class V2Response extends BaseResponse {
-
        /**
         * The V2 endpoint just passes on status codes.
         * Of course we have to map the OCS specific codes to proper HTTP status codes
@@ -61,7 +60,7 @@ class V2Response extends BaseResponse {
                $meta = [
                        'status' => $status >= 200 && $status < 300 ? 'ok' : 'failure',
                        'statuscode' => $this->getOCSStatus(),
-                       'message' => $status >= 200 && $status < 300 ? 'OK' : $this->statusMessage,
+                       'message' => $status >= 200 && $status < 300 ? 'OK' : $this->statusMessage ?? '',
                ];
 
                if ($this->itemsCount !== null) {