chore(trashbin): deprecate abortOperation on BeforeNodeRestoredEvent / switch to AbortedEventException#59043
Open
joshtrichards wants to merge 6 commits intomasterfrom
Open
Conversation
…ntException Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Member
Author
|
/backport to stable34 |
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
artonge
approved these changes
Mar 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves: #Summary
Deprecates
BeforeNodeRestoredEvent::abortOperation()to match the deprecation already applied to BeforeNodeDeletedEvent::abortOperation() and BeforeNodeRenamedEvent::abortOperation() in Nextcloud 29.BeforeNodeRestoredEventwas missed in that round.Changes:
$event->abortOperation()call sites infiles_trashbin'sSyncLivePhotosListener::handleRestore()to throwAbortedEventExceptiondirectly.BeforeNodeRestoredEvent::abortOperation()to throwAbortedEventExceptioninternally (matching the files app'sBeforeNodeDeletedEvent::abortOperation()), and marked it@deprecated.try/catchforAbortedEventExceptionat theTrashbin::restore()dispatch site, consistent with howHookConnector::delete()handles it for the files app.Fixes a bug: In the existing implementation,
Trashbin::restore()'sif (!$run)check is dead code --abortOperation()sets$run = falsebut immediately throws, so the exception unwinds past the check. The operation is aborted only because an uncaught exception propagates up the stack as an HTTP 500, not via the intended gracefulreturn falsepath. This PR makes the abort mechanism work as designed + match its counterparts in thefilesapp.TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)