Merge pull request #4410 from nextcloud/backport/4398/stable31

[stable31] fix(Controller): incomplete return type list
nextcloud · Jan 23, 2025 · 0294f82 · 0294f82
2 parents 08e4636 + 7586c49
commit 0294f82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer/composer/installed.php b/composer/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => 'a020a8fa3bc95f7b2107173c1e1caa634a7c6671',
+        'reference' => 'cfd48c8ab8986bf0b444fede00b5c3f70c0f703a',
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => 'a020a8fa3bc95f7b2107173c1e1caa634a7c6671',
+            'reference' => 'cfd48c8ab8986bf0b444fede00b5c3f70c0f703a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
@@ -305,7 +305,7 @@ private function setFederationFileInfo(Wopi $wopi, $response) {
 	#[NoCSRFRequired]
 	#[PublicPage]
 	#[FrontpageRoute(verb: 'GET', url: 'wopi/files/{fileId}/contents')]
-	public function getFile(string $fileId, string $access_token): JSONResponse|StreamResponse {
+	public function getFile(string $fileId, string $access_token): JSONResponse|StreamResponse|Http\Response {
 		[$fileId, , $version] = Helper::parseFileId($fileId);
 
 		try {