diff options
| author | Lucas Azevedo <lhs_azevedo@hotmail.com> | 2023-08-25 10:41:46 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-25 10:41:46 -0300 |
| commit | c93b1634d347b9fe343be4785a6d7b7a3757e7ec (patch) | |
| tree | a9dddd34ebbf504eb6d9016daaf0c4520c9bcae0 | |
| parent | 771a7b92cccb77a1b907a8cc0d022fb7b5103f8e (diff) | |
| download | nextcloud-server-c93b1634d347b9fe343be4785a6d7b7a3757e7ec.tar.gz nextcloud-server-c93b1634d347b9fe343be4785a6d7b7a3757e7ec.zip | |
Fixes from static analysis
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Lucas Azevedo <lhs_azevedo@hotmail.com>
| -rw-r--r-- | core/Command/User/AuthTokens/Delete.php | 6 | ||||
| -rw-r--r-- | lib/private/Authentication/Token/PublicKeyTokenMapper.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/Command/User/AuthTokens/Delete.php b/core/Command/User/AuthTokens/Delete.php index 830050c1bb9..8cd6f2e6205 100644 --- a/core/Command/User/AuthTokens/Delete.php +++ b/core/Command/User/AuthTokens/Delete.php @@ -63,7 +63,7 @@ class Delete extends Base { protected function execute(InputInterface $input, OutputInterface $output): int { $uid = $input->getArgument('uid'); - $id = $input->getArgument('id'); + $id = (int) $input->getArgument('id'); $before = $input->getOption('last-used-before'); if ($before) { @@ -80,13 +80,13 @@ class Delete extends Base { return $this->deleteById($uid, $id); } - protected function deleteById(string $uid, string $id) { + protected function deleteById(string $uid, int $id): int { $this->tokenProvider->invalidateTokenById($uid, $id); return Command::SUCCESS; } - protected function deleteLastUsedBefore(string $uid, string $before) { + protected function deleteLastUsedBefore(string $uid, string $before): int { $date = $this->parseDateOption($before); if (!$date) { throw new RuntimeException('Invalid date format. Acceptable formats are: ISO8601 (w/o fractions), "YYYY-MM-DD" and Unix time in seconds.'); diff --git a/lib/private/Authentication/Token/PublicKeyTokenMapper.php b/lib/private/Authentication/Token/PublicKeyTokenMapper.php index f150576a623..b04467a509a 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenMapper.php +++ b/lib/private/Authentication/Token/PublicKeyTokenMapper.php @@ -71,11 +71,11 @@ class PublicKeyTokenMapper extends QBMapper { public function invalidateLastUsedBefore(string $uid, int $before): int { $qb = $this->db->getQueryBuilder(); - return $qb->delete($this->tableName) + $qb->delete($this->tableName) ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) ->andWhere($qb->expr()->lt('last_activity', $qb->createNamedParameter($before, IQueryBuilder::PARAM_INT))) - ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT))) - ->executeStatement(); + ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT))); + return $query->executeStatement(); } /** |