From 0c5b1a88a691f7632226cb4ff3d69da4a3672392 Mon Sep 17 00:00:00 2001 From: Raul Date: Wed, 13 Apr 2022 12:43:00 +0200 Subject: [PATCH] Run cs:fix Signed-off-by: Raul --- lib/Db/AclMapper.php | 3 +-- lib/Db/AttachmentMapper.php | 1 - lib/Db/LabelMapper.php | 5 ++--- lib/Db/StackMapper.php | 2 +- lib/Service/LabelService.php | 30 +++++++++++++++--------------- 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/lib/Db/AclMapper.php b/lib/Db/AclMapper.php index 45a3be468..f3d6ea3d9 100644 --- a/lib/Db/AclMapper.php +++ b/lib/Db/AclMapper.php @@ -29,7 +29,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; class AclMapper extends DeckMapper implements IPermissionMapper { - public function __construct(IDBConnection $db) { parent::__construct($db, 'deck_board_acl', Acl::class); } @@ -62,7 +61,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper { $qb = $this->db->getQueryBuilder(); $qb->select('acl.id') ->from($this->getTableName(), 'acl') - ->innerJoin('acl', 'deck_boards','b', 'acl.board_id = b.id') + ->innerJoin('acl', 'deck_boards', 'b', 'acl.board_id = b.id') ->where($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR))) ->andWhere($qb->expr()->eq('acl.id', $qb->createNamedParameter($aclId, IQueryBuilder::PARAM_INT))); diff --git a/lib/Db/AttachmentMapper.php b/lib/Db/AttachmentMapper.php index 6b98b895b..269af4131 100644 --- a/lib/Db/AttachmentMapper.php +++ b/lib/Db/AttachmentMapper.php @@ -30,7 +30,6 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use OCP\IUserManager; -use PDO; class AttachmentMapper extends DeckMapper implements IPermissionMapper { private $cardMapper; diff --git a/lib/Db/LabelMapper.php b/lib/Db/LabelMapper.php index 2dcf502c4..61ce03ed3 100644 --- a/lib/Db/LabelMapper.php +++ b/lib/Db/LabelMapper.php @@ -30,7 +30,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; class LabelMapper extends DeckMapper implements IPermissionMapper { - public function __construct(IDBConnection $db) { parent::__construct($db, 'deck_labels', Label::class); } @@ -180,11 +179,11 @@ class LabelMapper extends DeckMapper implements IPermissionMapper { $qb = $this->db->getQueryBuilder(); $qb->select('l.id') ->from($this->getTableName(), 'l') - ->innerJoin('l', 'deck_boards' , 'b', 'l.board_id = b.id') + ->innerJoin('l', 'deck_boards', 'b', 'l.board_id = b.id') ->where($qb->expr()->eq('l.id', $qb->createNamedParameter($labelId, IQueryBuilder::PARAM_INT))) ->andWhere($qb->expr()->eq('b.owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR))); - return count($qb->executeQuery()->fetchAll()) > 0; + return count($qb->executeQuery()->fetchAll()) > 0; } /** diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php index 66e3b0689..1ae59dd1b 100644 --- a/lib/Db/StackMapper.php +++ b/lib/Db/StackMapper.php @@ -137,7 +137,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper { ->where($qb->expr()->eq('s.id', $qb->createNamedParameter($stackId, IQueryBuilder::PARAM_INT))) ->andWhere($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR))); - return count($qb->executeQuery()->fetchAll()) > 0; + return count($qb->executeQuery()->fetchAll()) > 0; } /** diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php index 4e833d94e..f4c95fb66 100644 --- a/lib/Service/LabelService.php +++ b/lib/Service/LabelService.php @@ -91,12 +91,12 @@ class LabelService { $this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE); $boardLabels = $this->labelMapper->findAll($boardId); - foreach ($boardLabels as $boardLabel) { - if ($boardLabel->getTitle() === $title) { - throw new BadRequestException('title must be unique'); - break; - } - } + foreach ($boardLabels as $boardLabel) { + if ($boardLabel->getTitle() === $title) { + throw new BadRequestException('title must be unique'); + break; + } + } if ($this->boardService->isArchived(null, $boardId)) { throw new StatusException('Operation not allowed. This board is archived.'); @@ -161,15 +161,15 @@ class LabelService { $label = $this->find($id); $boardLabels = $this->labelMapper->findAll($label->getBoardId()); - foreach ($boardLabels as $boardLabel) { - if ($boardLabel->getId() === $label->getId()) { - continue; - } - if ($boardLabel->getTitle() === $title) { - throw new BadRequestException('title must be unique'); - break; - } - } + foreach ($boardLabels as $boardLabel) { + if ($boardLabel->getId() === $label->getId()) { + continue; + } + if ($boardLabel->getTitle() === $title) { + throw new BadRequestException('title must be unique'); + break; + } + } if ($this->boardService->isArchived($this->labelMapper, $id)) { throw new StatusException('Operation not allowed. This board is archived.');