fix(CI): cater to code style and static analysis

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
nextcloud · Mar 12, 2024 · d35bf13 · d35bf13
1 parent f45d956
commit d35bf13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lib/Controller/ContextController.php b/lib/Controller/ContextController.php
@@ -62,7 +62,7 @@ public function index(): DataResponse {
 	 * [api v2] Get information about the requests context
 	 *
 	 * @param int $contextId ID of the context
-	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND, array{message: string}, array{}>
 	 *
 	 * 200: returning the full context information
 	 * 404: context not found or not available anymore
@@ -88,7 +88,7 @@ public function show(int $contextId): DataResponse {
 	 * @param string $name Name of the context
 	 * @param string $iconName Material design icon name of the context
 	 * @param string $description Descriptive text of the context
-	 * @param array{id: int, type: int, permissions: int} $nodes optional nodes to be connected to this context
+	 * @param array{id: int, type: int, permissions: int}|array<empty> $nodes optional nodes to be connected to this context
 	 *
 	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
 	 *
@@ -111,7 +111,7 @@ public function create(string $name, string $iconName, string $description = '',
 	 * @param ?string $description provide this parameter to set a new description
 	 * @param ?array{id: int, type: int, permissions: int, order: int} $nodes provide this parameter to set a new list of nodes.
 	 *
-	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND, array{message: string}, array{}>
 	 *
 	 * 200: returning the full context information
 	 * 403: No permissions
@@ -144,7 +144,7 @@ public function update(int $contextId, ?string $name, ?string $iconName, ?string
 	 * @param string $newOwnerId ID of the new owner
 	 * @param int $newOwnerType any Application::OWNER_TYPE_* constant
 	 *
-	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND|Http::STATUS_BAD_REQUEST, array{message: string}, array{}>
 	 *
 	 * 200: Ownership transferred
 	 * 400: Invalid request
@@ -178,7 +178,7 @@ public function transfer(int $contextId, string $newOwnerId, int $newOwnerType =
 	 * @param int $permissions bitmask of the permissions for context recipients
 	 * @param ?int $order in which order the node should appear within the context
 	 *
-	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND, array{message: string}, array{}>
 	 *
 	 * 200: Node added successfully
 	 * 403: No permissions
@@ -208,7 +208,7 @@ public function addNode(int $contextId, int $nodeId, int $nodeType, int $permiss
 	 * @param int $contextId ID of the context
 	 * @param int $nodeRelId ID of the node-in-context relation
 	 *
-	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND|Http::STATUS_BAD_REQUEST, array{message: string}, array{}>
 	 *
 	 * 200: Node removed successfully
 	 * 403: No permissions
@@ -245,7 +245,7 @@ public function removeNode(int $contextId, int $nodeRelId): DataResponse {
 	 * @param int $pageId ID of the page
 	 * @param array{id: int, order: int} $content content items with it and order values
 	 *
-	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND|Http::STATUS_BAD_REQUEST, array{message: string}, array{}>
 	 *
 	 * @NoAdminRequired
 	 * @CanManageContext

diff --git a/lib/Db/ContextMapper.php b/lib/Db/ContextMapper.php
@@ -6,8 +6,6 @@
 
 use OCA\Tables\Errors\NotFoundError;
 use OCA\Tables\Helper\UserHelper;
-use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\Exception;
 use OCP\DB\QueryBuilder\IQueryBuilder;