From cfd48c8ab8986bf0b444fede00b5c3f70c0f703a Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 21 Jan 2025 20:36:57 +0100 Subject: [PATCH 1/2] fix(Controller): incomplete return type list - a plain response is instantiated in two places - solves a PHP Error Signed-off-by: Arthur Schiwon --- lib/Controller/WopiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php index a6f7fcbdf..43b5c3bcd 100644 --- a/lib/Controller/WopiController.php +++ b/lib/Controller/WopiController.php @@ -305,7 +305,7 @@ class WopiController extends Controller { #[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 { From f98489efbe828d12eb08b1708ffc1cd5826b8386 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 21 Jan 2025 22:01:30 +0100 Subject: [PATCH 2/2] build(composer): update installed meta data Signed-off-by: Arthur Schiwon --- composer/composer/installed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer/composer/installed.php b/composer/composer/installed.php index 7feb7116b..895ce3d03 100644 --- 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(),