Skip to content

Commit 0294f82

Browse files
authored
Merge pull request #4410 from nextcloud/backport/4398/stable31
[stable31] fix(Controller): incomplete return type list
2 parents 08e4636 + 7586c49 commit 0294f82

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

composer/composer/installed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => 'a020a8fa3bc95f7b2107173c1e1caa634a7c6671',
6+
'reference' => 'cfd48c8ab8986bf0b444fede00b5c3f70c0f703a',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-main',
1515
'version' => 'dev-main',
16-
'reference' => 'a020a8fa3bc95f7b2107173c1e1caa634a7c6671',
16+
'reference' => 'cfd48c8ab8986bf0b444fede00b5c3f70c0f703a',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../',
1919
'aliases' => array(),

lib/Controller/WopiController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ private function setFederationFileInfo(Wopi $wopi, $response) {
305305
#[NoCSRFRequired]
306306
#[PublicPage]
307307
#[FrontpageRoute(verb: 'GET', url: 'wopi/files/{fileId}/contents')]
308-
public function getFile(string $fileId, string $access_token): JSONResponse|StreamResponse {
308+
public function getFile(string $fileId, string $access_token): JSONResponse|StreamResponse|Http\Response {
309309
[$fileId, , $version] = Helper::parseFileId($fileId);
310310

311311
try {

0 commit comments

Comments
 (0)