Merge pull request #2334 from nextcloud/enh/nc-32

Support nextcloud 32

Author: marcelklehr

.github/workflows/floccus.yml

@@ -87,7 +87,7 @@ jobs:
       matrix:
         node-version: [20.x]
         npm-version: [10.x]
-        server-version: ['30']
+        server-version: ['32']
         floccus-branch: ['master', 'develop']
         floccus-adapter:
           - nextcloud-bookmarks
@@ -156,7 +156,7 @@ jobs:
           path: ./
 
       - name: Checkout bookmarks app
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ${{ env.APP_NAME }}
 

.github/workflows/repair.yml

@@ -17,16 +17,31 @@ permissions:
   contents: read
 
 jobs:
+  matrix:
+    runs-on: ubuntu-latest-low
+    outputs:
+      php-version: ${{ steps.versions.outputs.php-available-list }}
+      server-max: ${{ steps.versions.outputs.branches-max-list }}
+    steps:
+      - name: Checkout app
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Get version matrix
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
+
   php:
     runs-on: ubuntu-latest
 
+    needs: [matrix]
+
     strategy:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master', 'stable31', 'stable30']
+        php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
+        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
 
     name: Repair step on ${{ matrix.databases }}-${{ matrix.server-versions }}
 

.github/workflows/upgrade.yml

@@ -24,10 +24,10 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable30', 'stable31', 'master']
-        prev-version: ['stable14', 'stable']
+        server-versions: ['stable32', 'master']
+        prev-version: ['stable']
 
     name: Update from ${{ matrix.prev-version }} on ${{ matrix.databases }}-${{ matrix.server-versions }}
 

CHANGELOG.md

@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 * fix(FolderService): Always make sure description is set
-* chore: Update nextcloud/vue Marcel Klehr 2 minutes ago
+* chore: Update nextcloud/vue
 * fix(UNDELETE_FOLDER): Make sure to reload childrenOrder of -1
 * fix(BookmarkMapper): Fix duplicated filter
 * fix(CopyDialog): Fix onSubmit action

appinfo/info.xml

@@ -23,7 +23,7 @@ Requirements:
    - mbstring: *
  - when using MySQL, use at least v8.0
 ]]></description>
-	<version>15.2.0</version>
+	<version>16.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author mail="mklehr@gmx.net" homepage="https://marcelklehr.de">Marcel Klehr</author>
 	<author mail="blizzz@arthur-schiwon.de" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>
@@ -42,7 +42,7 @@ Requirements:
 		<database>pgsql</database>
 		<lib>intl</lib>
 		<lib>mbstring</lib>
-		<nextcloud min-version="30" max-version="31" />
+		<nextcloud min-version="32" max-version="32" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job>

composer.json

@@ -12,7 +12,7 @@
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5.26",
-		"nextcloud/coding-standard": "^1.0.0",
+		"nextcloud/coding-standard": "1.x",
 		"vimeo/psalm": "6.x",
 		"nextcloud/ocp": "dev-master"
 	},

lib/Db/TreeMapper.php

@@ -1065,13 +1065,13 @@ public function countBookmarksInFolder(int $folderId): int {
 	 */
 	public function getChildren(int $folderId, int $layers = 0): array {
 		$children = $this->treeCache->get(TreeCacheManager::CATEGORY_CHILDREN, TreeMapper::TYPE_FOLDER, $folderId);
-		if ($children !== null) {
+		if ($children !== null && is_array($children)) {
 			return $children;
 		}
 
 		$children = $this->treeCache->get(TreeCacheManager::CATEGORY_CHILDREN_LAYER, TreeMapper::TYPE_FOLDER, $folderId);
 
-		if ($children === null) {
+		if ($children === null || !is_array($children)) {
 			$qb = $this->getChildrenQuery[TreeMapper::TYPE_BOOKMARK];
 			$this->selectFromType(TreeMapper::TYPE_BOOKMARK, ['t.index', 't.type'], $qb);
 			$qb->setParameter('parent_folder', $folderId);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "bookmarks",
-  "version": "15.2.0",
+  "version": "16.0.0",
   "main": "js/index.js",
   "scripts": {
     "build": "webpack --node-env production --progress --config webpack.js",

package.json

@@ -26,7 +26,7 @@
 					@click="onClick">
 					<template #icon>
 						<span v-if="bookmark.preliminary" class="icon-loading-small bookmark__icon" />
-						<BookmarksIcon v-else-if="!iconLoaded" :size="20" class="bookmark__icon" />
+						<StarIcon v-else-if="!iconLoaded" :size="20" class="bookmark__icon" />
 						<figure v-else
 							class="bookmark__icon"
 							:style="{ backgroundImage: iconImage }" />
@@ -138,7 +138,7 @@
 <script>
 import Item from './Item.vue'
 import { NcActionButton, NcActionCheckbox, NcPopover } from '@nextcloud/vue'
-import { Hotness, HotnessZero, FolderIcon, UndeleteIcon, DeleteForeverIcon, FolderPlusIcon, FolderMoveIcon, ContentCopyIcon, PencilIcon, InformationVariantIcon, DeleteIcon, BookmarksIcon } from './Icons.js'
+import { Hotness, HotnessZero, FolderIcon, UndeleteIcon, DeleteForeverIcon, FolderPlusIcon, FolderMoveIcon, ContentCopyIcon, PencilIcon, InformationVariantIcon, DeleteIcon, StarIcon } from './Icons.js'
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateUrl } from '@nextcloud/router'
 import { actions, mutations } from '../store/index.js'
@@ -159,7 +159,7 @@ export default {
 		DeleteIcon,
 		DeleteForeverIcon,
 		UndeleteIcon,
-		BookmarksIcon,
+		StarIcon,
 		NcPopover,
 		Hotness,
 		HotnessZero,