@@ -25,12 +25,8 @@ |
||
| 25 | 25 | namespace OCA\Deck\Controller; |
| 26 | 26 | |
| 27 | 27 | use OCP\AppFramework\ApiController; |
| 28 | -use OCP\AppFramework\Http; |
|
| 29 | 28 | use OCP\AppFramework\Http\DataResponse; |
| 30 | 29 | use OCP\IRequest; |
| 31 | -use OCP\IUserManager; |
|
| 32 | -use OCP\IGroupManager; |
|
| 33 | - |
|
| 34 | 30 | use OCA\Deck\Service\BoardService; |
| 35 | 31 | |
| 36 | 32 | /** |
@@ -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(); |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | |
| 142 | 142 | /** |
| 143 | 143 | * @param $boardId |
| 144 | - * @return bool |
|
| 144 | + * @return boolean|null |
|
| 145 | 145 | */ |
| 146 | 146 | public function userIsBoardOwner($boardId) { |
| 147 | 147 | try { |
@@ -31,8 +31,6 @@ |
||
| 31 | 31 | use OCA\Deck\Db\StackMapper; |
| 32 | 32 | use OCA\Deck\StatusException; |
| 33 | 33 | use OCA\Deck\BadRequestException; |
| 34 | -use OCP\ICache; |
|
| 35 | -use OCP\ICacheFactory; |
|
| 36 | 34 | |
| 37 | 35 | |
| 38 | 36 | class StackService { |
@@ -183,7 +183,7 @@ |
||
| 183 | 183 | */ |
| 184 | 184 | public function delete($id) { |
| 185 | 185 | |
| 186 | - if ( is_numeric($id) === false ) { |
|
| 186 | + if (is_numeric($id) === false) { |
|
| 187 | 187 | throw new BadRequestException('stack id must be a number'); |
| 188 | 188 | } |
| 189 | 189 | |
@@ -33,10 +33,10 @@ |
||
| 33 | 33 | use OCA\Deck\Service\CardService; |
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | - * Class BoardApiController |
|
| 37 | - * |
|
| 38 | - * @package OCA\Deck\Controller |
|
| 39 | - */ |
|
| 36 | + * Class BoardApiController |
|
| 37 | + * |
|
| 38 | + * @package OCA\Deck\Controller |
|
| 39 | + */ |
|
| 40 | 40 | class CardApiController extends ApiController { |
| 41 | 41 | private $cardService; |
| 42 | 42 | private $userId; |
@@ -24,12 +24,8 @@ |
||
| 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 | - |
|
| 31 | - use OCA\Deck\Service\BoardService; |
|
| 32 | - use OCA\Deck\Service\StackService; |
|
| 33 | 29 | use OCA\Deck\Service\CardService; |
| 34 | 30 | |
| 35 | 31 | /** |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | public function assignUser($userId) { |
| 146 | - $card = $this->cardService->assignUser($this->request->getParam('cardId'), $userId);; |
|
| 146 | + $card = $this->cardService->assignUser($this->request->getParam('cardId'), $userId); ; |
|
| 147 | 147 | return new DataResponse($card, HTTP::STATUS_OK); |
| 148 | 148 | } |
| 149 | 149 | |
@@ -31,76 +31,76 @@ |
||
| 31 | 31 | |
| 32 | 32 | class AttachmentApiController extends ApiController { |
| 33 | 33 | |
| 34 | - private $attachmentService; |
|
| 34 | + private $attachmentService; |
|
| 35 | 35 | |
| 36 | - public function __construct($appName, IRequest $request, AttachmentService $attachmentService) { |
|
| 37 | - parent::__construct($appName, $request); |
|
| 38 | - $this->attachmentService = $attachmentService; |
|
| 39 | - } |
|
| 36 | + public function __construct($appName, IRequest $request, AttachmentService $attachmentService) { |
|
| 37 | + parent::__construct($appName, $request); |
|
| 38 | + $this->attachmentService = $attachmentService; |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - /** |
|
| 41 | + /** |
|
| 42 | 42 | * @NoAdminRequired |
| 43 | 43 | * @CORS |
| 44 | 44 | * @NoCSRFRequired |
| 45 | 45 | * |
| 46 | 46 | */ |
| 47 | - public function getAll() { |
|
| 48 | - $attachment = $this->attachmentService->findAll($this->request->getParam('cardId')); |
|
| 49 | - return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 50 | - } |
|
| 47 | + public function getAll() { |
|
| 48 | + $attachment = $this->attachmentService->findAll($this->request->getParam('cardId')); |
|
| 49 | + return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - /** |
|
| 52 | + /** |
|
| 53 | 53 | * @NoAdminRequired |
| 54 | 54 | * @CORS |
| 55 | 55 | * @NoCSRFRequired |
| 56 | 56 | * |
| 57 | 57 | */ |
| 58 | - public function display() { |
|
| 59 | - $attachment = $this->attachmentService->display($this->request->getParam('cardId'), $this->request->getParam('attachmentId')); |
|
| 60 | - return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 61 | - } |
|
| 58 | + public function display() { |
|
| 59 | + $attachment = $this->attachmentService->display($this->request->getParam('cardId'), $this->request->getParam('attachmentId')); |
|
| 60 | + return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 63 | + /** |
|
| 64 | 64 | * @NoAdminRequired |
| 65 | 65 | * @CORS |
| 66 | 66 | * @NoCSRFRequired |
| 67 | 67 | * |
| 68 | 68 | */ |
| 69 | - public function create($type, $data) { |
|
| 70 | - $attachment = $this->attachmentService->create($this->request->getParam('cardId'), $type, $data); |
|
| 71 | - return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 72 | - } |
|
| 69 | + public function create($type, $data) { |
|
| 70 | + $attachment = $this->attachmentService->create($this->request->getParam('cardId'), $type, $data); |
|
| 71 | + return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 74 | + /** |
|
| 75 | 75 | * @NoAdminRequired |
| 76 | 76 | * @CORS |
| 77 | 77 | * @NoCSRFRequired |
| 78 | 78 | * |
| 79 | 79 | */ |
| 80 | - public function update($data) { |
|
| 81 | - $attachment = $this->attachmentService->update($this->request->getParam('cardId'), $this->request->getParam('attachmentId'), $data); |
|
| 82 | - return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 83 | - } |
|
| 80 | + public function update($data) { |
|
| 81 | + $attachment = $this->attachmentService->update($this->request->getParam('cardId'), $this->request->getParam('attachmentId'), $data); |
|
| 82 | + return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - /** |
|
| 85 | + /** |
|
| 86 | 86 | * @NoAdminRequired |
| 87 | 87 | * @CORS |
| 88 | 88 | * @NoCSRFRequired |
| 89 | 89 | * |
| 90 | 90 | */ |
| 91 | - public function delete() { |
|
| 92 | - $attachment = $this->attachmentService->delete($this->request->getParam('cardId'), $this->request->getParam('attachmentId')); |
|
| 93 | - return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 94 | - } |
|
| 91 | + public function delete() { |
|
| 92 | + $attachment = $this->attachmentService->delete($this->request->getParam('cardId'), $this->request->getParam('attachmentId')); |
|
| 93 | + return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - /** |
|
| 96 | + /** |
|
| 97 | 97 | * @NoAdminRequired |
| 98 | 98 | * @CORS |
| 99 | 99 | * @NoCSRFRequired |
| 100 | 100 | * |
| 101 | 101 | */ |
| 102 | - public function restore() { |
|
| 103 | - $attachment = $this->attachmentService->restore($this->request->getParam('cardId'), $this->request->getParam('attachmentId')); |
|
| 104 | - return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 105 | - } |
|
| 102 | + public function restore() { |
|
| 103 | + $attachment = $this->attachmentService->restore($this->request->getParam('cardId'), $this->request->getParam('attachmentId')); |
|
| 104 | + return new DataResponse($attachment, HTTP::STATUS_OK); |
|
| 105 | + } |
|
| 106 | 106 | } |
| 107 | 107 | \ No newline at end of file |
@@ -112,6 +112,6 @@ |
||
| 112 | 112 | ['name' => 'attachment_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'DELETE'], |
| 113 | 113 | ['name' => 'attachment_api#restore', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}/restore', 'verb' => 'PUT'], |
| 114 | 114 | |
| 115 | - ['name' => 'board_api#preflighted_cors', 'url' => '/api/v1.0/{path}','verb' => 'OPTIONS', 'requirements' => ['path' => '.+']], |
|
| 115 | + ['name' => 'board_api#preflighted_cors', 'url' => '/api/v1.0/{path}', 'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']], |
|
| 116 | 116 | ] |
| 117 | 117 | ]; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | private $config; |
| 41 | 41 | private $l10n; |
| 42 | 42 | |
| 43 | - public function __construct( |
|
| 43 | + public function __construct( |
|
| 44 | 44 | IL10N $l10n, |
| 45 | 45 | BoardMapper $boardMapper, |
| 46 | 46 | BoardService $boardService, |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $this->config = $config; |
| 56 | 56 | $this->boardMapper = $boardMapper; |
| 57 | 57 | $this->l10n = $l10n; |
| 58 | - } |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | 60 | /** |
| 61 | 61 | * @param $userId |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | return false; |
| 76 | - } |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | 78 | /** |
| 79 | 79 | * @param $title |
@@ -100,9 +100,9 @@ discard block |
||
| 100 | 100 | throw new BadRequestException('color must be provided'); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - $defaultBoard = $this->boardService->create($title, $userId, $color); |
|
| 104 | - $defaultStacks = []; |
|
| 105 | - $defaultCards = []; |
|
| 103 | + $defaultBoard = $this->boardService->create($title, $userId, $color); |
|
| 104 | + $defaultStacks = []; |
|
| 105 | + $defaultCards = []; |
|
| 106 | 106 | |
| 107 | 107 | $boardId = $defaultBoard->getId(); |
| 108 | 108 | |
@@ -115,5 +115,5 @@ discard block |
||
| 115 | 115 | $defaultCards[] = $this->cardService->create($this->l10n->t('Example Task 1'), $defaultStacks[2]->getId(), 'text', 0, $userId); |
| 116 | 116 | |
| 117 | 117 | return $defaultBoard; |
| 118 | - } |
|
| 118 | + } |
|
| 119 | 119 | } |
| 120 | 120 | \ No newline at end of file |