From d25a563d9737855704eb4355275cddcacbb83284 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Wed, 2 Apr 2025 12:44:54 +0200 Subject: [PATCH] chore: Use iterator in ExpireTrash command Signed-off-by: Louis Chemineau --- apps/files_trashbin/lib/Command/ExpireTrash.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php index be5bd15d5e6..b2fcaaa95b3 100644 --- a/apps/files_trashbin/lib/Command/ExpireTrash.php +++ b/apps/files_trashbin/lib/Command/ExpireTrash.php @@ -33,7 +33,8 @@ class ExpireTrash extends Command { * @param IUserManager|null $userManager * @param Expiration|null $expiration */ - public function __construct(?IUserManager $userManager = null, + public function __construct(private LoggerInterface $logger, + ?IUserManager $userManager = null, ?Expiration $expiration = null) { parent::__construct(); @@ -74,10 +75,12 @@ class ExpireTrash extends Command { } else { $p = new ProgressBar($output); $p->start(); - $this->userManager->callForSeenUsers(function (IUser $user) use ($p) { + + $users = $this->userManager->getSeenUsers(); + foreach ($users as $user) { $p->advance(); $this->expireTrashForUser($user); - }); + } $p->finish(); $output->writeln(''); }