fix(settings): Improve TaskProcessingPickupSpeed setup check

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

.eslintignore

@@ -1,14 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
-# Ignoring folders for eslint
-node_modules/
-3rdparty/
-**/vendor/
-**/l10n/
-**/js/*
-*.config.js
-tests/lib/
-apps-extra
-
-# TODO: remove when comments files is not using handlebar templates anymore
-apps/comments/src/templates.js

.eslintrc.js

@@ -1,60 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-module.exports = {
-	globals: {
-		__webpack_nonce__: true,
-		_: true,
-		$: true,
-		dayNames: true,
-		escapeHTML: true,
-		firstDay: true,
-		moment: true,
-		oc_userconfig: true,
-		sinon: true,
-	},
-	plugins: [
-		'cypress',
-	],
-	extends: [
-		'@nextcloud/eslint-config/typescript',
-		'plugin:cypress/recommended',
-	],
-	rules: {
-		'comma-dangle': 'error',
-		'no-tabs': 'warn',
-		// TODO: make sure we fix this as this is bad vue coding style.
-		// Use proper sync modifier
-		'vue/no-mutating-props': 'warn',
-		'vue/custom-event-name-casing': ['error', 'kebab-case', {
-			// allows custom xxxx:xxx events formats
-			ignores: ['/^[a-z]+(?:-[a-z]+)*:[a-z]+(?:-[a-z]+)*$/u'],
-		}],
-		'vue/html-self-closing': 'error',
-	},
-	settings: {
-		jsdoc: {
-			mode: 'typescript',
-		},
-		'import/resolver': {
-			typescript: {}, // this loads <rootdir>/tsconfig.json to eslint
-		},
-	},
-	overrides: [
-		// Allow any in tests
-		{
-			files: ['**/*.spec.ts'],
-			rules: {
-				'@typescript-eslint/no-explicit-any': 'warn',
-			},
-		},
-		{
-			files: ['*.vue'],
-			rules: {
-				'no-irregular-whitespace': 'off',
-				'vue/no-irregular-whitespace': 'error',
-			},
-		},
-	],
-}

.git-blame-ignore-revs

@@ -19,3 +19,7 @@ af6de04e9e141466dc229e444ff3f146f4a34765
 b06f5ba4c47450f355a8903c1a93ac68e8c6cfc2
 # Update to coding-standard 1.4.0
 5981b7eb512aa411f51cad541d01c5c6e93476f0
+# Migrate `and` `or` operators to logical `&&` `||` operators
+660f3f6fd1ae5539b8f74bfa48859d1b9f1e6abf
+# Migrate to ESLint v9 enforced code style
+91f3b6b4ee60e0f8bb6e21f92d5bc52e4cebe657

.github/CODEOWNERS

@@ -15,8 +15,6 @@
 **/js                                         @nextcloud/server-frontend
 **/src                                        @nextcloud/server-frontend
 *.js                                          @nextcloud/server-frontend
-*.cjs                                         @nextcloud/server-frontend
-*.mjs                                         @nextcloud/server-frontend
 *.ts                                          @nextcloud/server-frontend
 
 # dependency management

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -71,9 +71,9 @@ body:
         Select Nextcloud Server version.
         _Versions not listed here are not maintained and not supported anymore_
       options:
-        - "29"
         - "30"
         - "31"
+        - "32"
         - "master"
     validations:
       required: true

.github/dependabot.yml

@@ -54,7 +54,7 @@ updates:
 # Latest stable release
 # Composer dependencies for linting and testing
 - package-ecosystem: composer
-  target-branch: stable31
+  target-branch: stable32
   directories:
     - "/"
     - "/build/integration"
@@ -78,7 +78,7 @@ updates:
 # Latest stable branch
 # frontend dependencies
 - package-ecosystem: npm
-  target-branch: stable31
+  target-branch: stable32
   directory: "/"
   schedule:
     interval: weekly
@@ -99,6 +99,28 @@ updates:
 # Older stable releases
 
 # Composer dependencies for linting and testing
+- package-ecosystem: composer
+  target-branch: stable31
+  directories:
+    - "/"
+    - "/build/integration"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:00"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  ignore:
+    # only patch updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
 - package-ecosystem: composer
   target-branch: stable30
   directories:
@@ -122,6 +144,25 @@ updates:
       update-types: ["version-update:semver-major", "version-update:semver-minor"]
 
 # frontend dependencies
+- package-ecosystem: npm
+  target-branch: stable31
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+  ignore:
+    # no major updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+
 - package-ecosystem: npm
   target-branch: stable30
   directory: "/"

.github/workflows/autocheckers.yml

@@ -46,7 +46,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
 
     name: PHP checkers
 
@@ -75,7 +75,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
 
     name: Translation and Files checkers
 

.github/workflows/codeql.yml

@@ -32,18 +32,16 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      with:
-        persist-credentials: false
+      uses: actions/checkout@v5
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
         config-file: ./.github/codeql-config.yml
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/command-compile.yml

@@ -124,7 +124,7 @@ jobs:
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.package-engines-versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.package-engines-versions.outputs.nodeVersion }}
           cache: npm

.github/workflows/cypress.yml

@@ -72,7 +72,7 @@ jobs:
           fallbackNpm: "^10"
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -163,7 +163,7 @@ jobs:
           path: ./
 
       - name: Set up node ${{ needs.init.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ needs.init.outputs.nodeVersion }}
 

.github/workflows/dependabot-approve-merge.yml

@@ -3,10 +3,10 @@
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 #
-# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: MIT
 
-name: Auto approve Dependabot PRs
+name: Dependabot
 
 on:
   pull_request_target: # zizmor: ignore[dangerous-triggers]
@@ -29,8 +29,6 @@ jobs:
     permissions:
       # for hmarr/auto-approve-action to approve PRs
       pull-requests: write
-      # for alexwilson/enable-github-automerge-action to approve PRs
-      contents: write
 
     steps:
       - name: Disabled on forks
@@ -39,20 +37,13 @@ jobs:
           echo 'Can not approve PRs from forks'
           exit 1
 
-      - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
-        id: branchname
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
       # GitHub actions bot approve
-      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
-        if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
+      - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      # Enable GitHub auto merge
-      - name: Auto merge
-        uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
-        if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
+      # Nextcloud bot approve and merge request
+      - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          target: minor
+          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/files-external-ftp.yml

@@ -45,10 +45,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.4']
+        php-versions: ['8.2', '8.4']
         ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
         include:
-          - php-versions: '8.1'
+          - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
 
     name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}

.github/workflows/files-external-s3.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2', '8.4']
+        php-versions: ['8.2', '8.4']
         include:
           - php-versions: '8.3'
             coverage: ${{ github.event_name != 'pull_request' }}
@@ -134,7 +134,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.4']
+        php-versions: ['8.2', '8.4']
         include:
           - php-versions: '8.3'
             coverage: ${{ github.event_name != 'pull_request' }}

.github/workflows/files-external-sftp.yml

@@ -45,10 +45,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.4']
+        php-versions: ['8.2', '8.4']
         sftpd: ['openssh']
         include:
-          - php-versions: '8.1'
+          - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
 
     name: php${{ matrix.php-versions }}-${{ matrix.sftpd }}

.github/workflows/files-external-smb-kerberos.yml

@@ -67,10 +67,10 @@ jobs:
       - name: Pull images
         run: |
           docker pull ghcr.io/icewind1991/samba-krb-test-dc
-          docker pull ghcr.io/icewind1991/samba-krb-test-apache
+          docker pull ghcr.io/icewind1991/samba-krb-test-apache-gssapi:8.4
           docker pull ghcr.io/icewind1991/samba-krb-test-client
           docker tag ghcr.io/icewind1991/samba-krb-test-dc icewind1991/samba-krb-test-dc
-          docker tag ghcr.io/icewind1991/samba-krb-test-apache icewind1991/samba-krb-test-apache
+          docker tag ghcr.io/icewind1991/samba-krb-test-apache-gssapi:8.4 icewind1991/samba-krb-test-apache-gssapi
           docker tag ghcr.io/icewind1991/samba-krb-test-client icewind1991/samba-krb-test-client
 
       - name: Setup AD-DC

.github/workflows/files-external-smb.yml

@@ -45,9 +45,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
         include:
-          - php-versions: '8.1'
+          - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
 
     name: php${{ matrix.php-versions }}-smb

.github/workflows/files-external-webdav.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2', '8.3', '8.4']
+        php-versions: ['8.3', '8.4']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}

.github/workflows/files-external.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2', '8.3', '8.4']
+        php-versions: ['8.3', '8.4']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}

.github/workflows/integration-dav.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         endpoint: ['old', 'new']
         service: ['CalDAV', 'CardDAV']
 

.github/workflows/integration-litmus.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         endpoint: ['webdav', 'dav']
 
     name: Litmus WebDAV ${{ matrix.endpoint }}

.github/workflows/integration-s3-primary.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         key: ['objectstore', 'objectstore_multibucket']
 
     name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio

.github/workflows/integration-sqlite.yml

@@ -62,7 +62,6 @@ jobs:
           - '--tags ~@large files_features'
           - 'filesdrop_features'
           - 'file_conversions'
-          - 'files_reminders'
           - 'openldap_features'
           - 'openldap_numerical_features'
           - 'ldap_features'
@@ -74,9 +73,9 @@ jobs:
           - 'theming_features'
           - 'videoverification_features'
 
-        php-versions: ['8.1']
-        spreed-versions: ['stable32']
-        activity-versions: ['stable32']
+        php-versions: ['8.4']
+        spreed-versions: ['main']
+        activity-versions: ['master']
 
     services:
       redis:
@@ -85,10 +84,9 @@ jobs:
         ports:
           - 6379:6379/tcp
       openldap:
-        image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-8 # zizmor: ignore[unpinned-images]
+        image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 # zizmor: ignore[unpinned-images]
         ports:
           - 389:389
-          - 636:636
         env:
           SLAPD_DOMAIN: nextcloud.ci
           SLAPD_ORGANIZATION: Nextcloud

.github/workflows/lint-eslint.yml

@@ -68,7 +68,7 @@ jobs:
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

.github/workflows/lint-php.yml

@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-versions: [ '8.2', '8.3', '8.4' ]
 
     name: php-lint
 

.github/workflows/lint-stylelint.yml

@@ -37,7 +37,7 @@ jobs:
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

.github/workflows/node-test.yml

@@ -90,7 +90,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ needs.versions.outputs.nodeVersion }}
 
@@ -130,7 +130,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ needs.versions.outputs.nodeVersion }}
 
@@ -160,7 +160,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ needs.versions.outputs.nodeVersion }}
 

.github/workflows/node.yml

@@ -68,7 +68,7 @@ jobs:
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

.github/workflows/npm-audit-fix.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable31', 'stable30']
+        branches: ['main', 'master', 'stable32', 'stable31', 'stable30']
 
     name: npm-audit-fix-${{ matrix.branches }}
 
@@ -45,7 +45,7 @@ jobs:
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

.github/workflows/object-storage-azure.yml

@@ -49,9 +49,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2']
+        php-versions: ['8.2', '8.3']
         include:
-          - php-versions: '8.3'
+          - php-versions: '8.4'
             coverage: true
 
     name: php${{ matrix.php-versions }}-azure

.github/workflows/object-storage-s3.yml

@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2']
+        php-versions: ['8.2']
         include:
           - php-versions: '8.3'
             coverage: true

.github/workflows/object-storage-swift.yml

@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2']
+        php-versions: ['8.2']
         include:
           - php-versions: '8.3'
             coverage: true

.github/workflows/openapi.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2.35.4
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib
           coverage: none
           ini-file: development

.github/workflows/performance.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
 
     name: performance-${{ matrix.php-versions }}
 
@@ -71,7 +71,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: before.json
-          profiler-branch: stable32
+          profiler-branch: master
 
       - name: Apply PR # zizmor: ignore[template-injection]
         run: |
@@ -93,7 +93,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: after.json
-          profiler-branch: stable32
+          profiler-branch: master
           compare-with: before.json
 
       - name: Upload profiles

.github/workflows/phpunit-32bits.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1','8.3']
+        php-versions: ['8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout server

.github/workflows/phpunit-mariadb.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         mariadb-versions: ['10.3', '10.6', '10.11', '11.4', '11.8']
         include:
           - php-versions: '8.3'

.github/workflows/phpunit-memcached.yml

@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.3', '8.4']
+        php-versions: ['8.3', '8.4']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}

.github/workflows/phpunit-mysql-sharding.yml

@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         mysql-versions: ['8.4']
 
     name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests

.github/workflows/phpunit-mysql.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         mysql-versions: ['8.0', '8.4']
         include:
           - mysql-versions: '8.0'

.github/workflows/phpunit-nodb.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.3', '8.4']
+        php-versions: ['8.3', '8.4']
         include:
           - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}

.github/workflows/phpunit-object-store-primary.yml

@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         key: ['s3', 's3-multibucket']
 
     name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio

.github/workflows/phpunit-oci.yml

@@ -61,9 +61,9 @@ jobs:
       matrix:
         include:
           - oracle-versions: '11'
-            php-versions: '8.1'
+            php-versions: '8.2'
           - oracle-versions: '18'
-            php-versions: '8.1'
+            php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
           - oracle-versions: '21'
             php-versions: '8.2'

.github/workflows/phpunit-pgsql.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         # To keep the matrix smaller we ignore PostgreSQL versions in between as we already test the minimum and the maximum
         postgres-versions: ['13', '17']
         include:

.github/workflows/phpunit-sqlite.yml

@@ -59,9 +59,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.3', '8.4']
         include:
-          - php-versions: '8.1'
+          - php-versions: '8.2'
             coverage: ${{ github.event_name != 'pull_request' }}
 
     name: SQLite (PHP ${{ matrix.php-versions }})

.github/workflows/stale.yml

@@ -20,7 +20,7 @@ jobs:
       issues: write
 
     steps:
-    - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
+    - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v9
       with:
         repo-token: ${{ secrets.COMMAND_BOT_PAT }}
         stale-issue-message: >

.github/workflows/static-code-analysis.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
@@ -67,7 +67,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           extensions: ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
 
@@ -102,7 +102,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
@@ -133,7 +133,7 @@ jobs:
       - name: Set up php
         uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:

.github/workflows/update-cacert-bundle.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['master', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
 
     name: update-ca-certificate-bundle-${{ matrix.branches }}
 

.github/workflows/update-code-signing-crl.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['master', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable32', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
 
     name: update-code-signing-crl-${{ matrix.branches }}
 

.mailmap

@@ -252,6 +252,7 @@ Michael Monreal <michael.monreal@gmail.com>
 Michael Roitzsch <reactorcontrol@icloud.com>
 michag86 <micha_g@arcor.de>
 Michiel de Jong <michiel@unhosted.org> Michiel@unhosted <michiel@unhosted.org>
+Micke Nordin <kano@sunet.se> Mikael Nordin <mickenordin@users.noreply.github.com>
 Miguel Prokop <miguel.prokop@vtu.com>
 miicha <pfitzner@physik.hu-berlin.de>
 Miquel Rodríguez Telep / Michael Rodríguez-Torrent <miquel@designunbound.co.uk>

.php-cs-fixer.dist.php

@@ -14,11 +14,14 @@ $config = new Config();
 $config
 	->setParallelConfig(ParallelConfigFactory::detect())
 	->getFinder()
-	->exclude('config')
-	->exclude('3rdparty')
-	->exclude('build/stubs')
-	->exclude('composer')
-	->in(__DIR__);
+	->in(__DIR__)
+	->exclude([
+		'3rdparty',
+		'build/stubs',
+		'composer',
+	])
+;
+
 
 $ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg(__DIR__));
 $ignoredEntries = explode("\n", $ignoredEntries);

AUTHORS

@@ -338,7 +338,6 @@
  - Mickey Knox <mickey@netfreaks.org>
  - Miguel Prokop <miguel.prokop@vtu.com>
  - Mikael Hammarin <mikael@try2.se>
- - Mikael Nordin <mickenordin@users.noreply.github.com>
  - Mikael Saarinen <mikaels@iki.fi>
  - Mikhail Sazanov <m@sazanof.ru>
  - Mitar <mitar.git@tnode.com>

README.md

@@ -5,13 +5,13 @@
 -->
 # Nextcloud Server ☁
 [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
-[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable32/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
 [![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
 
 **A safe home for all your data.**
 
-![](https://raw.githubusercontent.com/nextcloud/screenshots/stable32/nextcloud-hub-files-25-preview.png)
+![](https://raw.githubusercontent.com/nextcloud/screenshots/master/nextcloud-hub-files-25-preview.png)
 
 ## Why is this so awesome? 🤩
 
@@ -58,7 +58,7 @@ There are many ways to contribute, of which development is only one! Find out [h
 
 Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
 
-Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `stable32` and have to be installed manually by cloning them into the `apps` subfolder.
+Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `master` and have to be installed manually by cloning them into the `apps` subfolder.
 
 Otherwise, git checkouts can be handled the same as release archives, by using the `stable*` branches. Note they should never be used on production systems.
 

REUSE.toml

@@ -250,7 +250,7 @@ SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = "apps/dav/lib/ExampleContentFiles/exampleContact.vcf"
+path = ["apps/dav/lib/ExampleContentFiles/exampleContact.vcf", "tests/data/testvideo-remote-file.mp4", "tests/lib/AppFramework/Middleware/Mock/UseSessionController.php", "tests/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php", "tests/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -328,19 +328,19 @@ SPDX-FileCopyrightText = "2016-2024 Collabora Ltd."
 SPDX-License-Identifier = "LicenseRef-CollaboraTrademarks"
 
 [[annotations]]
-path = ["core/img/x.svg", "core/img/twitter.svg", "core/img/actions/twitter.svg", "apps/federatedfilesharing/img/social-twitter.svg"]
+path = ["core/img/x.svg", "core/img/x-dark.svg", "core/img/x-light.svg", "core/img/twitter.svg", "core/img/actions/twitter.svg", "apps/federatedfilesharing/img/social-twitter.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "X Corp."
 SPDX-License-Identifier = "LicenseRef-XTrademarks"
 
 [[annotations]]
-path = ["core/img/bluesky.svg", "core/img/actions/bluesky.svg"]
+path = ["core/img/bluesky.svg", "core/img/bluesky-light.svg", "core/img/actions/bluesky.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2012-2024 Fonticons, Inc."
 SPDX-License-Identifier = "CC-BY-4.0"
 
 [[annotations]]
-path = ["core/img/facebook.svg", "apps/federatedfilesharing/img/social-facebook.svg"]
+path = ["core/img/facebook.svg", "core/img/facebook-light.svg", "apps/federatedfilesharing/img/social-facebook.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 Meta"
 SPDX-License-Identifier = "LicenseRef-FacebookTrademarks"
@@ -352,7 +352,7 @@ SPDX-FileCopyrightText = "2024 Diaspora"
 SPDX-License-Identifier = "LicenseRef-DiasporaTrademarks"
 
 [[annotations]]
-path = ["core/img/mastodon.svg", "core/img/actions/mastodon.svg"]
+path = ["core/img/mastodon.svg", "core/img/mastodon-light.svg", "core/img/actions/mastodon.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 Mastodon gGmbH"
 SPDX-License-Identifier = "LicenseRef-MastodonTrademarks"
@@ -400,7 +400,7 @@ SPDX-FileCopyrightText = "2019 Fabian Wiktor <https://www.pexels.com/photo/green
 SPDX-License-Identifier = "CC0-1.0"
 
 [[annotations]]
-path = ["openapi.json", ".envrc", "flake.nix", "flake.lock"]
+path = ["openapi.json", ".envrc", "flake.nix", "flake.lock", "build/eslint-baseline.json"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

__mocks__/@nextcloud/auth.ts

@@ -2,7 +2,8 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-export const getCurrentUser = function() {
+
+export function getCurrentUser() {
 	return {
 		uid: 'test',
 		displayName: 'Test',
@@ -10,8 +11,8 @@ export const getCurrentUser = function() {
 	}
 }
 
-export const getRequestToken = function() {
+export function getRequestToken() {
 	return 'test-token-1234'
 }
 
-export const onRequestTokenUpdate = function() {}
+export function onRequestTokenUpdate() {}

__mocks__/@nextcloud/capabilities.ts

@@ -2,9 +2,10 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import type { Capabilities } from '../../apps/files/src/types'
 
-export const getCapabilities = (): Capabilities => {
+import type { Capabilities } from '../../apps/files/src/types.ts'
+
+export function getCapabilities(): Capabilities {
 	return {
 		files: {
 			bigfilechunking: true,

__mocks__/@nextcloud/initial-state.ts

@@ -3,6 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-export const loadState = function(app: string, key: string, fallback?: any) {
+export function loadState(app: string, key: string, fallback?: any) {
 	return fallback
 }

__mocks__/webdav.ts

@@ -2,9 +2,10 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-export const createClient = () => {}
-export const getPatcher = () => {
+
+export function createClient() {}
+export function getPatcher() {
 	return {
-		patch: () => {}
+		patch: () => {},
 	}
 }

__tests__/FileSystemAPIUtils.ts

@@ -2,11 +2,11 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { basename } from 'node:path'
+
 import mime from 'mime'
+import { basename } from 'node:path'
 
 class FileSystemEntry {
-
 	private _isFile: boolean
 	private _fullPath: string
 
@@ -26,11 +26,9 @@ class FileSystemEntry {
 	get name() {
 		return basename(this._fullPath)
 	}
-
 }
 
 export class FileSystemFileEntry extends FileSystemEntry {
-
 	private _contents: string
 	private _lastModified: number
 
@@ -46,11 +44,9 @@ export class FileSystemFileEntry extends FileSystemEntry {
 		const type = mime.getType(this.name) || ''
 		success(new File([this._contents], this.name, { lastModified, type }))
 	}
-
 }
 
 export class FileSystemDirectoryEntry extends FileSystemEntry {
-
 	private _entries: FileSystemEntry[]
 
 	constructor(fullPath: string, entries: FileSystemEntry[]) {
@@ -70,7 +66,6 @@ export class FileSystemDirectoryEntry extends FileSystemEntry {
 			},
 		}
 	}
-
 }
 
 /**
@@ -79,7 +74,6 @@ export class FileSystemDirectoryEntry extends FileSystemEntry {
  * File API in the same test suite.
  */
 export class DataTransferItem {
-
 	private _type: string
 	private _entry: FileSystemEntry
 
@@ -104,7 +98,7 @@ export class DataTransferItem {
 		return this._type
 	}
 
-	getAsFile(): File|null {
+	getAsFile(): File | null {
 		if (this._entry.isFile && this._entry instanceof FileSystemFileEntry) {
 			let file: File | null = null
 			this._entry.file((f) => {
@@ -116,10 +110,9 @@ export class DataTransferItem {
 		// The browser will return an empty File object if the entry is a directory
 		return new File([], this._entry.name, { type: '' })
 	}
-
 }
 
-export const fileSystemEntryToDataTransferItem = (entry: FileSystemEntry, isFileSystemAPIAvailable = true): DataTransferItem => {
+export function fileSystemEntryToDataTransferItem(entry: FileSystemEntry, isFileSystemAPIAvailable = true): DataTransferItem {
 	return new DataTransferItem(
 		entry.isFile ? 'text/plain' : 'httpd/unix-directory',
 		entry,

apps/admin_audit/appinfo/info.xml

@@ -10,7 +10,7 @@
 	<name>Auditing / Logging</name>
 	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.22.0</version>
+	<version>1.23.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -20,7 +20,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="32" max-version="32"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/composer/composer/autoload_classmap.php

@@ -19,7 +19,6 @@ return array(
     'OCA\\AdminAudit\\IAuditLogger' => $baseDir . '/../lib/IAuditLogger.php',
     'OCA\\AdminAudit\\Listener\\AppManagementEventListener' => $baseDir . '/../lib/Listener/AppManagementEventListener.php',
     'OCA\\AdminAudit\\Listener\\AuthEventListener' => $baseDir . '/../lib/Listener/AuthEventListener.php',
-    'OCA\\AdminAudit\\Listener\\CacheEventListener' => $baseDir . '/../lib/Listener/CacheEventListener.php',
     'OCA\\AdminAudit\\Listener\\ConsoleEventListener' => $baseDir . '/../lib/Listener/ConsoleEventListener.php',
     'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => $baseDir . '/../lib/Listener/CriticalActionPerformedEventListener.php',
     'OCA\\AdminAudit\\Listener\\FileEventListener' => $baseDir . '/../lib/Listener/FileEventListener.php',

apps/admin_audit/composer/composer/autoload_static.php

@@ -7,14 +7,14 @@ namespace Composer\Autoload;
 class ComposerStaticInitAdminAudit
 {
     public static $prefixLengthsPsr4 = array (
-        'O' =>
+        'O' => 
         array (
             'OCA\\AdminAudit\\' => 15,
         ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'OCA\\AdminAudit\\' =>
+        'OCA\\AdminAudit\\' => 
         array (
             0 => __DIR__ . '/..' . '/../lib',
         ),
@@ -34,7 +34,6 @@ class ComposerStaticInitAdminAudit
         'OCA\\AdminAudit\\IAuditLogger' => __DIR__ . '/..' . '/../lib/IAuditLogger.php',
         'OCA\\AdminAudit\\Listener\\AppManagementEventListener' => __DIR__ . '/..' . '/../lib/Listener/AppManagementEventListener.php',
         'OCA\\AdminAudit\\Listener\\AuthEventListener' => __DIR__ . '/..' . '/../lib/Listener/AuthEventListener.php',
-        'OCA\\AdminAudit\\Listener\\CacheEventListener' => __DIR__ . '/..' . '/../lib/Listener/CacheEventListener.php',
         'OCA\\AdminAudit\\Listener\\ConsoleEventListener' => __DIR__ . '/..' . '/../lib/Listener/ConsoleEventListener.php',
         'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => __DIR__ . '/..' . '/../lib/Listener/CriticalActionPerformedEventListener.php',
         'OCA\\AdminAudit\\Listener\\FileEventListener' => __DIR__ . '/..' . '/../lib/Listener/FileEventListener.php',

apps/admin_audit/l10n/lo.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "ການກວດສອບ / ການບັນທຶກ",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "ສະໜອງຄວາມສາມາດໃນການບັນທຶກສຳລັບ Nextcloud ເຊັ່ນ ການບັນທຶກການເຂົ້າເຖິງໄຟລ໌ ຫຼື ການກະທຳອື່ນໆທີ່ອ່ອນໄຫວ."
-},
-"nplurals=1; plural=0;");

apps/admin_audit/l10n/lo.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "ການກວດສອບ / ການບັນທຶກ",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "ສະໜອງຄວາມສາມາດໃນການບັນທຶກສຳລັບ Nextcloud ເຊັ່ນ ການບັນທຶກການເຂົ້າເຖິງໄຟລ໌ ຫຼື ການກະທຳອື່ນໆທີ່ອ່ອນໄຫວ."
-},"pluralForm" :"nplurals=1; plural=0;"
-}

apps/admin_audit/lib/AppInfo/Application.php

@@ -20,7 +20,6 @@ use OCA\AdminAudit\AuditLogger;
 use OCA\AdminAudit\IAuditLogger;
 use OCA\AdminAudit\Listener\AppManagementEventListener;
 use OCA\AdminAudit\Listener\AuthEventListener;
-use OCA\AdminAudit\Listener\CacheEventListener;
 use OCA\AdminAudit\Listener\ConsoleEventListener;
 use OCA\AdminAudit\Listener\CriticalActionPerformedEventListener;
 use OCA\AdminAudit\Listener\FileEventListener;
@@ -41,8 +40,6 @@ use OCP\Authentication\TwoFactorAuth\TwoFactorProviderChallengeFailed;
 use OCP\Authentication\TwoFactorAuth\TwoFactorProviderChallengePassed;
 use OCP\Console\ConsoleEvent;
 use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Files\Cache\CacheEntryInsertedEvent;
-use OCP\Files\Cache\CacheEntryRemovedEvent;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\BeforeNodeReadEvent;
 use OCP\Files\Events\Node\NodeCopiedEvent;
@@ -126,10 +123,6 @@ class Application extends App implements IBootstrap {
 
 		// Console events
 		$context->registerEventListener(ConsoleEvent::class, ConsoleEventListener::class);
-
-		// Cache events
-		$context->registerEventListener(CacheEntryInsertedEvent::class, CacheEventListener::class);
-		$context->registerEventListener(CacheEntryRemovedEvent::class, CacheEventListener::class);
 	}
 
 	public function boot(IBootContext $context): void {

apps/admin_audit/lib/Listener/CacheEventListener.php

@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace OCA\AdminAudit\Listener;
-
-use OCA\AdminAudit\Actions\Action;
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use OCP\Files\Cache\CacheEntryInsertedEvent;
-use OCP\Files\Cache\CacheEntryRemovedEvent;
-
-/**
- * @template-implements IEventListener<CacheEntryInsertedEvent|CacheEntryRemovedEvent>
- */
-class CacheEventListener extends Action implements IEventListener {
-	public function handle(Event $event): void {
-		if ($event instanceof CacheEntryInsertedEvent) {
-			$this->entryInserted($event);
-		} elseif ($event instanceof CacheEntryRemovedEvent) {
-			$this->entryRemoved($event);
-		}
-	}
-
-	private function entryInserted(CacheEntryInsertedEvent $event): void {
-		$this->log('Cache entry inserted for fileid "%1$d", path "%2$s" on storageid "%3$d"',
-			[
-				'fileid' => $event->getFileId(),
-				'path' => $event->getPath(),
-				'storageid' => $event->getStorageId(),
-			],
-			['fileid', 'path', 'storageid']
-		);
-	}
-
-	private function entryRemoved(CacheEntryRemovedEvent $event): void {
-		$this->log('Cache entry removed for fileid "%1$d", path "%2$s" on storageid "%3$d"',
-			[
-				'fileid' => $event->getFileId(),
-				'path' => $event->getPath(),
-				'storageid' => $event->getStorageId(),
-			],
-			['fileid', 'path', 'storageid']
-		);
-	}
-}

apps/cloud_federation_api/appinfo/info.xml

@@ -9,7 +9,7 @@
 	<name>Cloud Federation API</name>
 	<summary>Enable clouds to communicate with each other and exchange data</summary>
 	<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
-	<version>1.16.0</version>
+	<version>1.17.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>
 	<namespace>CloudFederationAPI</namespace>
@@ -19,6 +19,6 @@
 	<category>integration</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="32" max-version="32"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>
 </info>

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -106,18 +106,6 @@ class RequestHandlerController extends Controller {
 	#[NoCSRFRequired]
 	#[BruteForceProtection(action: 'receiveFederatedShare')]
 	public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
-		// quick patch to flatten the protocol entry 'multi' to the previous 'webdav'. this is 32 only and a better implementation is expected for 33
-		/** @psalm-suppress InvalidArrayOffset */
-		if ((($protocol['name'] ?? '') === 'multi') && (is_array($protocol['webdav'] ?? ''))) {
-			$protocol = [
-				'name' => 'webdav',
-				'options' => [
-					'sharedSecret' => $protocol['webdav']['sharedSecret'] ?? '',
-					'permissions' => '{http://open-cloud-mesh.org/ns}share-permissions',
-				],
-			];
-		}
-
 		try {
 			// if request is signed and well signed, no exception are thrown
 			// if request is not signed and host is known for not supporting signed request, no exception are thrown
@@ -248,7 +236,7 @@ class RequestHandlerController extends Controller {
 	 *
 	 * @param string $recipientProvider The address of the recipent's provider
 	 * @param string $token The token used for the invitation
-	 * @param string $userID The userID of the recipient at the recipient's provider
+	 * @param string $userId The userId of the recipient at the recipient's provider
 	 * @param string $email The email address of the recipient
 	 * @param string $name The display name of the recipient
 	 *
@@ -263,8 +251,8 @@ class RequestHandlerController extends Controller {
 	#[PublicPage]
 	#[NoCSRFRequired]
 	#[BruteForceProtection(action: 'inviteAccepted')]
-	public function inviteAccepted(string $recipientProvider, string $token, string $userID, string $email, string $name): JSONResponse {
-		$this->logger->debug('Processing share invitation for ' . $userID . ' with token ' . $token . ' and email ' . $email . ' and name ' . $name);
+	public function inviteAccepted(string $recipientProvider, string $token, string $userId, string $email, string $name): JSONResponse {
+		$this->logger->debug('Processing share invitation for ' . $userId . ' with token ' . $token . ' and email ' . $email . ' and name ' . $name);
 
 		$updated = $this->timeFactory->getTime();
 
@@ -321,7 +309,7 @@ class RequestHandlerController extends Controller {
 		$invitation->setRecipientEmail($email);
 		$invitation->setRecipientName($name);
 		$invitation->setRecipientProvider($recipientProvider);
-		$invitation->setRecipientUserId($userID);
+		$invitation->setRecipientUserId($userId);
 		$invitation->setAcceptedAt($updated);
 		$invitation = $this->federatedInviteMapper->update($invitation);
 

apps/cloud_federation_api/openapi.json

@@ -354,7 +354,7 @@
                                 "required": [
                                     "recipientProvider",
                                     "token",
-                                    "userID",
+                                    "userId",
                                     "email",
                                     "name"
                                 ],
@@ -367,9 +367,9 @@
                                         "type": "string",
                                         "description": "The token used for the invitation"
                                     },
-                                    "userID": {
+                                    "userId": {
                                         "type": "string",
-                                        "description": "The userID of the recipient at the recipient's provider"
+                                        "description": "The userId of the recipient at the recipient's provider"
                                     },
                                     "email": {
                                         "type": "string",

apps/comments/appinfo/info.xml

@@ -10,7 +10,7 @@
 	<name>Comments</name>
 	<summary>Files app plugin to add comments to files</summary>
 	<description>Files app plugin to add comments to files</description>
-	<version>1.22.0</version>
+	<version>1.23.0</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Vincent Petry</author>
@@ -21,7 +21,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="32" max-version="32"/>
+		<nextcloud min-version="33" max-version="33"/>
 	</dependencies>
 
 	<activity>

apps/comments/l10n/be.js

@@ -19,7 +19,7 @@ OC.L10N.register(
     "New comment" : "Новы каментарый",
     "Write a comment …" : "Напішыце каментарый …",
     "Post comment" : "Апублікаваць каментарый",
-    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - smart picker",
+    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - разумны выбар",
     "Could not reload comments" : "Не ўдалося перазагрузіць каментарыі",
     "Failed to mark comments as read" : "Не атрымалася пазначыць каментарыі як прачытаныя",
     "Unable to load the comments list" : "Не ўдалося загрузіць спіс каментарыяў",

apps/comments/l10n/be.json

@@ -17,7 +17,7 @@
     "New comment" : "Новы каментарый",
     "Write a comment …" : "Напішыце каментарый …",
     "Post comment" : "Апублікаваць каментарый",
-    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - smart picker",
+    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - разумны выбар",
     "Could not reload comments" : "Не ўдалося перазагрузіць каментарыі",
     "Failed to mark comments as read" : "Не атрымалася пазначыць каментарыі як прачытаныя",
     "Unable to load the comments list" : "Не ўдалося загрузіць спіс каментарыяў",

apps/comments/l10n/cs.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Smazat komentář",
     "Cancel edit" : "Zrušit úpravu",
     "New comment" : "Nový komentář",
-    "Write a comment …" : "Napsat komentář …",
     "Post comment" : "Odeslat komentář",
     "@ for mentions, : for emoji, / for smart picker" : "@ pro zmínění, : pro emotikony, / pro inteligentní výběr",
     "Could not reload comments" : "Znovunačtení komentářů se nezdařilo",
@@ -32,6 +31,6 @@ OC.L10N.register(
     "Comment deleted" : "Komentář smazán",
     "An error occurred while trying to delete the comment" : "Došlo k chybě při pokusu o smazání komentáře",
     "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře",
-    "Write a comment …" : "Napsat komentář …"
+    "Write a comment …" : "Napsat komentář…"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/comments/l10n/cs.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Smazat komentář",
     "Cancel edit" : "Zrušit úpravu",
     "New comment" : "Nový komentář",
-    "Write a comment …" : "Napsat komentář …",
     "Post comment" : "Odeslat komentář",
     "@ for mentions, : for emoji, / for smart picker" : "@ pro zmínění, : pro emotikony, / pro inteligentní výběr",
     "Could not reload comments" : "Znovunačtení komentářů se nezdařilo",
@@ -30,6 +29,6 @@
     "Comment deleted" : "Komentář smazán",
     "An error occurred while trying to delete the comment" : "Došlo k chybě při pokusu o smazání komentáře",
     "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře",
-    "Write a comment …" : "Napsat komentář …"
+    "Write a comment …" : "Napsat komentář…"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

apps/comments/l10n/da.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Slet kommentar",
     "Cancel edit" : "Annullér redigering",
     "New comment" : "Ny kommentar",
-    "Write a comment …" : "Skriv kommentar …",
     "Post comment" : "Skriv kommentar",
     "@ for mentions, : for emoji, / for smart picker" : "\"@\" for at omtale, \":\" for emojis, \"/\" for Smart Vælger",
     "Could not reload comments" : "Kunne ikke indlæse kommentarer",

apps/comments/l10n/da.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Slet kommentar",
     "Cancel edit" : "Annullér redigering",
     "New comment" : "Ny kommentar",
-    "Write a comment …" : "Skriv kommentar …",
     "Post comment" : "Skriv kommentar",
     "@ for mentions, : for emoji, / for smart picker" : "\"@\" for at omtale, \":\" for emojis, \"/\" for Smart Vælger",
     "Could not reload comments" : "Kunne ikke indlæse kommentarer",

apps/comments/l10n/de_DE.js

@@ -17,7 +17,7 @@ OC.L10N.register(
     "Delete comment" : "Kommentar löschen",
     "Cancel edit" : "Bearbeiten abbrechen",
     "New comment" : "Neuer Kommentar",
-    "Write a comment …" : "Einen Kommentar schreiben …",
+    "Write a comment …" : "Schreiben Sie einen Kommentar  …",
     "Post comment" : "Kommentar veröffentlichen",
     "@ for mentions, : for emoji, / for smart picker" : "@ für Erwähnungen, : für Emoji, / für Smart Picker",
     "Could not reload comments" : "Kommentare konnten nicht erneut geladen werden",

apps/comments/l10n/de_DE.json

@@ -15,7 +15,7 @@
     "Delete comment" : "Kommentar löschen",
     "Cancel edit" : "Bearbeiten abbrechen",
     "New comment" : "Neuer Kommentar",
-    "Write a comment …" : "Einen Kommentar schreiben …",
+    "Write a comment …" : "Schreiben Sie einen Kommentar  …",
     "Post comment" : "Kommentar veröffentlichen",
     "@ for mentions, : for emoji, / for smart picker" : "@ für Erwähnungen, : für Emoji, / für Smart Picker",
     "Could not reload comments" : "Kommentare konnten nicht erneut geladen werden",

apps/comments/l10n/en_GB.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Delete comment",
     "Cancel edit" : "Cancel edit",
     "New comment" : "New comment",
-    "Write a comment …" : "Write a comment …",
     "Post comment" : "Post comment",
     "@ for mentions, : for emoji, / for smart picker" : "@ for mentions, : for emoji, / for smart picker",
     "Could not reload comments" : "Could not reload comments",

apps/comments/l10n/en_GB.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Delete comment",
     "Cancel edit" : "Cancel edit",
     "New comment" : "New comment",
-    "Write a comment …" : "Write a comment …",
     "Post comment" : "Post comment",
     "@ for mentions, : for emoji, / for smart picker" : "@ for mentions, : for emoji, / for smart picker",
     "Could not reload comments" : "Could not reload comments",

apps/comments/l10n/es.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Borrar comentario",
     "Cancel edit" : "Cacelar edición",
     "New comment" : "Comentario nuevo",
-    "Write a comment …" : "Escribe un comentario ….",
     "Post comment" : "Publicar comentario",
     "@ for mentions, : for emoji, / for smart picker" : "@ para menciones, : para emoji, / para selector inteligente",
     "Could not reload comments" : "No se pudieron recargar los comentarios",

apps/comments/l10n/es.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Borrar comentario",
     "Cancel edit" : "Cacelar edición",
     "New comment" : "Comentario nuevo",
-    "Write a comment …" : "Escribe un comentario ….",
     "Post comment" : "Publicar comentario",
     "@ for mentions, : for emoji, / for smart picker" : "@ para menciones, : para emoji, / para selector inteligente",
     "Could not reload comments" : "No se pudieron recargar los comentarios",

apps/comments/l10n/fr.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Supprimer le commentaire",
     "Cancel edit" : "Annuler les modifications",
     "New comment" : "Nouveau commentaire",
-    "Write a comment …" : "Écrire un commentaire…",
     "Post comment" : "Publier le commentaire",
     "@ for mentions, : for emoji, / for smart picker" : "@ pour les mentions, : pour les émojis, / pour le sélecteur intelligent",
     "Could not reload comments" : "Impossible de recharger les commentaires",

apps/comments/l10n/fr.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Supprimer le commentaire",
     "Cancel edit" : "Annuler les modifications",
     "New comment" : "Nouveau commentaire",
-    "Write a comment …" : "Écrire un commentaire…",
     "Post comment" : "Publier le commentaire",
     "@ for mentions, : for emoji, / for smart picker" : "@ pour les mentions, : pour les émojis, / pour le sélecteur intelligent",
     "Could not reload comments" : "Impossible de recharger les commentaires",

apps/comments/l10n/it.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Elimina commento",
     "Cancel edit" : "Annulla modifica",
     "New comment" : "Nuovo commento",
-    "Write a comment …" : "Scrivi un commento ...",
     "Post comment" : "Pubblica commento",
     "@ for mentions, : for emoji, / for smart picker" : "@ per menzioni, : per emoji, / per selettore intelligente",
     "Could not reload comments" : "Impossibile ricaricare i commenti",

apps/comments/l10n/it.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Elimina commento",
     "Cancel edit" : "Annulla modifica",
     "New comment" : "Nuovo commento",
-    "Write a comment …" : "Scrivi un commento ...",
     "Post comment" : "Pubblica commento",
     "@ for mentions, : for emoji, / for smart picker" : "@ per menzioni, : per emoji, / per selettore intelligente",
     "Could not reload comments" : "Impossibile ricaricare i commenti",

apps/comments/l10n/lo.js

@@ -1,37 +0,0 @@
-OC.L10N.register(
-    "comments",
-    {
-    "Comments" : "ຄໍາເຫັນ",
-    "You commented" : "ທ່ານໄດ້ສະແດງຄຳເຫັນ",
-    "{author} commented" : "{author} commented",
-    "You commented on %1$s" : "You commented on %1$s",
-    "You commented on {file}" : "You commented on {file}",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
-    "{author} commented on {file}" : "{author} commented on {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
-    "Files" : "ຟາຍ",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "You were mentioned on \"{file}\", in a comment by an account that has since been deleted",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentioned you in a comment on \"{file}\"",
-    "Files app plugin to add comments to files" : "Files app plugin to add comments to files",
-    "Edit comment" : "ແກ້ໄຂຄຳເຫັນ",
-    "Delete comment" : "ລົບຄຳເຫັນ",
-    "Cancel edit" : "Cancel edit",
-    "New comment" : "New comment",
-    "Write a comment …" : "Write a comment …",
-    "Post comment" : "Post comment",
-    "@ for mentions, : for emoji, / for smart picker" : "@ for mentions, : for emoji, / for smart picker",
-    "Could not reload comments" : "Could not reload comments",
-    "Failed to mark comments as read" : "Failed to mark comments as read",
-    "Unable to load the comments list" : "Unable to load the comments list",
-    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
-    "No more messages" : "No more messages",
-    "Retry" : "Retry",
-    "_1 new comment_::_{unread} new comments_" : ["{unread} new comments"],
-    "Comment" : "Comment",
-    "An error occurred while trying to edit the comment" : "An error occurred while trying to edit the comment",
-    "Comment deleted" : "Comment deleted",
-    "An error occurred while trying to delete the comment" : "An error occurred while trying to delete the comment",
-    "An error occurred while trying to create the comment" : "An error occurred while trying to create the comment",
-    "Write a comment …" : "Write a comment …"
-},
-"nplurals=1; plural=0;");

apps/comments/l10n/lo.json

@@ -1,35 +0,0 @@
-{ "translations": {
-    "Comments" : "ຄໍາເຫັນ",
-    "You commented" : "ທ່ານໄດ້ສະແດງຄຳເຫັນ",
-    "{author} commented" : "{author} commented",
-    "You commented on %1$s" : "You commented on %1$s",
-    "You commented on {file}" : "You commented on {file}",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
-    "{author} commented on {file}" : "{author} commented on {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
-    "Files" : "ຟາຍ",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "You were mentioned on \"{file}\", in a comment by an account that has since been deleted",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentioned you in a comment on \"{file}\"",
-    "Files app plugin to add comments to files" : "Files app plugin to add comments to files",
-    "Edit comment" : "ແກ້ໄຂຄຳເຫັນ",
-    "Delete comment" : "ລົບຄຳເຫັນ",
-    "Cancel edit" : "Cancel edit",
-    "New comment" : "New comment",
-    "Write a comment …" : "Write a comment …",
-    "Post comment" : "Post comment",
-    "@ for mentions, : for emoji, / for smart picker" : "@ for mentions, : for emoji, / for smart picker",
-    "Could not reload comments" : "Could not reload comments",
-    "Failed to mark comments as read" : "Failed to mark comments as read",
-    "Unable to load the comments list" : "Unable to load the comments list",
-    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
-    "No more messages" : "No more messages",
-    "Retry" : "Retry",
-    "_1 new comment_::_{unread} new comments_" : ["{unread} new comments"],
-    "Comment" : "Comment",
-    "An error occurred while trying to edit the comment" : "An error occurred while trying to edit the comment",
-    "Comment deleted" : "Comment deleted",
-    "An error occurred while trying to delete the comment" : "An error occurred while trying to delete the comment",
-    "An error occurred while trying to create the comment" : "An error occurred while trying to create the comment",
-    "Write a comment …" : "Write a comment …"
-},"pluralForm" :"nplurals=1; plural=0;"
-}

apps/comments/l10n/ru.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Удалить комментарий",
     "Cancel edit" : "Отменить правку",
     "New comment" : "Новый комментарий",
-    "Write a comment …" : "Написать комментарий …",
     "Post comment" : "Опубликовать комментарий",
     "@ for mentions, : for emoji, / for smart picker" : "@ для упоминаний, : для эмодзи, / для интеллектуального выбора",
     "Could not reload comments" : "Не удалось перезагрузить комментарии",

apps/comments/l10n/ru.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Удалить комментарий",
     "Cancel edit" : "Отменить правку",
     "New comment" : "Новый комментарий",
-    "Write a comment …" : "Написать комментарий …",
     "Post comment" : "Опубликовать комментарий",
     "@ for mentions, : for emoji, / for smart picker" : "@ для упоминаний, : для эмодзи, / для интеллектуального выбора",
     "Could not reload comments" : "Не удалось перезагрузить комментарии",

apps/comments/l10n/sr.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Обриши коментар",
     "Cancel edit" : "Поништи измену",
     "New comment" : "Нови коментар",
-    "Write a comment …" : "Напишите коментар …",
     "Post comment" : "Објави коментар",
     "@ for mentions, : for emoji, / for smart picker" : "@ за помињања, : за емођи, / за паметни бирач",
     "Could not reload comments" : "Коментари не могу поново да се учитају",

apps/comments/l10n/sr.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Обриши коментар",
     "Cancel edit" : "Поништи измену",
     "New comment" : "Нови коментар",
-    "Write a comment …" : "Напишите коментар …",
     "Post comment" : "Објави коментар",
     "@ for mentions, : for emoji, / for smart picker" : "@ за помињања, : за емођи, / за паметни бирач",
     "Could not reload comments" : "Коментари не могу поново да се учитају",

apps/comments/l10n/tr.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Yorumu sil",
     "Cancel edit" : "Düzenlemeyi iptal et",
     "New comment" : "Yorum ekle",
-    "Write a comment …" : "Bir yorum yazın…",
     "Post comment" : "Yorum gönder",
     "@ for mentions, : for emoji, / for smart picker" : "Anmalar için @, emojiler için :, akıllı seçici için /",
     "Could not reload comments" : "Yorumlar yeniden yüklenemedi",

apps/comments/l10n/tr.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Yorumu sil",
     "Cancel edit" : "Düzenlemeyi iptal et",
     "New comment" : "Yorum ekle",
-    "Write a comment …" : "Bir yorum yazın…",
     "Post comment" : "Yorum gönder",
     "@ for mentions, : for emoji, / for smart picker" : "Anmalar için @, emojiler için :, akıllı seçici için /",
     "Could not reload comments" : "Yorumlar yeniden yüklenemedi",

apps/comments/l10n/ug.js

@@ -4,11 +4,11 @@ OC.L10N.register(
     "Comments" : "باھا",
     "You commented" : "باھا بەردىڭىز",
     "{author} commented" : "{author} باھا بەردى",
-    "You commented on %1$s" : "سىز %1$s غا باھا بەردىڭىز",
+    "You commented on %1$s" : "سىز%1 $ s غا باھا بەردىڭىز",
     "You commented on {file}" : "سىز {file} گە باھا بەردىڭىز",
-    "%1$s commented on %2$s" : "%1$s بولسا %2$s غا باھا بەردى",
+    "%1$s commented on %2$s" : "%1 $ s%2 $ s غا باھا بەردى",
     "{author} commented on {file}" : "{author} بولسا {file} گە باھا بەردى",
-    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </strong>",
+    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </ strong>",
     "Files" : "ھۆججەتلەر",
     "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى",
     "{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{file}\" دىكى باھادا تىلغا ئالدى",
@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "باھانى ئۆچۈرۈڭ",
     "Cancel edit" : "تەھرىرلەشنى ئەمەلدىن قالدۇرۇڭ",
     "New comment" : "يېڭى باھا",
-    "Write a comment …" : "بىر ئىنكاس يېزىڭ  ...",
     "Post comment" : "ئىنكاس يېزىڭ",
     "@ for mentions, : for emoji, / for smart picker" : "@ تىلغا ئېلىش ئۈچۈن ،: emoji ئۈچۈن ، / ئەقلىي ئىقتىدارلىق تاللىغۇچ ئۈچۈن",
     "Could not reload comments" : "ئىنكاسلارنى قايتا يۈكلىيەلمىدى",
@@ -26,7 +25,6 @@ OC.L10N.register(
     "No comments yet, start the conversation!" : "تېخى باھا يوق ، سۆھبەتنى باشلاڭ!",
     "No more messages" : "باشقا ئۇچۇر يوق",
     "Retry" : "قايتا سىناڭ",
-    "_1 new comment_::_{unread} new comments_" : ["1 يېڭى ئىنكاس","{unread} يېڭى ئىنكاسلار"],
     "Comment" : "باھا",
     "An error occurred while trying to edit the comment" : "باھانى تەھرىرلىمەكچى بولغاندا خاتالىق كۆرۈلدى",
     "Comment deleted" : "باھا ئۆچۈرۈلدى",

apps/comments/l10n/ug.json

@@ -2,11 +2,11 @@
     "Comments" : "باھا",
     "You commented" : "باھا بەردىڭىز",
     "{author} commented" : "{author} باھا بەردى",
-    "You commented on %1$s" : "سىز %1$s غا باھا بەردىڭىز",
+    "You commented on %1$s" : "سىز%1 $ s غا باھا بەردىڭىز",
     "You commented on {file}" : "سىز {file} گە باھا بەردىڭىز",
-    "%1$s commented on %2$s" : "%1$s بولسا %2$s غا باھا بەردى",
+    "%1$s commented on %2$s" : "%1 $ s%2 $ s غا باھا بەردى",
     "{author} commented on {file}" : "{author} بولسا {file} گە باھا بەردى",
-    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </strong>",
+    "<strong>Comments</strong> for files" : "ھۆججەتلەر ئۈچۈن <strong> باھا </ strong>",
     "Files" : "ھۆججەتلەر",
     "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "سىز ئۆچۈرۈلگەن ھېساباتنىڭ ئىزاھاتىدا سىز «{file}» دە تىلغا ئېلىندى",
     "{user} mentioned you in a comment on \"{file}\"" : "{user} سىزنى \"{file}\" دىكى باھادا تىلغا ئالدى",
@@ -15,7 +15,6 @@
     "Delete comment" : "باھانى ئۆچۈرۈڭ",
     "Cancel edit" : "تەھرىرلەشنى ئەمەلدىن قالدۇرۇڭ",
     "New comment" : "يېڭى باھا",
-    "Write a comment …" : "بىر ئىنكاس يېزىڭ  ...",
     "Post comment" : "ئىنكاس يېزىڭ",
     "@ for mentions, : for emoji, / for smart picker" : "@ تىلغا ئېلىش ئۈچۈن ،: emoji ئۈچۈن ، / ئەقلىي ئىقتىدارلىق تاللىغۇچ ئۈچۈن",
     "Could not reload comments" : "ئىنكاسلارنى قايتا يۈكلىيەلمىدى",
@@ -24,7 +23,6 @@
     "No comments yet, start the conversation!" : "تېخى باھا يوق ، سۆھبەتنى باشلاڭ!",
     "No more messages" : "باشقا ئۇچۇر يوق",
     "Retry" : "قايتا سىناڭ",
-    "_1 new comment_::_{unread} new comments_" : ["1 يېڭى ئىنكاس","{unread} يېڭى ئىنكاسلار"],
     "Comment" : "باھا",
     "An error occurred while trying to edit the comment" : "باھانى تەھرىرلىمەكچى بولغاندا خاتالىق كۆرۈلدى",
     "Comment deleted" : "باھا ئۆچۈرۈلدى",

apps/comments/l10n/uk.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "Вилучити коментар",
     "Cancel edit" : "Скасувати редагування",
     "New comment" : "Новий коментар",
-    "Write a comment …" : "Додайте коментар …",
     "Post comment" : "Опублікувати коментар",
     "@ for mentions, : for emoji, / for smart picker" : "@ згадати, : емоційки, / асистент вибору",
     "Could not reload comments" : "Не вдалося перезавантажити коментарі",

apps/comments/l10n/uk.json

@@ -15,7 +15,6 @@
     "Delete comment" : "Вилучити коментар",
     "Cancel edit" : "Скасувати редагування",
     "New comment" : "Новий коментар",
-    "Write a comment …" : "Додайте коментар …",
     "Post comment" : "Опублікувати коментар",
     "@ for mentions, : for emoji, / for smart picker" : "@ згадати, : емоційки, / асистент вибору",
     "Could not reload comments" : "Не вдалося перезавантажити коментарі",

apps/comments/l10n/zh_HK.js

@@ -17,7 +17,6 @@ OC.L10N.register(
     "Delete comment" : "刪除留言",
     "Cancel edit" : "取消編輯",
     "New comment" : "新評論",
-    "Write a comment …" : "發表評論 ...",
     "Post comment" : "張貼留言",
     "@ for mentions, : for emoji, / for smart picker" : "“@” 表示提及，“:” 表示表情符號，“/” 表示智慧型選擇器",
     "Could not reload comments" : "無法重新加載評論",

apps/comments/l10n/zh_HK.json

@@ -15,7 +15,6 @@
     "Delete comment" : "刪除留言",
     "Cancel edit" : "取消編輯",
     "New comment" : "新評論",
-    "Write a comment …" : "發表評論 ...",
     "Post comment" : "張貼留言",
     "@ for mentions, : for emoji, / for smart picker" : "“@” 表示提及，“:” 表示表情符號，“/” 表示智慧型選擇器",
     "Could not reload comments" : "無法重新加載評論",

apps/comments/lib/Collaboration/CommentersSorter.php

@@ -27,10 +27,6 @@ class CommentersSorter implements ISorter {
 	 * @param array $context
 	 */
 	public function sort(array &$sortArray, array $context): void {
-		if (!isset($context['itemType'], $context['itemId'])) {
-			return;
-		}
-
 		$commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
 		if (count($commenters) === 0) {
 			return;