chore: Remove some unused old tools

Signed-off-by: Julius Knorr <[email protected]>

Author: juliusknorr

lib/AppInfo/Application.php

@@ -53,7 +53,7 @@ public function register(IRegistrationContext $context): void {
 	public function boot(IBootContext $context): void {
 		$this->registerHooks();
 
-		$context->injectFn(function (ILockManager $lockManager) use ($context) {
+		$context->injectFn(function (ILockManager $lockManager) {
 			$lockManager->registerLazyLockProvider(LockProvider::class);
 		});
 	}

lib/Command/Lock.php

@@ -12,6 +12,8 @@
 namespace OCA\FilesLock\Command;
 
 use OC\Core\Command\Base;
+use OC\DB\Connection;
+use OC\DB\SchemaWrapper;
 use OC\User\NoUserException;
 use OCA\FilesLock\Db\LocksRequest;
 use OCA\FilesLock\Exceptions\LockNotFoundException;
@@ -26,6 +28,7 @@
 use OCP\Files\Lock\ILock;
 use OCP\Files\Lock\LockContext;
 use OCP\Files\NotFoundException;
+use OCP\IDBConnection;
 use OCP\IUserManager;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
@@ -35,48 +38,17 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Lock extends Base {
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var LocksRequest */
-	private $locksRequest;
-
-	/** @var FileService */
-	private $fileService;
-
-	/** @var LockService */
-	private $lockService;
-
-	/** @var ConfigService */
-	private $configService;
-
-
-	/**
-	 * CacheUpdate constructor.
-	 *
-	 * @param IUserManager $userManager
-	 * @param FileService $fileService
-	 * @param LockService $lockService
-	 * @param LocksRequest $locksRequest
-	 * @param ConfigService $configService
-	 */
 	public function __construct(
-		IUserManager $userManager, LocksRequest $locksRequest, FileService $fileService,
-		LockService $lockService, ConfigService $configService,
+		private IUserManager $userManager,
+		private LocksRequest $locksRequest,
+		private FileService $fileService,
+		private LockService $lockService,
+		private ConfigService $configService,
+		private IDBConnection $connection,
 	) {
 		parent::__construct();
-
-		$this->userManager = $userManager;
-		$this->locksRequest = $locksRequest;
-		$this->fileService = $fileService;
-		$this->lockService = $lockService;
-		$this->configService = $configService;
 	}
 
-
-	/**
-	 *
-	 */
 	protected function configure() {
 		parent::configure();
 		$this->setName('files:lock')
@@ -241,4 +213,42 @@ private function uninstallApp(InputInterface $input, OutputInterface $output) {
 
 		throw new SuccessException();
 	}
+
+
+	/**
+	 *
+	 */
+	public function uninstall(): void {
+		$this->uninstallAppTables();
+		$this->removeFromJobs();
+		$this->removeFromMigrations();
+	}
+
+	public function uninstallAppTables() {
+		$dbConn = \OCP\Server::get(Connection::class);
+		$schema = new SchemaWrapper($dbConn);
+
+		foreach (array_keys(self::$tables) as $table) {
+			if ($schema->hasTable($table)) {
+				$schema->dropTable($table);
+			}
+		}
+
+		$schema->performDropTableCalls();
+	}
+
+	public function removeFromMigrations() {
+		$qb = $this->connection->getQueryBuilder();
+		$qb->delete('migrations');
+		$qb->where($qb->expr()->eq('app', 'files_lock'));
+
+		$qb->executeStatement();
+	}
+
+	public function removeFromJobs() {
+		$qb = $this->connection->getQueryBuilder();
+		$qb->delete('jobs');
+		$qb->where($qb->expr()->eq('class', 'OCA\FilesLock\Cron\Unlock'));
+		$qb->executeStatement();
+	}
 }

lib/Controller/LockController.php

@@ -173,7 +173,7 @@ protected function fail(
 		);
 
 		if ($log) {
-			$this->logger->warning('[warning] ' . $status . ' - ' . json_encode($data));
+			$this->logger->warning('[warning] ' . (string)$status . ' - ' . json_encode($data));
 		}
 
 		return new DataResponse($data, $status);