Merge pull request #48102 from nextcloud/backport/46218/stable27

[stable27] Ensure that the hash method does not return null
nextcloud · Dec 5, 2024 · 4faa061 · 4faa061
2 parents cfb51dd + 03a777b
commit 4faa061
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
@@ -439,7 +439,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
@@ -334,6 +334,7 @@ public function hash($type, $path, $raw = false) {
 			return parent::hash($type, $path, $raw);
 		} catch (StorageNotAvailableException $e) {
 			$this->setUnavailable($e);
+			return false;
 		}
 	}