Skip to content

Don't rethrow a type error #50498

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

Merged
kesselb merged 3 commits into from
Feb 11, 2025
Merged

Don't rethrow a type error #50498

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99ae669
fix: Replace the TypeError to prevent exposing the installation path
kesselb Jan 21, 2025
9e1ae74
fix: make locked exception path relative to the view
icewind1991 Jan 28, 2025
4978cd3
fix: use relative paths for upload locks
icewind1991 Feb 3, 2025
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
Prev Previous commit
Next Next commit
fix: make locked exception path relative to the view 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @kesselb
icewind1991 authored and kesselb committed Feb 11, 2025
commit 9e1ae74a1c862e223185cd516866a1469b989106
24 changes: 8 additions & 16 deletions lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,9 +2062,9 @@ private function lockPath($path, $type, $lockMountPoint = false) {
);
}
} catch (LockedException $e) {
// rethrow with the a human-readable path
// rethrow with the human-readable path
throw new LockedException(
$this->getPathRelativeToFiles($absolutePath),
$path,
$e,
$e->getExistingLock()
);
Expand Down Expand Up @@ -2102,20 +2102,12 @@ public function changeLock($path, $type, $lockMountPoint = false) {
);
}
} catch (LockedException $e) {
try {
// rethrow with the a human-readable path
throw new LockedException(
$this->getPathRelativeToFiles($absolutePath),
$e,
$e->getExistingLock()
);
} catch (\InvalidArgumentException $ex) {
throw new LockedException(
$absolutePath,
$ex,
$e->getExistingLock()
);
}
// rethrow with the a human-readable path
throw new LockedException(
$path,
$e,
$e->getExistingLock()
);
}

return true;
Expand Down