Merge branch 'nextcloud:master' into bugfix/22077/default-encryption-…

…module

.github/workflows/oci.yml

@@ -12,10 +12,9 @@ jobs:
  runs-on: ubuntu-20.04
 
  strategy:
- # do not stop on another job's failure
  fail-fast: false
  matrix:
- php-versions: [ '7.4' ]
+ php-versions: [ '7.3', '7.4', '8.0' ]
  databases: [ 'oci' ]
 
  name: php${{ matrix.php-versions }}-${{ matrix.databases }}
@@ -41,8 +40,8 @@ jobs:
  uses: shivammathur/setup-php@v2
  with:
  php-version: ${{ matrix.php-versions }}
- extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
- tools: phpunit:8.5.2
+ extensions: ctype,curl,dom,fileinfo,gd,iconv,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+ tools: phpunit:9
  coverage: none
 
  - name: Set up Nextcloud

.github/workflows/psalm-github.yml

@@ -17,7 +17,7 @@ jobs:
  with:
  submodules: recursive
  - name: Psalm
- uses: docker://vimeo/psalm-github-actions
+ uses: docker://vimeo/psalm-github-actions:4.9.3
  continue-on-error: true
  with:
  composer_ignore_platform_reqs: false

.github/workflows/psalm-security.yml

@@ -17,7 +17,7 @@ jobs:
  with:
  submodules: recursive
  - name: Psalm
- uses: docker://vimeo/psalm-github-actions
+ uses: docker://vimeo/psalm-github-actions:4.9.3
  with:
  security_analysis: true
  composer_ignore_platform_reqs: false

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

@@ -22,7 +22,7 @@ jobs:
  - name: Composer install
  run: composer i
  - name: Psalm
- run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+ run: composer run psalm -- --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
  - name: Check diff
  run: git diff -- . ':!lib/composer'
  - name: Show potential changes in Psalm baseline
@@ -48,7 +48,7 @@ jobs:
  - name: Composer install
  run: composer i
  - name: Psalm
- run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+ run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
  - name: Check diff
  run: git diff -- . ':!lib/composer'
  - name: Show potential changes in Psalm baseline

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

@@ -22,21 +22,20 @@ jobs:
  extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
  coverage: none
  - name: Composer install
- run: composer i
+ run: composer install
  - name: Psalm
  run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
- - name: Reset composer.json and composer.lock
+ - name: Reset composer
  run: |
- rm -rf lib/composer
- git checkout -- composer.json composer.lock lib/composer
+ 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:
  token: ${{ secrets.COMMAND_BOT_PAT }}
- push-to-fork: nextcloud-pr-bot/server
  commit-message: Update psalm baseline
  committer: GitHub <noreply@github.com>
- author: Nextcloud-PR-Bot <nextcloud-pr-bot@users.noreply.github.com>
+ author: nextcloud-command <nextcloud-command@users.noreply.github.com>
  signoff: true
  branch: automated/noid/psalm-baseline-update
  title: '[Automated] Update psalm-baseline.xml'

.gitignore

@@ -159,3 +159,5 @@ clover.xml
 tests/acceptance/vendor/
 
 composer.phar
+/lib/composer/bin
+/vendor-bin/**/vendor

.htaccess

@@ -7,6 +7,10 @@
  <IfModule mod_proxy_fcgi.c>
  SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
  </IfModule>
+ <IfModule mod_lsapi.c>
+ SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
+ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
+ </IfModule>
  </IfModule>
 
  <IfModule mod_env.c>
@@ -48,6 +52,8 @@
  Header set Cache-Control "max-age=604800"
  </FilesMatch>
 </IfModule>
+
+# PHP 7.x
 <IfModule mod_php7.c>
  php_value mbstring.func_overload 0
  php_value default_charset 'UTF-8'
@@ -56,6 +62,30 @@
  SetEnv htaccessWorking true
  </IfModule>
 </IfModule>
+
+# PHP 8+
+<IfModule mod_php.c>
+ php_value mbstring.func_overload 0
+ php_value default_charset 'UTF-8'
+ php_value output_buffering 0
+ <IfModule mod_env.c>
+ SetEnv htaccessWorking true
+ </IfModule>
+</IfModule>
+
+<IfModule mod_mime.c>
+ AddType image/svg+xml svg svgz
+ AddEncoding gzip svgz
+</IfModule>
+
+<IfModule mod_dir.c>
+ DirectoryIndex index.php index.html
+</IfModule>
+
+<IfModule pagespeed_module>
+ ModPagespeed Off
+</IfModule>
+
 <IfModule mod_rewrite.c>
  RewriteEngine on
  RewriteCond %{HTTP_USER_AGENT} DavClnt
@@ -68,15 +98,6 @@
  RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
  RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
-<IfModule mod_mime.c>
- AddType image/svg+xml svg svgz
- AddEncoding gzip svgz
-</IfModule>
-<IfModule mod_dir.c>
- DirectoryIndex index.php index.html
-</IfModule>
+
 AddDefaultCharset utf-8
 Options -Indexes
-<IfModule pagespeed_module>
- ModPagespeed Off
-</IfModule>

README.md

@@ -62,7 +62,7 @@ Otherwise, git checkouts can be handled the same as release archives, by using t
 
 We are moving more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:
 
-``` bash
+```bash
 # install dependencies
 make dev-setup
 
@@ -76,30 +76,30 @@ make watch-js
 make build-js-production
 ```
 
-#### Commiting changes
+#### Committing changes
 
 **When making changes, also commit the compiled files!**
 
 We still use Handlebars templates some places in Files and Settings. We will replace these step-by-step with Vue.js, but in the meantime you need to compile them separately.
 
 If you don’t have Handlebars installed yet, you can do it with this terminal command:
-```
+```bash
 sudo npm install -g handlebars
 ```
 
 Then inside the root folder of your local Nextcloud development installation, run this command in the terminal every time you changed a `.handlebars` file to compile it:
-```
+```bash
 ./build/compile-handlebars-templates.sh
 ```
 
 Before checking in JS changes, make sure to also build for production:
-```
+```bash
 make build-js-production
 ```
 Then add the compiled files for committing.
 
 To save some time, to only rebuild for a specific app, use the following and replace the module with the app name:
-```
+```bash
 MODULE=user_status make build-js-production
 ```
 

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.8.0</version>
+ <version>1.9.0</version>
  <licence>agpl</licence>
  <author>John Molakvoæ</author>
  <namespace>Accessibility</namespace>