fix: Revert "fx: master merge conflicts resolved"

This reverts commit 2a99006, reversing changes made to c6fdaca.
nextcloud · Dec 4, 2024 · 25b513a · 25b513a
1 parent 2a99006
commit 25b513a
Show file tree

Hide file tree

Showing 393 changed files with 4,615 additions and 5,572 deletions.
diff --git a/.github/workflows/command-compile.yml b/.github/workflows/command-compile.yml
@@ -76,7 +76,7 @@ jobs:
           fi
 
       - name: Init branch
-        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v1
+        uses: xt0rted/pull-request-comment-branch@d97294d304604fa98a2600a6e2f916a84b596dc7 # v1
         id: comment-branch
 
       - name: Add reaction on failure

diff --git a/.github/workflows/command-pull-3rdparty.yml b/.github/workflows/command-pull-3rdparty.yml
@@ -34,7 +34,7 @@ jobs:
           exit 1
 
       - name: Init branch
-        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v1
+        uses: xt0rted/pull-request-comment-branch@d97294d304604fa98a2600a6e2f916a84b596dc7 # v1
         id: comment-branch
 
       - name: Checkout ${{ steps.comment-branch.outputs.head_ref }}

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -121,7 +121,7 @@ jobs:
         run: ./node_modules/cypress/bin/cypress install
 
       - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
-        uses: cypress-io/github-action@f1f0912d392f0d06bdd01fb9ebe3b3299e5806fb # v6.7.7
+        uses: cypress-io/github-action@0da3c06ed8217b912deea9d8ee69630baed1737e # v6.7.6
         with:
           # We already installed the dependencies in the init job
           install: false

diff --git a/.github/workflows/files-external-ftp.yml b/.github/workflows/files-external-ftp.yml
@@ -100,7 +100,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-ftp

diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml
@@ -98,7 +98,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-s3
@@ -165,7 +165,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-s3

diff --git a/.github/workflows/files-external-sftp.yml b/.github/workflows/files-external-sftp.yml
@@ -89,7 +89,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-sftp

diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml
@@ -94,7 +94,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v4.1.1
+        uses: codecov/codecov-action@e43f28e103e52bb26d252b5a97fcdfa06175321e # v4.1.1
         with:
           files: ./clover.xml
           flags: phpunit-files-external-smb

diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml
@@ -91,7 +91,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v4.1.1
+        uses: codecov/codecov-action@e43f28e103e52bb26d252b5a97fcdfa06175321e # v4.1.1
         with:
           files: ./clover.xml
           flags: phpunit-files-external-webdav

diff --git a/.github/workflows/files-external.yml b/.github/workflows/files-external.yml
@@ -79,7 +79,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-files-external-generic

diff --git a/.github/workflows/lint-stylelint.yml b/.github/workflows/lint-stylelint.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Read package.json node and npm engines version
         uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
@@ -35,7 +35,7 @@ jobs:
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml
@@ -99,7 +99,7 @@ jobs:
         run: npm run test:coverage --if-present
 
       - name: Collect coverage
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v4.3.1
+        uses: codecov/codecov-action@e43f28e103e52bb26d252b5a97fcdfa06175321e # v4.3.1
         with:
           files: ./coverage/lcov.info
 

diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml
@@ -105,7 +105,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-azure

diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml
@@ -111,7 +111,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-s3

diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml
@@ -101,7 +101,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-swift

diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
@@ -124,7 +124,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.db.xml
           flags: phpunit-mariadb

diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml
@@ -101,7 +101,7 @@ jobs:
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.xml
           flags: phpunit-memcached

diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml
@@ -159,7 +159,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.db.xml
           flags: phpunit-mysql

diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -124,7 +124,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.db.xml
           flags: phpunit-mysql

diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml
@@ -106,7 +106,7 @@ jobs:
 
       - name: Upload nodb code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.nodb.xml
           flags: phpunit-nodb

diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
@@ -129,7 +129,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.db.xml
           flags: phpunit-oci

diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -119,7 +119,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.db.xml
           flags: phpunit-postgres

diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -105,7 +105,7 @@ jobs:
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v4.6.0
         with:
           files: ./clover.db.xml
           flags: phpunit-sqlite

diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml
@@ -19,4 +19,4 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: REUSE Compliance Check
-      uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0
+      uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
@@ -111,29 +111,3 @@ jobs:
       - name: Show potential changes in Psalm baseline
         if: always()
         run: git diff --exit-code -- . ':!lib/composer'
-
-  static-code-analysis-ncu:
-    runs-on: ubuntu-latest
-
-    if: ${{ github.event_name != 'push' && github.repository_owner != 'nextcloud-gmbh' }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          submodules: true
-
-      - name: Set up php
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
-        with:
-          php-version: '8.1'
-          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-          coverage: none
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Composer install
-        run: composer i
-
-      - name: Psalm
-        run: composer run psalm:ncu -- --threads=1 --monochrome --no-progress --output-format=github
diff --git a/.htaccess b/.htaccess
@@ -103,7 +103,7 @@
 #  - https://docs.cyberduck.io/mountainduck/issues/fastcgi/
 #  - https://docs.nextcloud.com/server/latest/admin_manual/issues/general_troubleshooting.html#troubleshooting-webdav
 <IfModule mod_setenvif.c>
-  SetEnvIfNoCase Transfer-Encoding "chunked" proxy-sendcl=1
+  SetEnvIf Transfer-Encoding "chunked" proxy-sendcl=1
 </IfModule>
 
 # Apache disabled the sending of the server-side content-length header

diff --git a/apps/comments/l10n/fi.js b/apps/comments/l10n/fi.js
@@ -17,7 +17,6 @@ OC.L10N.register(
     "New comment" : "Uusi kommentti",
     "Write a comment …" : "Kirjoita kommentti…",
     "Post comment" : "Lähetä viesti",
-    "Could not reload comments" : "Kommenttien lataus epäonnistui",
     "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
     "No more messages" : "Ei enempää viestejä",
     "Retry" : "Yritä uudelleen",

diff --git a/apps/comments/l10n/fi.json b/apps/comments/l10n/fi.json
@@ -15,7 +15,6 @@
     "New comment" : "Uusi kommentti",
     "Write a comment …" : "Kirjoita kommentti…",
     "Post comment" : "Lähetä viesti",
-    "Could not reload comments" : "Kommenttien lataus epäonnistui",
     "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
     "No more messages" : "Ei enempää viestejä",
     "Retry" : "Yritä uudelleen",

diff --git a/apps/dav/l10n/eu.js b/apps/dav/l10n/eu.js
@@ -72,8 +72,6 @@ OC.L10N.register(
     "Description: %s" : "Deskripzioa: %s",
     "Where: %s" : "Non: %s",
     "%1$s via %2$s" : "%2$s bidez, %1$s",
-    "In a %1$s on %2$s for the entire day" : " %1$s batean %2$s(e)n egun osorako",
-    "In a %1$s on %2$s between %3$s - %4$s" : "%1$s batean %2$s(e)n %3$s eta %4$s artean",
     "Every Day for the entire day" : "Egunero egun osoan",
     "Every Day for the entire day until %1$s" : "Egunero egun osoan  %1$s arte",
     "Every Day between %1$s - %2$s" : "Egunero %1$setatik %2$setara",

diff --git a/apps/dav/l10n/eu.json b/apps/dav/l10n/eu.json
@@ -70,8 +70,6 @@
     "Description: %s" : "Deskripzioa: %s",
     "Where: %s" : "Non: %s",
     "%1$s via %2$s" : "%2$s bidez, %1$s",
-    "In a %1$s on %2$s for the entire day" : " %1$s batean %2$s(e)n egun osorako",
-    "In a %1$s on %2$s between %3$s - %4$s" : "%1$s batean %2$s(e)n %3$s eta %4$s artean",
     "Every Day for the entire day" : "Egunero egun osoan",
     "Every Day for the entire day until %1$s" : "Egunero egun osoan  %1$s arte",
     "Every Day between %1$s - %2$s" : "Egunero %1$setatik %2$setara",

diff --git a/apps/dav/l10n/gl.js b/apps/dav/l10n/gl.js
@@ -274,7 +274,7 @@ OC.L10N.register(
     "Notifications are sent via background jobs, so these must occur often enough." : "As notificacións enviaranse mediante procesos en segundo plano, polo que estes teñen que suceder con frecuencia.",
     "Send reminder notifications to calendar sharees as well" : "Enviar notificacións de lembrete tamén aos que comparten calendario",
     "Reminders are always sent to organizers and attendees." : "Os lembretes envíanselle sempre aos organizadores e aos asistentes.",
-    "Enable notifications for events via push" : "Activar o envío de notificacións emerxentes para eventos",
+    "Enable notifications for events via push" : "Activar o envío de notificacións do automáticas para eventos",
     "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}." : "Instale tamén a {calendarappstoreopen}aplicación do Calendario{linkclose} ou {calendardocopen}conecte os seus escritorio e móbil para sincronizalos ↗{linkclose}.",
     "Please make sure to properly set up {emailopen}the email server{linkclose}." : "Asegúrese de ter configurado correctamente {emailopen}o servidor de correo-e{linkclose}.",
     "There was an error updating your attendance status." : "Produciuse un erro ao actualizar o seu estado de asistencia.",

diff --git a/apps/dav/l10n/gl.json b/apps/dav/l10n/gl.json
@@ -272,7 +272,7 @@
     "Notifications are sent via background jobs, so these must occur often enough." : "As notificacións enviaranse mediante procesos en segundo plano, polo que estes teñen que suceder con frecuencia.",
     "Send reminder notifications to calendar sharees as well" : "Enviar notificacións de lembrete tamén aos que comparten calendario",
     "Reminders are always sent to organizers and attendees." : "Os lembretes envíanselle sempre aos organizadores e aos asistentes.",
-    "Enable notifications for events via push" : "Activar o envío de notificacións emerxentes para eventos",
+    "Enable notifications for events via push" : "Activar o envío de notificacións do automáticas para eventos",
     "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}." : "Instale tamén a {calendarappstoreopen}aplicación do Calendario{linkclose} ou {calendardocopen}conecte os seus escritorio e móbil para sincronizalos ↗{linkclose}.",
     "Please make sure to properly set up {emailopen}the email server{linkclose}." : "Asegúrese de ter configurado correctamente {emailopen}o servidor de correo-e{linkclose}.",
     "There was an error updating your attendance status." : "Produciuse un erro ao actualizar o seu estado de asistencia.",

diff --git a/apps/dav/lib/Capabilities.php b/apps/dav/lib/Capabilities.php
@@ -7,17 +7,15 @@
 
 use OCP\Capabilities\ICapability;
 use OCP\IConfig;
-use OCP\User\IAvailabilityCoordinator;
 
 class Capabilities implements ICapability {
 	public function __construct(
 		private IConfig $config,
-		private IAvailabilityCoordinator $coordinator,
 	) {
 	}
 
 	/**
-	 * @return array{dav: array{chunking: string, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
+	 * @return array{dav: array{chunking: string, bulkupload?: string}}
 	 */
 	public function getCapabilities() {
 		$capabilities = [
@@ -28,10 +26,6 @@ public function getCapabilities() {
 		if ($this->config->getSystemValueBool('bulkupload.enabled', true)) {
 			$capabilities['dav']['bulkupload'] = '1.0';
 		}
-		if ($this->coordinator->isEnabled()) {
-			$capabilities['dav']['absence-supported'] = true;
-			$capabilities['dav']['absence-replacement'] = true;
-		}
 		return $capabilities;
 	}
 }
diff --git a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
@@ -49,7 +49,7 @@ public function beforeHandler(RequestInterface $request) {
 			return;
 		}
 
-		$minimumSupportedDesktopVersion = $this->config->getSystemValueString('minimum.supported.desktop.version', '2.7.0');
+		$minimumSupportedDesktopVersion = $this->config->getSystemValueString('minimum.supported.desktop.version', '2.3.0');
 		$maximumSupportedDesktopVersion = $this->config->getSystemValueString('maximum.supported.desktop.version', '99.99.99');
 
 		// Check if the client is a desktop client

diff --git a/apps/dav/openapi.json b/apps/dav/openapi.json
@@ -37,12 +37,6 @@
                             },
                             "bulkupload": {
                                 "type": "string"
-                            },
-                            "absence-supported": {
-                                "type": "boolean"
-                            },
-                            "absence-replacement": {
-                                "type": "boolean"
                             }
                         }
                     }

diff --git a/apps/dav/src/components/AbsenceForm.vue b/apps/dav/src/components/AbsenceForm.vue
@@ -141,7 +141,7 @@ export default {
 		 async getSuggestions(search) {
 
 			const shareType = [
-				ShareType.User,
+				ShareType.SHARE_TYPE_USER,
 			]
 
 			let request = null

diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php
@@ -17,9 +17,6 @@
 use OCP\AppFramework\QueryException;
 use Test\TestCase;
 
-/**
- * @group DB
- */
 class NotificationProviderManagerTest extends TestCase {
 
 	/** @var NotificationProviderManager|\PHPUnit\Framework\MockObject\MockObject */