nextcloud / server

apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php

Indentation +59 added lines, -59 removed lines

@@ -18,63 +18,63 @@
 use Test\TestCase;
 
 class ExpireTrashTest extends TestCase {
-	/** @var IAppConfig&MockObject */
-	private $appConfig;
-
-	/** @var IUserManager&MockObject */
-	private $userManager;
-
-	/** @var Expiration&MockObject */
-	private $expiration;
-
-	/** @var IJobList&MockObject */
-	private $jobList;
-
-	/** @var LoggerInterface&MockObject */
-	private $logger;
-
-	/** @var ITimeFactory&MockObject */
-	private $time;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->expiration = $this->createMock(Expiration::class);
-		$this->jobList = $this->createMock(IJobList::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->time = $this->createMock(ITimeFactory::class);
-		$this->time->method('getTime')
-			->willReturn(999999999);
-
-		$this->jobList->expects($this->once())
-			->method('setLastRun');
-		$this->jobList->expects($this->once())
-			->method('setExecutionTime');
-	}
-
-	public function testConstructAndRun(): void {
-		$this->appConfig->method('getValueString')
-			->with('files_trashbin', 'background_job_expire_trash', 'yes')
-			->willReturn('yes');
-		$this->appConfig->method('getValueInt')
-			->with('files_trashbin', 'background_job_expire_trash_offset', 0)
-			->willReturn(0);
-
-		$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->logger, $this->time);
-		$job->start($this->jobList);
-	}
-
-	public function testBackgroundJobDeactivated(): void {
-		$this->appConfig->method('getValueString')
-			->with('files_trashbin', 'background_job_expire_trash', 'yes')
-			->willReturn('no');
-		$this->expiration->expects($this->never())
-			->method('getMaxAgeAsTimestamp');
-
-		$job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->logger, $this->time);
-		$job->start($this->jobList);
-	}
+    /** @var IAppConfig&MockObject */
+    private $appConfig;
+
+    /** @var IUserManager&MockObject */
+    private $userManager;
+
+    /** @var Expiration&MockObject */
+    private $expiration;
+
+    /** @var IJobList&MockObject */
+    private $jobList;
+
+    /** @var LoggerInterface&MockObject */
+    private $logger;
+
+    /** @var ITimeFactory&MockObject */
+    private $time;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->expiration = $this->createMock(Expiration::class);
+        $this->jobList = $this->createMock(IJobList::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->time = $this->createMock(ITimeFactory::class);
+        $this->time->method('getTime')
+            ->willReturn(999999999);
+
+        $this->jobList->expects($this->once())
+            ->method('setLastRun');
+        $this->jobList->expects($this->once())
+            ->method('setExecutionTime');
+    }
+
+    public function testConstructAndRun(): void {
+        $this->appConfig->method('getValueString')
+            ->with('files_trashbin', 'background_job_expire_trash', 'yes')
+            ->willReturn('yes');
+        $this->appConfig->method('getValueInt')
+            ->with('files_trashbin', 'background_job_expire_trash_offset', 0)
+            ->willReturn(0);
+
+        $job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->logger, $this->time);
+        $job->start($this->jobList);
+    }
+
+    public function testBackgroundJobDeactivated(): void {
+        $this->appConfig->method('getValueString')
+            ->with('files_trashbin', 'background_job_expire_trash', 'yes')
+            ->willReturn('no');
+        $this->expiration->expects($this->never())
+            ->method('getMaxAgeAsTimestamp');
+
+        $job = new ExpireTrash($this->appConfig, $this->userManager, $this->expiration, $this->logger, $this->time);
+        $job->start($this->jobList);
+    }
 }

apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php

Indentation +57 added lines, -57 removed lines

@@ -17,71 +17,71 @@
 use Psr\Log\LoggerInterface;
 
 class ExpireTrash extends TimedJob {
-	public function __construct(
-		private IAppConfig $appConfig,
-		private IUserManager $userManager,
-		private Expiration $expiration,
-		private LoggerInterface $logger,
-		ITimeFactory $time,
-	) {
-		parent::__construct($time);
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
-	}
+    public function __construct(
+        private IAppConfig $appConfig,
+        private IUserManager $userManager,
+        private Expiration $expiration,
+        private LoggerInterface $logger,
+        ITimeFactory $time,
+    ) {
+        parent::__construct($time);
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
+    }
 
-	protected function run($argument) {
-		$backgroundJob = $this->appConfig->getValueString('files_trashbin', 'background_job_expire_trash', 'yes');
-		if ($backgroundJob === 'no') {
-			return;
-		}
+    protected function run($argument) {
+        $backgroundJob = $this->appConfig->getValueString('files_trashbin', 'background_job_expire_trash', 'yes');
+        if ($backgroundJob === 'no') {
+            return;
+        }
 
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$stopTime = time() + 60 * 30; // Stops after 30 minutes.
-		$offset = $this->appConfig->getValueInt('files_trashbin', 'background_job_expire_trash_offset', 0);
-		$users = $this->userManager->getSeenUsers($offset);
+        $stopTime = time() + 60 * 30; // Stops after 30 minutes.
+        $offset = $this->appConfig->getValueInt('files_trashbin', 'background_job_expire_trash_offset', 0);
+        $users = $this->userManager->getSeenUsers($offset);
 
-		foreach ($users as $user) {
-			try {
-				$uid = $user->getUID();
-				if (!$this->setupFS($uid)) {
-					continue;
-				}
-				$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-				Trashbin::deleteExpiredFiles($dirContent, $uid);
-			} catch (\Throwable $e) {
-				$this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
-			}
+        foreach ($users as $user) {
+            try {
+                $uid = $user->getUID();
+                if (!$this->setupFS($uid)) {
+                    continue;
+                }
+                $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+                Trashbin::deleteExpiredFiles($dirContent, $uid);
+            } catch (\Throwable $e) {
+                $this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
+            }
 
-			$offset++;
+            $offset++;
 
-			if ($stopTime < time()) {
-				$this->appConfig->setValueInt('files_trashbin', 'background_job_expire_trash_offset', $offset);
-				\OC_Util::tearDownFS();
-				return;
-			}
-		}
+            if ($stopTime < time()) {
+                $this->appConfig->setValueInt('files_trashbin', 'background_job_expire_trash_offset', $offset);
+                \OC_Util::tearDownFS();
+                return;
+            }
+        }
 
-		$this->appConfig->setValueInt('files_trashbin', 'background_job_expire_trash_offset', 0);
-		\OC_Util::tearDownFS();
-	}
+        $this->appConfig->setValueInt('files_trashbin', 'background_job_expire_trash_offset', 0);
+        \OC_Util::tearDownFS();
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 */
-	protected function setupFS(string $user): bool {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     */
+    protected function setupFS(string $user): bool {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a trashbin directory
-		$view = new View('/' . $user);
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
+        // Check if this user has a trashbin directory
+        $view = new View('/' . $user);
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 				$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
 				Trashbin::deleteExpiredFiles($dirContent, $uid);
 			} catch (\Throwable $e) {
-				$this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
+				$this->logger->error('Error while expiring trashbin for user '.$user->getUID(), ['exception' => $e]);
 			}
 
 			$offset++;
@@ -77,7 +77,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a trashbin directory
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}

apps/files_trashbin/lib/Command/ExpireTrash.php

Indentation +79 added lines, -79 removed lines

@@ -21,91 +21,91 @@
 
 class ExpireTrash extends Command {
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(
-		private LoggerInterface $logger,
-		private ?IUserManager $userManager = null,
-		private ?Expiration $expiration = null,
-	) {
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(
+        private LoggerInterface $logger,
+        private ?IUserManager $userManager = null,
+        private ?Expiration $expiration = null,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('trashbin:expire')
-			->setDescription('Expires the users trashbin')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('trashbin:expire')
+            ->setDescription('Expires the users trashbin')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$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;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $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;
+        }
 
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Remove deleted files of   <info>$user</info>");
-					$userObject = $this->userManager->get($user);
-					$this->expireTrashForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-					return 1;
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
+                    $userObject = $this->userManager->get($user);
+                    $this->expireTrashForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                    return 1;
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
 
-			$users = $this->userManager->getSeenUsers();
-			foreach ($users as $user) {
-				$p->advance();
-				$this->expireTrashForUser($user);
-			}
-			$p->finish();
-			$output->writeln('');
-		}
-		return 0;
-	}
+            $users = $this->userManager->getSeenUsers();
+            foreach ($users as $user) {
+                $p->advance();
+                $this->expireTrashForUser($user);
+            }
+            $p->finish();
+            $output->writeln('');
+        }
+        return 0;
+    }
 
-	public function expireTrashForUser(IUser $user) {
-		try {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-			Trashbin::deleteExpiredFiles($dirContent, $uid);
-		} catch (\Throwable $e) {
-			$this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
-		}
-	}
+    public function expireTrashForUser(IUser $user) {
+        try {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+            Trashbin::deleteExpiredFiles($dirContent, $uid);
+        } catch (\Throwable $e) {
+            $this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
+        }
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a trashbin directory
-		$view = new View('/' . $user);
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
+        // Check if this user has a trashbin directory
+        $view = new View('/' . $user);
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
 			Trashbin::deleteExpiredFiles($dirContent, $uid);
 		} catch (\Throwable $e) {
-			$this->logger->error('Error while expiring trashbin for user ' . $user->getUID(), ['exception' => $e]);
+			$this->logger->error('Error while expiring trashbin for user '.$user->getUID(), ['exception' => $e]);
 		}
 	}
 
@@ -101,7 +101,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a trashbin directory
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}