refactor: flatten nesting with early returns in FilesHooks and ViewInfoCache#2565
Merged
CarlSchwan merged 2 commits intomasterfrom May 7, 2026
Merged
refactor: flatten nesting with early returns in FilesHooks and ViewInfoCache#2565CarlSchwan merged 2 commits intomasterfrom
CarlSchwan merged 2 commits intomasterfrom
Conversation
- Data::setOffsetFromSince(): invert guards with early returns and extract the repeated fallback fetch into getFirstKnownActivityHeader() - MailQueueHandler::getAffectedUsers(): early return in the restrictEmails branch and extract the duplicated result loop into fetchAffectedUsers() Signed-off-by: Anna Larch <anna@nextcloud.com> AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…foCache - FilesHooks::unShare(): invert guard clause to early return; add tests covering the guard (non-file/folder nodeType, deleted node) and all dispatch branches (TYPE_USER, TYPE_GROUP, TYPE_LINK) - FilesHooks::unShareSelf(): same guard-inversion treatment - ViewInfoCache::findInfoById(): replace nested try-catch and $notFound flag with sequential try-catch blocks and early returns Signed-off-by: Anna Larch <anna@nextcloud.com> AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Activity
 |
||||||||||||||||||||||||||||
| Project |
Activity
|
| Branch Review |
refactor/early-returns-2
|
| Run status |
|
| Run duration | 02m 05s |
| Commit |
|
| Committer | Anna |
| View all properties for this run ↗︎ | |
| Test results | |
|---|---|
 |
0
|
 |
0
|
 |
1
|
 |
0
|
 |
9
|
| View all changes introduced in this branch ↗︎ | |
CarlSchwan
approved these changes
May 7, 2026
Collaborator
Author
|
/backport to stable33 |
Collaborator
Author
|
/backport to stable32 |
3 tasks
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
2 participants
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.
Summary
FilesHooks::unShare(): inverted compound guard into an early return to un-nest the share-type dispatch; added 5 tests covering the guard paths (non-file/folder nodeType, deleted node) and all three dispatch branches (TYPE_USER, TYPE_GROUP, TYPE_LINK)FilesHooks::unShareSelf(): same guard-inversion treatmentViewInfoCache::findInfoById(): replaced nested try-catch blocks and a$notFoundboolean flag with sequential try-catch blocks and early returns for the success pathsNo behaviour changes. All existing tests pass.
Test plan
testUnShare*tests (5 tests) — greenFilesHooksTestfull suite (62 tests, 517 assertions) — greenViewInfoCacheTest— green🤖 Generated with Claude Code