Merge branch 'nextcloud:master' into master

.github/CODEOWNERS

@@ -1,2 +1,10 @@
 */Activity/*                        @nickvergessen
 */Notifications/*                   @nickvergessen
+/apps/dav/lib/CalDAV                @ChristophWurst @miaulalala @tcitworld
+/apps/dav/lib/CardDAV               @ChristophWurst @miaulalala @tcitworld
+
+# Two-Factor Authentication
+# https://github.com/nextcloud/wg-two-factor-authentication#members
+/apps/twofactor_backupcodes        @ChristophWurst @miaulalala @nickvergessen
+*/TwoFactorAuth/*                  @ChristophWurst @miaulalala @nickvergessen
+/core/templates/twofactor*         @ChristophWurst @miaulalala @nickvergessen

.github/dependabot.yml

@@ -62,7 +62,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable20
+  target-branch: stable21
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -80,7 +80,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable21
+  target-branch: stable22
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -98,7 +98,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable22
+  target-branch: stable23
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -117,7 +117,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable20
+  target-branch: stable21
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -135,7 +135,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable21
+  target-branch: stable22
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -153,7 +153,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable22
+  target-branch: stable23
   labels:
     - "3. to review"
     - "feature: dependencies"

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout

.github/workflows/oci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '7.3', '7.4', '8.0' ]
+        php-versions: [ '7.3', '7.4', '8.0', '8.1']
         databases: [ 'oci' ]
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
@@ -40,7 +40,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
           tools: phpunit:9
           coverage: none
 

.github/workflows/s3-external.yml

@@ -45,7 +45,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
 
       - name: Set up Nextcloud
         run: |
@@ -94,7 +94,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
 
       - name: Set up Nextcloud
         run: |

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

@@ -1,34 +1,38 @@
 name: Update Psalm baseline
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '5 4 * * *'
 
 jobs:
   update-psalm-baseline:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v2
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with:
+          submodules: true
+
       - name: Set up php7.4
-        uses: shivammathur/setup-php@master
+        uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
+
       - name: Composer install
         run: composer install
+
       - name: Psalm
         run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
+        continue-on-error: true
+
       - name: Reset composer
         run: |
           git clean -f lib/composer
           git checkout composer.json composer.lock lib/composer
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
@@ -38,9 +42,12 @@ jobs:
           author: nextcloud-command <[email protected]>
           signoff: true
           branch: automated/noid/psalm-baseline-update
+          # Make sure we can open multiple PRs
+          branch-suffix: timestamp
           title: '[Automated] Update psalm-baseline.xml'
           body: |
             Auto-generated update psalm-baseline.xml with fixed psalm warnings
           labels: |
             automated pr
-          reviewers: juliushaertl, artonge, kesselb
+            3. to review
+          team-reviewers: server-backend

.htaccess

@@ -43,7 +43,7 @@
   </IfModule>
 
   # Add cache control for static resources
-  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico)$">
+  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)$">
     Header set Cache-Control "max-age=15778463"
   </FilesMatch>
 
@@ -75,6 +75,7 @@
 
 <IfModule mod_mime.c>
   AddType image/svg+xml svg svgz
+  AddType application/wasm wasm
   AddEncoding gzip svgz
 </IfModule>
 

apps/accessibility/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>Accessibility</name>
 	<summary>Accessibility options for nextcloud</summary>
 	<description><![CDATA[Provides multiple accessibilities options to ease your use of Nextcloud]]></description>
-	<version>1.9.0</version>
+	<version>1.10.0</version>
 	<licence>agpl</licence>
 	<author>John Molakvoæ</author>
 	<namespace>Accessibility</namespace>
@@ -16,7 +16,7 @@
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 
 	<dependencies>
-		<nextcloud min-version="23" max-version="23"/>
+		<nextcloud min-version="24" max-version="24"/>
 	</dependencies>
 
 	<repair-steps>

apps/accessibility/composer/composer/InstalledVersions.php

@@ -24,8 +24,21 @@
  */
 class InstalledVersions
 {
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     */
     private static $installed;
+
+    /**
+     * @var bool|null
+     */
     private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     */
     private static $installedByVendor = array();
 
     /**

apps/accessibility/composer/composer/installed.php

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'reference' => '7239b3d560b52ed604484a0a549dd5805e3f21e4',
+        'reference' => 'c6429e6cd19c57582364338362e543580821cf99',
         'name' => '__root__',
         'dev' => false,
     ),
@@ -16,7 +16,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
-            'reference' => '7239b3d560b52ed604484a0a549dd5805e3f21e4',
+            'reference' => 'c6429e6cd19c57582364338362e543580821cf99',
             'dev_requirement' => false,
         ),
     ),