Merge pull request #46218 from nextcloud/artonge/fix/hash_return_type

nextcloud · Sep 16, 2024 · dde0b48 · dde0b48
2 parents d9c5512 + 9acaf07
commit dde0b48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -400,7 +400,7 @@ public function fopen($path, $mode) {
 		return $result;
 	}
 
-	public function hash($type, $path, $raw = false) {
+	public function hash($type, $path, $raw = false): string|false {
 		return hash_file($type, $this->getSourcePath($path), $raw);
 	}
 

diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php
@@ -315,6 +315,7 @@ public function hash($type, $path, $raw = false) {
 			return parent::hash($type, $path, $raw);
 		} catch (StorageNotAvailableException $e) {
 			$this->setUnavailable($e);
+			return false;
 		}
 	}