@@ -63,7 +63,7 @@ |
||
63 | 63 | * Check if user exists before assigning it to a card |
64 | 64 | * |
65 | 65 | * @param Entity $entity |
66 | - * @return null|Entity |
|
66 | + * @return AssignedUsers|null |
|
67 | 67 | */ |
68 | 68 | public function insert(Entity $entity) { |
69 | 69 | $user = $this->userManager->get($entity->getParticipant()); |
@@ -163,7 +163,7 @@ |
||
163 | 163 | * @param $cardId |
164 | 164 | * @param $attachmentId |
165 | 165 | * @param $request |
166 | - * @return mixed |
|
166 | + * @return \OCP\AppFramework\Db\Entity |
|
167 | 167 | * @throws \OCA\Deck\NoPermissionException |
168 | 168 | * @throws \OCP\AppFramework\Db\DoesNotExistException |
169 | 169 | * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException |
@@ -99,16 +99,16 @@ |
||
99 | 99 | $data = []; |
100 | 100 | foreach ($boards as $board) { |
101 | 101 | $fullBoard = $this->boardMapper->find($board->getId(), true, true); |
102 | - $data[$board->getId()] = (array)$fullBoard->jsonSerialize(); |
|
102 | + $data[$board->getId()] = (array) $fullBoard->jsonSerialize(); |
|
103 | 103 | $stacks = $this->stackMapper->findAll($board->getId()); |
104 | 104 | foreach ($stacks as $stack) { |
105 | - $data[$board->getId()]['stacks'][] = (array)$stack->jsonSerialize(); |
|
105 | + $data[$board->getId()]['stacks'][] = (array) $stack->jsonSerialize(); |
|
106 | 106 | $cards = $this->cardMapper->findAllByStack($stack->getId()); |
107 | 107 | foreach ($cards as $card) { |
108 | 108 | $fullCard = $this->cardMapper->find($card->getId()); |
109 | 109 | $assignedUsers = $this->assignedUsersMapper->find($card->getId()); |
110 | 110 | $fullCard->setAssignedUsers($assignedUsers); |
111 | - $data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = (array)$fullCard->jsonSerialize(); |
|
111 | + $data[$board->getId()]['stacks'][$stack->getId()]['cards'][] = (array) $fullCard->jsonSerialize(); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | } |
@@ -23,15 +23,11 @@ |
||
23 | 23 | |
24 | 24 | namespace OCA\Deck\Service; |
25 | 25 | |
26 | -use OC\Security\CSP\ContentSecurityPolicyManager; |
|
27 | 26 | use OCA\Deck\Db\Attachment; |
28 | 27 | use OCA\Deck\StatusException; |
29 | 28 | use OCP\AppFramework\Http\ContentSecurityPolicy; |
30 | -use OCP\AppFramework\Http\EmptyContentSecurityPolicy; |
|
31 | 29 | use OCP\AppFramework\Http\FileDisplayResponse; |
32 | 30 | use OCP\AppFramework\Http\StreamResponse; |
33 | -use OCP\Files\Cache\IScanner; |
|
34 | -use OCP\Files\Folder; |
|
35 | 31 | use OCP\Files\IAppData; |
36 | 32 | use OCP\Files\IRootFolder; |
37 | 33 | use OCP\Files\NotFoundException; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @throws NotPermittedException |
86 | 86 | */ |
87 | 87 | private function getFolder(Attachment $attachment) { |
88 | - $folderName = 'file-card-' . (int)$attachment->getCardId(); |
|
88 | + $folderName = 'file-card-' . (int) $attachment->getCardId(); |
|
89 | 89 | try { |
90 | 90 | $folder = $this->appData->getFolder($folderName); |
91 | 91 | } catch (NotFoundException $e) { |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | * @return array |
117 | 117 | * @throws StatusException |
118 | 118 | */ |
119 | - private function getUploadedFile () { |
|
119 | + private function getUploadedFile() { |
|
120 | 120 | $file = $this->request->getUploadedFile('file'); |
121 | 121 | $error = null; |
122 | 122 | $phpFileUploadErrors = [ |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | * @throws \Exception |
191 | 191 | */ |
192 | 192 | private function getFileFromRootFolder(Attachment $attachment) { |
193 | - $folderName = 'file-card-' . (int)$attachment->getCardId(); |
|
193 | + $folderName = 'file-card-' . (int) $attachment->getCardId(); |
|
194 | 194 | $instanceId = $this->config->getSystemValue('instanceid', null); |
195 | 195 | if ($instanceId === null) { |
196 | 196 | throw new \Exception('no instance id!'); |
@@ -32,10 +32,10 @@ |
||
32 | 32 | use OCA\Deck\Controller\Helper\ApiHelper; |
33 | 33 | |
34 | 34 | /** |
35 | - * Class BoardApiController |
|
36 | - * |
|
37 | - * @package OCA\Deck\Controller |
|
38 | - */ |
|
35 | + * Class BoardApiController |
|
36 | + * |
|
37 | + * @package OCA\Deck\Controller |
|
38 | + */ |
|
39 | 39 | class LabelApiController extends ApiController { |
40 | 40 | |
41 | 41 | private $labelService; |
@@ -67,14 +67,14 @@ discard block |
||
67 | 67 | |
68 | 68 | $cursor = $qb->execute(); |
69 | 69 | $row = $cursor->fetch(PDO::FETCH_ASSOC); |
70 | - if($row === false) { |
|
70 | + if ($row === false) { |
|
71 | 71 | $cursor->closeCursor(); |
72 | 72 | throw new DoesNotExistException('Did expect one result but found none when executing' . $qb); |
73 | 73 | } |
74 | 74 | |
75 | 75 | $row2 = $cursor->fetch(); |
76 | 76 | $cursor->closeCursor(); |
77 | - if($row2 !== false ) { |
|
77 | + if ($row2 !== false) { |
|
78 | 78 | throw new MultipleObjectsReturnedException('Did not expect more than one result when executing' . $query); |
79 | 79 | } |
80 | 80 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | $entities = []; |
99 | 99 | $cursor = $qb->execute(); |
100 | - while($row = $cursor->fetch()){ |
|
100 | + while ($row = $cursor->fetch()) { |
|
101 | 101 | $entities[] = $this->mapRowToEntity($row); |
102 | 102 | } |
103 | 103 | $cursor->closeCursor(); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | |
128 | 128 | $entities = []; |
129 | 129 | $cursor = $qb->execute(); |
130 | - while($row = $cursor->fetch()){ |
|
130 | + while ($row = $cursor->fetch()) { |
|
131 | 131 | $entities[] = $this->mapRowToEntity($row); |
132 | 132 | } |
133 | 133 | $cursor->closeCursor(); |
@@ -136,6 +136,9 @@ |
||
136 | 136 | return parent::delete($entity); |
137 | 137 | } |
138 | 138 | |
139 | + /** |
|
140 | + * @param integer $stackId |
|
141 | + */ |
|
139 | 142 | public function deleteByStack($stackId) { |
140 | 143 | $cards = $this->findAllByStack($stackId); |
141 | 144 | foreach ($cards as $card) { |
@@ -24,7 +24,6 @@ |
||
24 | 24 | namespace OCA\Deck\Controller; |
25 | 25 | |
26 | 26 | use OCP\AppFramework\ApiController; |
27 | - use OCP\AppFramework\Http; |
|
28 | 27 | use OCP\AppFramework\Http\DataResponse; |
29 | 28 | use OCP\IRequest; |
30 | 29 | use OCA\Deck\Service\CardService; |
@@ -31,10 +31,10 @@ |
||
31 | 31 | use OCA\Deck\Service\CardService; |
32 | 32 | |
33 | 33 | /** |
34 | - * Class BoardApiController |
|
35 | - * |
|
36 | - * @package OCA\Deck\Controller |
|
37 | - */ |
|
34 | + * Class BoardApiController |
|
35 | + * |
|
36 | + * @package OCA\Deck\Controller |
|
37 | + */ |
|
38 | 38 | class CardApiController extends ApiController { |
39 | 39 | private $cardService; |
40 | 40 | private $userId; |
@@ -147,7 +147,7 @@ |
||
147 | 147 | * Assign a user to a card |
148 | 148 | */ |
149 | 149 | public function assignUser($userId) { |
150 | - $card = $this->cardService->assignUser($this->request->getParam('cardId'), $userId);; |
|
150 | + $card = $this->cardService->assignUser($this->request->getParam('cardId'), $userId); ; |
|
151 | 151 | return new DataResponse($card, HTTP::STATUS_OK); |
152 | 152 | } |
153 | 153 |
@@ -45,6 +45,9 @@ |
||
45 | 45 | return $this->findEntity($sql, [$id]); |
46 | 46 | } |
47 | 47 | |
48 | + /** |
|
49 | + * @param string $sql |
|
50 | + */ |
|
48 | 51 | protected function execute($sql, array $params = [], $limit = null, $offset = null) { |
49 | 52 | return parent::execute($sql, $params, $limit, $offset); |
50 | 53 | } |