fix(settings): Fix log file download return type

Signed-off-by: provokateurin <[email protected]>
nextcloud · Jan 8, 2025 · 6eb843c · 6eb843c
1 parent 9de0452
commit 6eb843c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/apps/settings/lib/Controller/LogSettingsController.php b/apps/settings/lib/Controller/LogSettingsController.php
@@ -27,9 +27,7 @@ public function __construct(string $appName, IRequest $request, Log $logger) {
 	/**
 	 * download logfile
 	 *
-	 * @psalm-suppress MoreSpecificReturnType The value of Content-Disposition is not relevant
-	 * @psalm-suppress LessSpecificReturnStatement The value of Content-Disposition is not relevant
-	 * @return StreamResponse<Http::STATUS_OK, array{Content-Type: 'application/octet-stream', 'Content-Disposition': string}>
+	 * @return StreamResponse<Http::STATUS_OK, array{Content-Type: 'application/octet-stream', 'Content-Disposition': 'attachment; filename="nextcloud.log"'}>
 	 *
 	 * 200: Logfile returned
 	 */
@@ -38,11 +36,13 @@ public function download() {
 		if (!$this->log instanceof Log) {
 			throw new \UnexpectedValueException('Log file not available');
 		}
-		$resp = new StreamResponse($this->log->getLogPath());
-		$resp->setHeaders([
-			'Content-Type' => 'application/octet-stream',
-			'Content-Disposition' => 'attachment; filename="nextcloud.log"',
-		]);
-		return $resp;
+		return new StreamResponse(
+			$this->log->getLogPath(),
+			Http::STATUS_OK,
+			[
+				'Content-Type' => 'application/octet-stream',
+				'Content-Disposition' => 'attachment; filename="nextcloud.log"',
+			],
+		);
 	}
 }
diff --git a/apps/settings/openapi-administration.json b/apps/settings/openapi-administration.json
@@ -44,7 +44,10 @@
                         "headers": {
                             "Content-Disposition": {
                                 "schema": {
-                                    "type": "string"
+                                    "type": "string",
+                                    "enum": [
+                                        "attachment; filename=\"nextcloud.log\""
+                                    ]
                                 }
                             }
                         },

diff --git a/apps/settings/openapi-full.json b/apps/settings/openapi-full.json
@@ -221,7 +221,10 @@
                         "headers": {
                             "Content-Disposition": {
                                 "schema": {
-                                    "type": "string"
+                                    "type": "string",
+                                    "enum": [
+                                        "attachment; filename=\"nextcloud.log\""
+                                    ]
                                 }
                             }
                         },