Merge pull request #2262 from nextcloud/bugfix/noid/wrapper-return-type

nextcloud · Feb 14, 2023 · d817a22 · d817a22
2 parents 9ffd181 + 791af75
commit d817a22
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 9 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/ACL/ACLManager.php b/lib/ACL/ACLManager.php
@@ -49,7 +49,7 @@ private function getRootStorageId(): int {
 			$provider = $this->rootFolderProvider;
 			/** @var IRootFolder $rootFolder */
 			$rootFolder = $provider();
-			$this->rootStorageId = $rootFolder->getMountPoint()->getNumericStorageId();
+			$this->rootStorageId = $rootFolder->getMountPoint()->getNumericStorageId() ?? -1;
 		}
 
 		return $this->rootStorageId;

diff --git a/lib/ACL/ACLStorageWrapper.php b/lib/ACL/ACLStorageWrapper.php
@@ -232,7 +232,7 @@ public function filetype($path) {
 		return parent::filetype($path);
 	}
 
-	public function filesize($path) {
+	public function filesize($path): false|int|float {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}

diff --git a/lib/Controller/FolderController.php b/lib/Controller/FolderController.php
@@ -26,6 +26,7 @@
 use OCA\GroupFolders\Mount\MountProvider;
 use OCA\GroupFolders\Service\DelegationService;
 use OCA\GroupFolders\Service\FoldersFilter;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\Files\IRootFolder;
@@ -84,10 +85,15 @@ public function getFolders(): DataResponse {
 	 * @RequireGroupFolderAdmin
 	 */
 	public function getFolder(int $id): DataResponse {
-		return new DataResponse($this->manager->getFolder($id, $this->getRootFolderStorageId()));
+		$storageId = $this->getRootFolderStorageId();
+		if ($storageId === null) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}
+
+		return new DataResponse($this->manager->getFolder($id, $storageId));
 	}
 
-	private function getRootFolderStorageId(): int {
+	private function getRootFolderStorageId(): ?int {
 		return $this->rootFolder->getMountPoint()->getNumericStorageId();
 	}
 

diff --git a/lib/Versions/GroupVersion.php b/lib/Versions/GroupVersion.php
@@ -40,7 +40,7 @@ public function __construct(
 		int $timestamp,
 		int $revisionId,
 		string $name,
-		int $size,
+		float|int $size,
 		string $mimetype,
 		string $path,
 		FileInfo $sourceFileInfo,