Merge remote-tracking branch 'origin/stable28' into feat/database/pri…

…mary-replica-split-stable28

.drone.yml

@@ -272,14 +272,14 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.2-php8.0
+name: mariadb10.3-php8.0
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: mariadb10.2-php8.0
+- name: mariadb10.3-php8.0
   image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
@@ -289,7 +289,7 @@ services:
 - name: cache
   image: ghcr.io/nextcloud/continuous-integration-redis:latest
 - name: mariadb
-  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.2:10.2
+  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.3:latest
   environment:
     MYSQL_ROOT_PASSWORD: owncloud
     MYSQL_USER: oc_autotest
@@ -310,14 +310,14 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.4-php8.0
+name: mariadb10.5-php8.0
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: mariadb10.4-php8.0
+- name: mariadb10.5-php8.0
   image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
@@ -327,7 +327,7 @@ services:
 - name: cache
   image: ghcr.io/nextcloud/continuous-integration-redis:latest
 - name: mariadb
-  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4
+  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.5:latest
   environment:
     MYSQL_ROOT_PASSWORD: owncloud
     MYSQL_USER: oc_autotest
@@ -384,6 +384,44 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: mariadb10.11-php8.2
+
+steps:
+- name: submodules
+  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
+  commands:
+    - git submodule update --init
+- name: mariadb10.11-php8.2
+  image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
+
+services:
+- name: cache
+  image: ghcr.io/nextcloud/continuous-integration-redis:latest
+- name: mariadb
+  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.11:latest
+  environment:
+    MYSQL_ROOT_PASSWORD: owncloud
+    MYSQL_USER: oc_autotest
+    MYSQL_PASSWORD: owncloud
+    MYSQL_DATABASE: oc_autotest
+  command:
+    - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
+  tmpfs:
+    - /var/lib/mysql
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: mysql8.0-php8.0
@@ -1728,4 +1766,4 @@ trigger:
     - push
 ---
 kind: signature
-hmac: 8ffbbff9ef7aae684f6f1dc241390faf2fa336dac3b4773c42e9c04e17660e24
+hmac: f429112ae02a1b21b9d6b80e6558ed6ddf29819f04fae4a5790933eaf86ef414

.github/workflows/cypress.yml

@@ -77,10 +77,10 @@ jobs:
       matrix:
         # Run multiple copies of the current job in parallel
         # Please increase the number or runners as your tests suite grows (0 based index for e2e tests)
-        containers: ["component", 0, 1, 2]
+        containers: ["component", 0, 1, 2, 3, 4, 5]
         # Hack as strategy.job-total includes the component and GitHub does not allow math expressions
         # Always aling this number with the total of e2e runners (max. index + 1)
-        total-containers: [3]
+        total-containers: [6]
 
     name: runner ${{ matrix.containers }}
 

.github/workflows/update-psalm-baseline.yml

@@ -28,7 +28,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.0'
-          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -37,11 +37,11 @@ jobs:
         run: composer install
 
       - name: Psalm
-        run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
+        run: composer run psalm:ci -- --monochrome --no-progress --output-format=text --update-baseline
         continue-on-error: true
 
       - name: Psalm OCP
-        run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline
+        run: composer run psalm:ci -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline
         continue-on-error: true
 
       - name: Reset composer

.htaccess

@@ -94,5 +94,19 @@
   RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 
+# Clients like xDavv5 on Android, or Cyberduck, use chunked requests.
+# When FastCGI or FPM is used with apache, requests arrive to Nextcloud without any content.
+# This leads to the creation of empty files.
+# The following directive will force the problematic requests to be buffered before being forwarded to Nextcloud.
+# This way, the "Transfer-Encoding" header is removed, the "Content-Length" header is set, and the request content is proxied to Nextcloud.
+# Here are more information about the issue:
+#  - https://docs.cyberduck.io/mountainduck/issues/fastcgi/
+#  - https://docs.nextcloud.com/server/latest/admin_manual/issues/general_troubleshooting.html#troubleshooting-webdav
+<IfModule setenvif.c>
+  <Location "/remote.php">
+    SetEnvIf Transfer-Encoding "chunked" proxy-sendcl=1
+  </Location>
+</IfModule>
+
 AddDefaultCharset utf-8
 Options -Indexes

apps/comments/l10n/ar.js

@@ -9,7 +9,7 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
     "{author} commented on {file}" : "{author} علّق على {file}",
     "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
-    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "تمت الإشارة إليك في \"{file}\" في تعليق لمستخدم. لكن هذا المستخدم تم حذف حسابه بعدها",
+    "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}",
     "Files app plugin to add comments to files" : "المكوِّن الإضافي لتطبيق الملفات لإضافة تعليقات إلى الملفات",
     "Edit comment" : "تعديل التعليق",
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Comment deleted" : "التعليق حُذف",
     "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
     "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "تمت الإشارة إليك في \"{file}\" في تعليق لمستخدم. لكن هذا المستخدم تم حذف حسابه بعدها",
     "_%n unread comment_::_%n unread comments_" : ["%n تعليق غير مقروء","%n تعليق غير مقروء","تعليقان غير مقروءة","%n تعليقات غير مقروء","%n تعليق غير مقروء","%n تعليق غير مقروء"]
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");

apps/comments/l10n/ar.json

@@ -7,7 +7,7 @@
     "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
     "{author} commented on {file}" : "{author} علّق على {file}",
     "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
-    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "تمت الإشارة إليك في \"{file}\" في تعليق لمستخدم. لكن هذا المستخدم تم حذف حسابه بعدها",
+    "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}",
     "Files app plugin to add comments to files" : "المكوِّن الإضافي لتطبيق الملفات لإضافة تعليقات إلى الملفات",
     "Edit comment" : "تعديل التعليق",
@@ -29,6 +29,7 @@
     "Comment deleted" : "التعليق حُذف",
     "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
     "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "تمت الإشارة إليك في \"{file}\" في تعليق لمستخدم. لكن هذا المستخدم تم حذف حسابه بعدها",
     "_%n unread comment_::_%n unread comments_" : ["%n تعليق غير مقروء","%n تعليق غير مقروء","تعليقان غير مقروءة","%n تعليقات غير مقروء","%n تعليق غير مقروء","%n تعليق غير مقروء"]
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }

apps/comments/l10n/ast.js

@@ -7,14 +7,30 @@ OC.L10N.register(
     "You commented on %1$s" : "Comentesti en: %1$s",
     "You commented on {file}" : "Comentesti en: {file}",
     "%1$s commented on %2$s" : "%1$s comentó en: %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
+    "{author} commented on {file}" : "{author} comentó en: {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentóte nun comentariu de: «{file}»",
+    "Files app plugin to add comments to files" : "Plugin de l'aplicación Ficheros p'amestar comentarios a los ficheros",
+    "Edit comment" : "Editar el comentariu",
+    "Delete comment" : "Desaniciar el comentariu",
+    "Cancel edit" : "Anular la edición",
+    "New comment" : "Comentariu nuevu",
+    "Write a comment …" : "Escribi un comentariu…",
+    "Post comment" : "Espublizar el comentariu",
+    "@ for mentions, : for emoji, / for smart picker" : "@ pa les menciones, : pa los fustaxes, / pal selector intelixente",
+    "Could not reload comments" : "Nun se pudieron recargar los comentarios",
+    "No comments yet, start the conversation!" : "Nun hai comentarios, ¡anicia una conversación!",
     "No more messages" : "Nun hai más mensaxes",
+    "Retry" : "Retentar",
+    "Failed to mark comments as read" : "Nun se pudieron marcar los comentarios como lleíos",
+    "Unable to load the comments list" : "Nun ye posible cargar la llista de comentarios",
     "_1 new comment_::_{unread} new comments_" : ["1 comentariu nuevu","{unread} comentarios nuevos"],
     "Comment" : "Comentariu",
     "An error occurred while trying to edit the comment" : "Prodúxose un error mentanto se tentaba d'editar el comentariu",
     "Comment deleted" : "Desanicióse'l comentariu",
     "An error occurred while trying to delete the comment" : "Prodúxose un error mentanto se tentaba de desaniciar el comentariu",
     "An error occurred while trying to create the comment" : "Prodúxose un error mentanto se tentaba de crear el comentariu",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Un usuariu que ta desaniciáu mentóte nun comentariu de: {file}",
     "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"]
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/ast.json

@@ -5,14 +5,30 @@
     "You commented on %1$s" : "Comentesti en: %1$s",
     "You commented on {file}" : "Comentesti en: {file}",
     "%1$s commented on %2$s" : "%1$s comentó en: %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
+    "{author} commented on {file}" : "{author} comentó en: {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentóte nun comentariu de: «{file}»",
+    "Files app plugin to add comments to files" : "Plugin de l'aplicación Ficheros p'amestar comentarios a los ficheros",
+    "Edit comment" : "Editar el comentariu",
+    "Delete comment" : "Desaniciar el comentariu",
+    "Cancel edit" : "Anular la edición",
+    "New comment" : "Comentariu nuevu",
+    "Write a comment …" : "Escribi un comentariu…",
+    "Post comment" : "Espublizar el comentariu",
+    "@ for mentions, : for emoji, / for smart picker" : "@ pa les menciones, : pa los fustaxes, / pal selector intelixente",
+    "Could not reload comments" : "Nun se pudieron recargar los comentarios",
+    "No comments yet, start the conversation!" : "Nun hai comentarios, ¡anicia una conversación!",
     "No more messages" : "Nun hai más mensaxes",
+    "Retry" : "Retentar",
+    "Failed to mark comments as read" : "Nun se pudieron marcar los comentarios como lleíos",
+    "Unable to load the comments list" : "Nun ye posible cargar la llista de comentarios",
     "_1 new comment_::_{unread} new comments_" : ["1 comentariu nuevu","{unread} comentarios nuevos"],
     "Comment" : "Comentariu",
     "An error occurred while trying to edit the comment" : "Prodúxose un error mentanto se tentaba d'editar el comentariu",
     "Comment deleted" : "Desanicióse'l comentariu",
     "An error occurred while trying to delete the comment" : "Prodúxose un error mentanto se tentaba de desaniciar el comentariu",
     "An error occurred while trying to create the comment" : "Prodúxose un error mentanto se tentaba de crear el comentariu",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Un usuariu que ta desaniciáu mentóte nun comentariu de: {file}",
     "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/bg.js

@@ -9,7 +9,6 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s коментиран за %2$s",
     "{author} commented on {file}" : "{author} коментира за {file}",
     "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
-    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
     "{user} mentioned you in a comment on \"{file}\"" : "{user} ви спомена в коментар за “{file}”",
     "Files app plugin to add comments to files" : "Добавка на приложението Файлове за добавяне на коментари към файловете",
     "Edit comment" : "Редактирай коментра",
@@ -26,6 +25,7 @@ OC.L10N.register(
     "Comment deleted" : " Изтрит е коментар",
     "An error occurred while trying to delete the comment" : "Възникна грешка при опит за изтриване на коментара",
     "An error occurred while trying to create the comment" : "Възникна грешка при опит за създаване на коментар",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"]
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/bg.json

@@ -7,7 +7,6 @@
     "%1$s commented on %2$s" : "%1$s коментиран за %2$s",
     "{author} commented on {file}" : "{author} коментира за {file}",
     "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
-    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
     "{user} mentioned you in a comment on \"{file}\"" : "{user} ви спомена в коментар за “{file}”",
     "Files app plugin to add comments to files" : "Добавка на приложението Файлове за добавяне на коментари към файловете",
     "Edit comment" : "Редактирай коментра",
@@ -24,6 +23,7 @@
     "Comment deleted" : " Изтрит е коментар",
     "An error occurred while trying to delete the comment" : "Възникна грешка при опит за изтриване на коментара",
     "An error occurred while trying to create the comment" : "Възникна грешка при опит за създаване на коментар",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/ca.js

@@ -9,7 +9,6 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s ha escrit un comentari a %2$s",
     "{author} commented on {file}" : "{author} ha escrit un comentari a {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per a fitxers",
-    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Se us ha esmentat a «{file}» en un comentari d'un usuari que s'ha suprimit",
     "{user} mentioned you in a comment on \"{file}\"" : "{user} us ha esmentat en un comentari a «{file}»",
     "Files app plugin to add comments to files" : "Connector de l'aplicació Fitxers per a afegir comentaris als fitxers",
     "Edit comment" : "Edita el comentari",
@@ -29,6 +28,7 @@ OC.L10N.register(
     "Comment deleted" : "S'ha suprimit el comentari",
     "An error occurred while trying to delete the comment" : "S'ha produït un error en intentar suprimir el comentari",
     "An error occurred while trying to create the comment" : "S'ha produït un error en intentar crear el comentari",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Se us ha esmentat a «{file}» en un comentari d'un usuari que s'ha suprimit",
     "_%n unread comment_::_%n unread comments_" : ["%n comentari sense llegir","%n comentaris sense llegir"]
 },
 "nplurals=2; plural=(n != 1);");