Merge branch 'master' into bugfix/phpunit9

# Conflicts:
#	core/Controller/AutoCompleteController.php
#	tests/Core/Command/Preview/RepairTest.php
#	tests/lib/TestCase.php
#	tests/phpunit-autotest.xml

.devcontainer/Dockerfile

@@ -0,0 +1,44 @@
+FROM ubuntu:focal
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+# PHP
+RUN apt-get update -y
+RUN apt-get install --no-install-recommends -y \
+    php7.4 \
+    php7.4-gd \
+    php7.4-zip \
+    php7.4-curl \
+    php7.4-xml \
+    php7.4-mbstring \
+    php7.4-sqlite \
+    php7.4-xdebug \
+    php7.4-pgsql \
+    php7.4-intl \
+    php7.4-imagick \
+    php7.4-gmp \
+    php7.4-apcu \
+    php7.4-bcmath \
+    libmagickcore-6.q16-3-extra \
+    curl \
+    vim \
+    lsof
+
+RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/cli/conf.d/20-xdebug.ini
+RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/cli/conf.d/20-xdebug.ini
+
+# Docker
+RUN apt-get -y install \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg-agent \
+    software-properties-common
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+RUN add-apt-repository \
+   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+   $(lsb_release -cs) \
+   stable"
+RUN apt-get update -y
+RUN apt-get install -y docker-ce docker-ce-cli containerd.io
+RUN ln -s /var/run/docker-host.sock /var/run/docker.sock  

.devcontainer/codespace.config.php

@@ -0,0 +1,18 @@
+<?php
+
+$cloudEnvironmentId = getenv('CLOUDENV_ENVIRONMENT_ID');
+
+$CONFIG = [
+    'mail_from_address' => 'no-reply',
+    'mail_smtpmode' => 'smtp',
+    'mail_sendmailmode' => 'smtp',
+    'mail_domain' => 'example.com',
+    'mail_smtphost' => 'localhost',
+    'mail_smtpport' => '1025',
+    'memcache.local' => '\OC\Memcache\APCu',
+];
+
+if($cloudEnvironmentId !== true) {
+    $CONFIG['overwritehost'] = $cloudEnvironmentId . '-80.apps.codespaces.githubusercontent.com';
+    $CONFIG['overwriteprotocol'] = 'https';
+}

.devcontainer/devcontainer.json

@@ -0,0 +1,22 @@
+{
+	"name": "NextcloudServer",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "nextclouddev",
+	"postCreateCommand": ".devcontainer/setup.sh",
+	"forwardPorts": [
+		80,
+		8080,
+		8025
+	],
+	"runArgs": [
+		"--privileged"
+	],
+	"extensions": [
+		"felixfbecker.php-debug",
+		"felixfbecker.php-intellisense",
+		"ms-azuretools.vscode-docker"
+	],
+	"settings": {
+		"php.suggest.basic": false,
+	}
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,29 @@
+version: '3'
+services:
+  nextclouddev:
+    build: .
+    volumes:
+      - .:/workspace:cached
+      - /var/run/docker.sock:/var/run/docker-host.sock
+    command: /bin/sh -c "while sleep 1000; do :; done"
+    ports:
+      - 80:80
+      - 8080:8080
+      - 8025:8025
+
+  db:
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: postgres
+    network_mode: service:nextclouddev
+
+  adminer:
+    image: adminer
+    restart: always
+    network_mode: service:nextclouddev
+
+  mailhog:
+    image: mailhog/mailhog
+    restart: always
+    network_mode: service:nextclouddev

.devcontainer/setup.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
+
+cd $DIR/
+git submodule update --init
+
+# Codespace config
+cp .devcontainer/codespace.config.php config/codespace.config.php