Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable27] Ensure that the hash method does not return null #48102

Merged
merged 2 commits into from
Dec 5, 2024
Merged

[stable27] Ensure that the hash method does not return null #48102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2608766
fix(files): Ensure that the hash method does not return null
artonge Jul 1, 2024
03a777b
chore: improve hash_file php usage in Local Storage
skjnldsv Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions lib/private/Files/Storage/Wrapper/Availability.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
Loading