Merge branch 'master' into bug/oauth-instance-name-decoding-39956

nextcloud · Dec 13, 2024 · c9ffff9 · c9ffff9
2 parents 77ca4f5 + afc4b0a
commit c9ffff9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php
@@ -90,7 +90,7 @@ public function httpGet(RequestInterface $request, ResponseInterface $response)
 
 			$response->setBody($file->getContent());
 		} catch (NotFoundException $e) {
-			$response->setStatus(404);
+			$response->setStatus(\OCP\AppFramework\Http::STATUS_NO_CONTENT);
 		}
 
 		return false;

diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
@@ -171,7 +171,7 @@ public function testCard($size, $photo): void {
 				->willThrowException(new NotFoundException());
 			$this->response->expects($this->once())
 				->method('setStatus')
-				->with(404);
+				->with(\OCP\AppFramework\Http::STATUS_NO_CONTENT);
 		}
 
 		$result = $this->plugin->httpGet($this->request, $this->response);

diff --git a/apps/files_external/lib/Command/StorageAuthBase.php b/apps/files_external/lib/Command/StorageAuthBase.php
@@ -52,7 +52,7 @@ private function getPasswordOption(InputInterface $input): ?string {
 	protected function createStorage(InputInterface $input, OutputInterface $output): array {
 		try {
 			/** @var StorageConfig|null $mount */
-			$mount = $this->globalService->getStorage($input->getArgument('mount_id'));
+			$mount = $this->globalService->getStorage((int)$input->getArgument('mount_id'));
 		} catch (NotFoundException $e) {
 			$output->writeln('<error>Mount not found</error>');
 			return [null, null];