Skip to content

chore(deps): update dependency nextcloud/coding-standard to ^v1.4.0 #1846

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.

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

Merged
merged 2 commits into from
Jun 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require-dev": {
"nextcloud/coding-standard": "^v1.3.2",
"nextcloud/coding-standard": "^v1.4.0",
"nextcloud/ocp": "dev-stable29",
"staabm/annotate-pull-request-from-checkstyle": "^1.8.5",
"phpunit/phpunit": "^9",
Expand Down
19 changes: 11 additions & 8 deletions composer.lock

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

4 changes: 2 additions & 2 deletions lib/BackgroundJob/ConvertViewColumnsFormat.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ public function __construct(

public function run($argument) {
$qb = $this->connection->getQueryBuilder();

// Get all views that need processing
$qb->select('id', 'columns')
->from('tables_views')
->where($qb->expr()->isNotNull('columns'));

$result = $qb->executeQuery();

// Predefine update query
$updateQb = $this->connection->getQueryBuilder();
$updateQb->update('tables_views')
Expand Down
6 changes: 3 additions & 3 deletions lib/Db/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function __construct() {
* @return int[]
*/
public function getColumnsArray(): array {

$columnSettings = $this->getColumnsSettingsArray();
usort($columnSettings, function ($a, $b) {
return $a['order'] - $b['order'];
Expand All @@ -102,11 +102,11 @@ public function getColumnsSettingsArray(): array {
if (empty($columns)) {
return [];
}

if (is_array(reset($columns))) {
return $columns;
}

$result = [];
foreach ($columns as $index => $columnId) {
$result[] = [
Expand Down
6 changes: 3 additions & 3 deletions lib/Migration/Version000900Date20250408000000.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
class Version000900Date20250408000000 extends SimpleMigrationStep {
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
$schema = $schemaClosure();

if ($schema->hasTable('tables_row_sleeves')) {
$table = $schema->getTable('tables_row_sleeves');

// reverting "$table->addIndex(['id'])" done in Version000700Date20230916000000 since redundant
// as the id column is already the primary key and thus indexed
foreach ($table->getIndexes() as $index) {
Expand All @@ -29,7 +29,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
}
}
}

return $schema;
}
}
4 changes: 2 additions & 2 deletions lib/Service/ContextService.php
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,9 @@ protected function insertPage(Context $context): void {
$pageContent->setPageId($page->getId());
$pageContent->setNodeRelId($node['id']);
$pageContent->setOrder(10 * $i++);

$this->pageContentMapper->insert($pageContent);

$addedPage['content'][$pageContent->getId()] = $pageContent->jsonSerialize();
// the content is already embedded in the page
unset($addedPage['content'][$pageContent->getId()]['pageId']);
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/ViewService.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public function update(int $id, array $data, ?string $userId = null, bool $skipT
// we have to fetch the service here as ColumnService already depends on the ViewService, i.e. no DI
$columnService = \OCP\Server::get(ColumnService::class);
$columnIds = array_column(\json_decode($value, true), 'columnId');

$availableColumns = $columnService->findAllByTable($view->getTableId(), $view->getId(), $this->userId);
$availableColumns = array_map(static fn (Column $column) => $column->getId(), $availableColumns);
foreach ($columnIds as $columnId) {
Expand Down
Loading