fix: clarify trashbin expiration CLI help - #63160
Open
mvanhorn wants to merge 2 commits into
Open
Conversation
mvanhorn
requested review from
come-nc,
icewind1991,
leftybournes and
provokateurin
and removed request for
a team
August 11, 2026 10:51
come-nc
reviewed
Aug 11, 2026
come-nc
left a comment
Contributor
There was a problem hiding this comment.
The test should be removed and I’m not sold on the new description/help text.
"Processes deleted files" sounds confusing to me. It deletes expired files, it does not process them?
Per review: "Processes deleted files" was confusing since the command deletes expired files rather than processing them. Description and help now say so directly, and the test that pinned the exact wording is removed.
Author
|
You are right on both counts. "Processes deleted files" was doing no work: the command deletes expired files, so the description and help now say that directly. The test pinning the exact wording is gone too, since it only asserted the strings back at themselves. 966f8a3. |
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.
Summary
Update the Symfony command metadata in
ExpireTrash::configure()so both the command description and optionaluser_idargument explain that the operation processes deleted files according to the configured trashbin retention and space policy. Make the wording explicit that supplying user IDs limits processing to those users, while omitting them processes all users; avoid implying that the trashbin feature is disabled or that every deleted file is forcibly removed. Preserve the existing execution path, retention behavior, all-user default, and app command registration.The
trashbin:expirecommand currently says that it “expires” a user's trashbin without explaining what expiration does. This leaves administrators unsure whether the command disables the trashbin, empties it unconditionally, or applies the configured retention and space policy. The production path callsTrashbin::expire(), which removes entries eligible undertrashbin_retention_obligationand, where the policy permits, removes oldest entries to bring the trashbin back within its size limit. A recent server change clarified the special disabled-policy runtime output, but the command anduser_idhelp text remain ambiguous; broader documentation is separately tracked innextcloud/documentation#15421.Fixes #45418
TODO
Checklist
Not verified: this needs a person on the named hardware or environment.
3. to review, feature component)Not run: no test command resolved in this workspace, so nothing was executed to pass.
stable32)Not run: no test command resolved in this workspace, so nothing was executed to pass.
AI (if applicable)
AI was used for assistance.