Skip to content

fix(files_trashbin): misleading trashbin:expire output when expiration is disabled #63040

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

Open
joshtrichards wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

fix(files_trashbin): misleading trashbin:expire output when expiration is disabled #63040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions apps/files_trashbin/lib/Command/ExpireTrash.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,14 @@ protected function configure(): void {
protected function execute(InputInterface $input, OutputInterface $output): int {
$minAge = $this->expiration->getMinAgeAsTimestamp();
$maxAge = $this->expiration->getMaxAgeAsTimestamp();
// Both minAge and maxAge resolve to `false` only when
// Expiration::isEnabled() is false, i.e. the retention policy is "disabled".
if ($minAge === false && $maxAge === false) {
$output->writeln('Auto expiration is configured - keeps files and folders in the trash bin for 30 days and automatically deletes anytime after that if space is needed (note: files may not be deleted if space is not needed)');
return 1;
$output->writeln(
'Trash bin expiration is disabled (trashbin_retention_obligation is set to "disabled"). '
. 'No files or folders will be automatically expired by this command.'
);
return 0;
}

$userIds = $input->getArgument('user_id');
Expand Down
Loading