Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps-dev): Bump nextcloud/coding-standard from 1.2.1 to 1.2.3 #1445

Merged
merged 1 commit into from
Aug 28, 2024
Merged

chore(deps-dev): Bump nextcloud/coding-standard from 1.2.1 to 1.2.3 #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/BackgroundJob/IndexCollectives.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private function isOutdatedIndex(Collective $collective): bool {
}

try {
$folder = $this->collectiveFolderManager->getRootFolder()->get((string) $collective->getId());
$folder = $this->collectiveFolderManager->getRootFolder()->get((string)$collective->getId());
return $folder->getMTime() > $index->getMTime();
} catch (NotFoundException|InvalidPathException) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion lib/Command/PageTrashCleanup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$foundCollectiveName = null;
try {
$foundCollectiveName = $this->collectiveMapper->idToName($collective->getId(), null, true);
} catch (MissingDependencyException | NotFoundException | NotPermittedException) {
} catch (MissingDependencyException|NotFoundException|NotPermittedException) {
}

if ($foundCollectiveName === $collectiveName) {
Expand Down
16 changes: 8 additions & 8 deletions lib/Controller/CollectiveController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private function prepareResponse(Closure $callback): DataResponse {
#[NoAdminRequired]
public function index(): DataResponse {
return $this->prepareResponse(fn (): array => [
"data" => $this->service->getCollectivesWithShares($this->getUserId()),
'data' => $this->service->getCollectivesWithShares($this->getUserId()),
]);
}

Expand All @@ -66,8 +66,8 @@ public function create(string $name, ?string $emoji = null): DataResponse {
$emoji,
);
return [
"data" => $collective,
"message" => $info,
'data' => $collective,
'message' => $info,
];
});
}
Expand All @@ -81,7 +81,7 @@ public function update(int $id, ?string $emoji = null): DataResponse {
$emoji
);
return [
"data" => $collective,
'data' => $collective,
];
});
}
Expand All @@ -96,7 +96,7 @@ public function editLevel(int $id, int $level): DataResponse {
Collective::editPermissions
);
return [
"data" => $collective,
'data' => $collective,
];
});
}
Expand All @@ -111,7 +111,7 @@ public function shareLevel(int $id, int $level): DataResponse {
Constants::PERMISSION_SHARE
);
return [
"data" => $collective,
'data' => $collective,
];
});
}
Expand All @@ -125,7 +125,7 @@ public function pageMode(int $id, int $mode): DataResponse {
$mode,
);
return [
"data" => $collective,
'data' => $collective,
];
});
}
Expand All @@ -135,7 +135,7 @@ public function trash(int $id): DataResponse {
return $this->prepareResponse(function () use ($id): array {
$collective = $this->service->trashCollective($id, $this->getUserId());
return [
"data" => $collective,
'data' => $collective,
];
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/ErrorHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected function handleErrorResponse(Closure $callback, ?LoggerInterface $logg
} catch (NotFoundException $e) {
$logger?->debug('Collectives App NotFound Error: ' . $e->getMessage(), ['exception' => $e]);
return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND);
} catch (CircleExistsException | QueryException | UnprocessableEntityException $e) {
} catch (CircleExistsException|QueryException|UnprocessableEntityException $e) {
$logger?->debug('Collectives App CircleExists Error: ' . $e->getMessage(), ['exception' => $e]);
return new DataResponse($e->getMessage(), Http::STATUS_UNPROCESSABLE_ENTITY);
} catch (InvalidArgumentException $e) {
Expand Down
24 changes: 12 additions & 12 deletions lib/Controller/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function index(int $collectiveId): DataResponse {
$userId = $this->getUserId();
$pageInfos = $this->service->findAll($collectiveId, $userId);
return [
"data" => $pageInfos
'data' => $pageInfos
];
}, $this->logger);
}
Expand All @@ -55,7 +55,7 @@ public function get(int $collectiveId, int $id): DataResponse {
$userId = $this->getUserId();
$pageInfo = $this->service->find($collectiveId, $id, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand All @@ -66,7 +66,7 @@ public function create(int $collectiveId, int $parentId, string $title): DataRes
$userId = $this->getUserId();
$pageInfo = $this->service->create($collectiveId, $parentId, $title, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand All @@ -77,7 +77,7 @@ public function touch(int $collectiveId, int $id): DataResponse {
$userId = $this->getUserId();
$pageInfo = $this->service->touch($collectiveId, $id, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand All @@ -94,7 +94,7 @@ public function contentSearch(int $collectiveId, string $searchString): DataResp
$pages[] = $this->service->find($collectiveId, $value['id'], $userId);
}
return [
"data" => $pages
'data' => $pages
];
}, $this->logger);
}
Expand All @@ -107,7 +107,7 @@ public function moveOrCopy(int $collectiveId, int $id, ?int $parentId = null, ?s
? $this->service->copy($collectiveId, $id, $parentId, $title, $index, $userId)
: $this->service->move($collectiveId, $id, $parentId, $title, $index, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand All @@ -132,7 +132,7 @@ public function setEmoji(int $collectiveId, int $id, ?string $emoji = null): Dat
$userId = $this->getUserId();
$pageInfo = $this->service->setEmoji($collectiveId, $id, $emoji, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand All @@ -143,7 +143,7 @@ public function setFullWidth(int $collectiveId, int $id, bool $fullWidth): DataR
$userId = $this->getUserId();
$pageInfo = $this->service->setFullWidth($collectiveId, $id, $userId, $fullWidth);
return [
"data" => $pageInfo,
'data' => $pageInfo,
];
}, $this->logger);
}
Expand All @@ -154,7 +154,7 @@ public function setSubpageOrder(int $collectiveId, int $id, ?string $subpageOrde
$userId = $this->getUserId();
$pageInfo = $this->service->setSubpageOrder($collectiveId, $id, $subpageOrder, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand All @@ -165,7 +165,7 @@ public function trash(int $collectiveId, int $id): DataResponse {
$userId = $this->getUserId();
$pageInfo = $this->service->trash($collectiveId, $id, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand All @@ -176,7 +176,7 @@ public function getAttachments(int $collectiveId, int $id): DataResponse {
$userId = $this->getUserId();
$attachments = $this->attachmentService->getAttachments($collectiveId, $id, $userId);
return [
"data" => $attachments
'data' => $attachments
];
}, $this->logger);
}
Expand All @@ -187,7 +187,7 @@ public function getBacklinks(int $collectiveId, int $id): DataResponse {
$userId = $this->getUserId();
$backlinks = $this->service->getBacklinks($collectiveId, $id, $userId);
return [
"data" => $backlinks
'data' => $backlinks
];
}, $this->logger);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/PageTrashController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function index(int $collectiveId): DataResponse {
$userId = $this->getUserId();
$pageInfos = $this->service->findAllTrash($collectiveId, $userId);
return [
"data" => $pageInfos
'data' => $pageInfos
];
}, $this->logger);
}
Expand All @@ -52,7 +52,7 @@ public function restore(int $collectiveId, int $id): DataResponse {
$userId = $this->getUserId();
$pageInfo = $this->service->restore($collectiveId, $id, $userId);
return [
"data" => $pageInfo
'data' => $pageInfo
];
}, $this->logger);
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Controller/PublicCollectiveController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected function getPasswordHash(): string {
public function isValidToken(): bool {
try {
$this->collectiveShareMapper->findOneByToken($this->getToken());
} catch (DoesNotExistException | MultipleObjectsReturnedException) {
} catch (DoesNotExistException|MultipleObjectsReturnedException) {
return false;
}

Expand All @@ -81,7 +81,7 @@ public function get(): DataResponse {
return $this->prepareResponse(function (): array {
try {
$share = $this->collectiveShareMapper->findOneByToken($this->getToken());
} catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
} catch (DoesNotExistException|MultipleObjectsReturnedException $e) {
throw new NotFoundException('Failed to get shared collective', 0, $e);
}
$collective = $this->service->getCollectiveWithShare($share->getCollectiveId(),
Expand All @@ -90,7 +90,7 @@ public function get(): DataResponse {
// Explicitly set member level
$collective->setLevel(Member::LEVEL_MEMBER);
return [
"data" => [$collective],
'data' => [$collective],
];
});
}
Expand Down
Loading
Loading